xmlhandlers: Don't restrict CDATA

[prosody.git] / core / stanza_router.lua

diff --git a/core/stanza_router.lua b/core/stanza_router.lua
index b60ff2b51451506e99fb729feb848f1b6ce2eeaa..d6dd53062d655ae59768b097a0c9b71d7c6d1a5e 100644 (file)
--- a/core/stanza_router.lua
+++ b/core/stanza_router.lua
@@ -1,6 +1,6 @@
 -- Prosody IM
--- Copyright (C) 2008-2009 Matthew Wild
--- Copyright (C) 2008-2009 Waqas Hussain
+-- Copyright (C) 2008-2010 Matthew Wild
+-- Copyright (C) 2008-2010 Waqas Hussain
 -- 
 -- This project is MIT/X11 licensed. Please see the
 -- COPYING file in the source package for more information.
@@ -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,12 +33,14 @@ function core_process_stanza(origin, stanza)
                end
        end
 
-       if origin.type == "c2s" 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
                        -- authenticated client isn't bound and current stanza is not a bind request
-                       origin.send(st.error_reply(stanza, "auth", "not-authorized")); -- FIXME maybe allow stanzas to account or server
+                       if stanza.attr.type ~= "result" and stanza.attr.type ~= "error" then
+                               origin.send(st.error_reply(stanza, "auth", "not-authorized")); -- FIXME maybe allow stanzas to account or server
+                       end
                        return;
                end
 
@@ -90,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?
@@ -98,19 +97,19 @@ function core_process_stanza(origin, stanza)
                                return; -- FIXME what should we do here? does this work with subdomains?
                        end
                end
-               core_post_stanza(origin, stanza);
+               core_post_stanza(origin, stanza, origin.full_jid);
        else
                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
@@ -119,12 +118,12 @@ function core_process_stanza(origin, stanza)
        end
 end
 
-function core_post_stanza(origin, stanza)
+function core_post_stanza(origin, stanza, preevents)
        local to = stanza.attr.to;
        local node, host, resource = jid_split(to);
        local to_bare = node and (node.."@"..host) or host; -- bare JID
 
-       local to_type;
+       local to_type, to_self;
        if node then
                if resource then
                        to_type = '/full';
@@ -132,6 +131,7 @@ function core_post_stanza(origin, stanza)
                        to_type = '/bare';
                        if node == origin.username and host == origin.host then
                                stanza.attr.to = nil;
+                               to_self = true;
                        end
                end
        else
@@ -139,16 +139,18 @@ function core_post_stanza(origin, stanza)
                        to_type = '/host';
                else
                        to_type = '/bare';
+                       to_self = true;
                end
        end
 
        local event_data = {origin=origin, stanza=stanza};
-       if origin.full_jid == stanza.attr.from then -- c2s connection
+       if preevents then -- c2s connection
                if hosts[origin.host].events.fire_event('pre-'..stanza.name..to_type, event_data) then return; end -- do preprocessing
        end
        local h = hosts[to_bare] or hosts[host or origin.host];
        if h then
                if h.events.fire_event(stanza.name..to_type, event_data) then return; end -- do processing
+               if to_self and h.events.fire_event(stanza.name..'/self', event_data) then return; end -- do processing
 
                if h.type == "component" then
                        component_handle_stanza(origin, stanza);
@@ -180,7 +182,7 @@ function core_route_stanza(origin, stanza)
                        local xmlns = stanza.attr.xmlns;
                        --stanza.attr.xmlns = "jabber:server";
                        stanza.attr.xmlns = nil;
-                       log("debug", "sending s2s stanza: %s", tostring(stanza));
+                       log("debug", "sending s2s stanza: %s", tostring(stanza.top_tag and stanza:top_tag()) or stanza);
                        send_s2s(origin.host, host, stanza); -- TODO handle remote routing errors
                        stanza.attr.xmlns = xmlns; -- reset
                else