mod_tls: Set the sslctx on outgoing connections (possibly the cause of outgoing s2s...

[prosody.git] / core / stanza_router.lua

diff --git a/core/stanza_router.lua b/core/stanza_router.lua
index dac098bbccae4af59c7d044d79f027e4303f706a..12133a8ee7d65e4e8ad3d619dc81df593c6e6318 100644 (file)
--- a/core/stanza_router.lua
+++ b/core/stanza_router.lua
@@ -8,7 +8,7 @@
 
 local log = require "util.logger".init("stanzarouter")
 
-local hosts = _G.hosts;
+local hosts = _G.prosody.hosts;
 local tostring = tostring;
 local st = require "util.stanza";
 local send_s2s = require "core.s2smanager".send_to_host;
@@ -17,6 +17,9 @@ local component_handle_stanza = require "core.componentmanager".handle_stanza;
 local jid_split = require "util.jid".split;
 local jid_prepped_split = require "util.jid".prepped_split;
 
+local full_sessions = _G.prosody.full_sessions;
+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())
 
@@ -26,7 +29,8 @@ function core_process_stanza(origin, stanza)
        -- 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
-               if (stanza.attr.type == "set" or stanza.attr.type == "get") and #stanza.tags ~= 1 then
+               if not stanza.attr.id then stanza.attr.id = ""; end -- COMPAT Jabiru doesn't send the id attribute on roster requests
+               if (stanza.attr.type == "set" or stanza.attr.type == "get") and (#stanza.tags ~= 1) then
                        origin.send(st.error_reply(stanza, "modify", "bad-request"));
                        return;
                end
@@ -94,7 +98,7 @@ 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
@@ -110,12 +114,12 @@ function core_process_stanza(origin, stanza)
                        end
                        if h.events.fire_event(event, {origin = origin, stanza = stanza}) then return; end
                end
-               if host and not hosts[host] then host = nil; end -- workaround for a Pidgin bug which sets 'to' to the SRV result
+               if host and not hosts[host] then host = nil; end -- COMPAT: workaround for a Pidgin bug which sets 'to' to the SRV result
                modules_handle_stanza(host or origin.host or origin.to_host, 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
@@ -139,7 +143,7 @@ function core_post_stanza(origin, stanza)
        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];
@@ -176,7 +180,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
@@ -187,6 +191,6 @@ function core_route_stanza(origin, stanza)
                log("debug", "Routing outgoing stanza for %s to %s", from_host, host);
                send_s2s(from_host, host, stanza);
        else
-               log("warn", "received stanza from unhandled connection type: %s", origin.type);
+               log("warn", "received %s stanza from unhandled connection type: %s", tostring(stanza.name), tostring(origin.type));
        end
 end