Merge with Zash

[prosody.git] / core / stanza_router.lua

diff --git a/core/stanza_router.lua b/core/stanza_router.lua
index 97d328a1afbe3b2c51b2bff12a31fa139581bbda..54c5a1a6a8122db45cb96e6cfddbade83c980ec3 100644 (file)
--- a/core/stanza_router.lua
+++ b/core/stanza_router.lua
@@ -11,7 +11,6 @@ local log = require "util.logger".init("stanzarouter")
 local hosts = _G.prosody.hosts;
 local tostring = tostring;
 local st = require "util.stanza";
-local send_s2s = require "core.s2smanager".send_to_host;
 local jid_split = require "util.jid".split;
 local jid_prepped_split = require "util.jid".prepped_split;
 
@@ -40,6 +39,7 @@ local function handle_unhandled_stanza(host, origin, stanza)
        end
 end
 
+local iq_types = { set=true, get=true, result=true, error=true };
 function core_process_stanza(origin, stanza)
        (origin.log or log)("debug", "Received[%s]: %s", origin.type, stanza:top_tag())
 
@@ -47,8 +47,8 @@ function core_process_stanza(origin, stanza)
        if stanza.attr.type == "error" and #stanza.tags == 0 then return; end -- TODO invalid stanza, log
        if stanza.name == "iq" 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"));
+               if not iq_types[stanza.attr.type] or ((stanza.attr.type == "set" or stanza.attr.type == "get") and (#stanza.tags ~= 1)) then
+                       origin.send(st.error_reply(stanza, "modify", "bad-request", "Invalid IQ type or incorrect number of children"));
                        return;
                end
        end
@@ -104,11 +104,6 @@ function core_process_stanza(origin, stanza)
                stanza.attr.from = from;
        end
 
-       --[[if to and not(hosts[to]) and not(hosts[to_bare]) and (hosts[host] and hosts[host].type ~= "local") then -- not for us?
-               log("warn", "stanza recieved for a non-local server");
-               return; -- FIXME what should we do here?
-       end]] -- FIXME
-
        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];
@@ -188,26 +183,18 @@ function core_route_stanza(origin, stanza)
        if hosts[host] then
                -- old stanza routing code removed
                core_post_stanza(origin, stanza);
-       elseif origin.type == "c2s" then
-               -- Remote host
+       else
+               log("debug", "Routing to remote...");
                if not hosts[from_host] then
                        log("error", "No hosts[from_host] (please report): %s", tostring(stanza));
-               end
-               if (not hosts[from_host]) or (not hosts[from_host].disallow_s2s) then
+               else
                        local xmlns = stanza.attr.xmlns;
-                       --stanza.attr.xmlns = "jabber:server";
                        stanza.attr.xmlns = nil;
-                       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
+                       local routed = prosody.events.fire_event("route/remote", { origin = origin, stanza = stanza, from_host = from_host, to_host = host }); --FIXME: Should be per-host (shared modules!)
                        stanza.attr.xmlns = xmlns; -- reset
-               else
-                       core_route_stanza(hosts[from_host], st.error_reply(stanza, "cancel", "not-allowed", "Communication with remote servers is not allowed"));
+                       if routed == nil then
+                               core_route_stanza(hosts[from_host], st.error_reply(stanza, "cancel", "not-allowed", "Communication with remote domains is not enabled"));
+                       end
                end
-       elseif origin.type == "component" or origin.type == "local" then
-               -- Route via s2s for components and modules
-               log("debug", "Routing outgoing stanza for %s to %s", from_host, host);
-               send_s2s(from_host, host, stanza);
-       else
-               log("warn", "received %s stanza from unhandled connection type: %s", tostring(stanza.name), tostring(origin.type));
        end
 end