aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2010-03-30 19:45:56 +0100
committerMatthew Wild <mwild1@gmail.com>2010-03-30 19:45:56 +0100
commitef919e14178f9526cc9c10842c8db7359055a680 (patch)
treeabef044158d144b17b1065483fb643deafa65c26
parentfedb8443003df7a5f87257f795f64abd05072be8 (diff)
parent64a003d115e699b5076af196e2f7cbf3e345a618 (diff)
downloadprosody-ef919e14178f9526cc9c10842c8db7359055a680.tar.gz
prosody-ef919e14178f9526cc9c10842c8db7359055a680.zip
Merge 0.6->0.7
-rw-r--r--core/modulemanager.lua2
-rw-r--r--core/s2smanager.lua4
-rw-r--r--core/stanza_router.lua11
-rw-r--r--net/xmppserver_listener.lua3
4 files changed, 10 insertions, 10 deletions
diff --git a/core/modulemanager.lua b/core/modulemanager.lua
index 2f89b443..5e9eaedd 100644
--- a/core/modulemanager.lua
+++ b/core/modulemanager.lua
@@ -274,7 +274,7 @@ function handle_stanza(host, origin, stanza)
(handlers[1])(origin, stanza);
return true;
else
- if stanza.attr.xmlns == "jabber:client" then
+ if stanza.attr.xmlns == nil then
log("debug", "Unhandled %s stanza: %s; xmlns=%s", origin.type, stanza.name, xmlns); -- we didn't handle it
if stanza.attr.type ~= "error" and stanza.attr.type ~= "result" then
origin.send(st.error_reply(stanza, "cancel", "service-unavailable"));
diff --git a/core/s2smanager.lua b/core/s2smanager.lua
index 053dbbe7..ca87670a 100644
--- a/core/s2smanager.lua
+++ b/core/s2smanager.lua
@@ -68,7 +68,7 @@ local function bounce_sendq(session, reason)
for i, data in ipairs(sendq) do
local reply = data[2];
local xmlns = reply.attr.xmlns;
- if not xmlns or xmlns == "jabber:client" or xmlns == "jabber:server" then
+ if not xmlns then
reply.attr.type = "error";
reply:tag("error", {type = "cancel"})
:tag("remote-server-not-found", {xmlns = "urn:ietf:params:xml:ns:xmpp-stanzas"}):up();
@@ -91,7 +91,7 @@ function send_to_host(from_host, to_host, data)
local host = hosts[from_host].s2sout[to_host];
if host then
-- We have a connection to this host already
- if host.type == "s2sout_unauthed" and (data.name ~= "db:verify" or not host.dialback_key) and ((not data.xmlns) or data.xmlns == "jabber:client" or data.xmlns == "jabber:server") then
+ if host.type == "s2sout_unauthed" and (data.name ~= "db:verify" or not host.dialback_key) then
(host.log or log)("debug", "trying to send over unauthed s2sout to "..to_host);
-- Queue stanza until we are able to send it
diff --git a/core/stanza_router.lua b/core/stanza_router.lua
index 0e04a4e5..d6dd5306 100644
--- a/core/stanza_router.lua
+++ b/core/stanza_router.lua
@@ -23,9 +23,6 @@ local bare_sessions = _G.prosody.bare_sessions;
function core_process_stanza(origin, stanza)
(origin.log or log)("debug", "Received[%s]: %s", origin.type, stanza:top_tag())
- -- Currently we guarantee every stanza to have an xmlns, should we keep this rule?
- if not stanza.attr.xmlns then stanza.attr.xmlns = "jabber:client"; end
-
-- TODO verify validity of stanza (as well as JID validity)
if stanza.attr.type == "error" and #stanza.tags == 0 then return; end -- TODO invalid stanza, log
if stanza.name == "iq" then
@@ -36,7 +33,7 @@ function core_process_stanza(origin, stanza)
end
end
- if origin.type == "c2s" and stanza.attr.xmlns == "jabber:client" then
+ if origin.type == "c2s" and not stanza.attr.xmlns then
if not origin.full_jid
and not(stanza.name == "iq" and stanza.attr.type == "set" and stanza.tags[1] and stanza.tags[1].name == "bind"
and stanza.tags[1].attr.xmlns == "urn:ietf:params:xml:ns:xmpp-bind") then
@@ -92,7 +89,7 @@ function core_process_stanza(origin, stanza)
return; -- FIXME what should we do here?
end]] -- FIXME
- if (origin.type == "s2sin" or origin.type == "c2s" or origin.type == "component") and xmlns == "jabber:client" then
+ if (origin.type == "s2sin" or origin.type == "c2s" or origin.type == "component") and xmlns == nil then
if origin.type == "s2sin" and not origin.dummy then
local host_status = origin.hosts[from_host];
if not host_status or not host_status.authed then -- remote server trying to impersonate some other server?
@@ -105,14 +102,14 @@ function core_process_stanza(origin, stanza)
local h = hosts[stanza.attr.to or origin.host or origin.to_host];
if h then
local event;
- if stanza.attr.xmlns == "jabber:client" then
+ if xmlns == nil then
if stanza.name == "iq" and (stanza.attr.type == "set" or stanza.attr.type == "get") then
event = "stanza/iq/"..stanza.tags[1].attr.xmlns..":"..stanza.tags[1].name;
else
event = "stanza/"..stanza.name;
end
else
- event = "stanza/"..stanza.attr.xmlns..":"..stanza.name;
+ event = "stanza/"..xmlns..":"..stanza.name;
end
if h.events.fire_event(event, {origin = origin, stanza = stanza}) then return; end
end
diff --git a/net/xmppserver_listener.lua b/net/xmppserver_listener.lua
index d63f5c23..d1272edb 100644
--- a/net/xmppserver_listener.lua
+++ b/net/xmppserver_listener.lua
@@ -50,6 +50,9 @@ end
local function handleerr(err) log("error", "Traceback[s2s]: %s: %s", tostring(err), debug.traceback()); end
function stream_callbacks.handlestanza(a, b)
+ if b.attr.xmlns == "jabber:client" then --COMPAT: Prosody pre-0.6.2 may send jabber:client
+ b.attr.xmlns = nil;
+ end
xpcall(function () core_process_stanza(a, b) end, handleerr);
end