net.dns: (for some reason this commit didn't pull over from 0.5) Remove hard-coded...

[prosody.git] / core / stanza_router.lua

diff --git a/core/stanza_router.lua b/core/stanza_router.lua
index b00da57b4ac54fe8c85ca0b6318a23de7daec8eb..dac098bbccae4af59c7d044d79f027e4303f706a 100644 (file)
--- a/core/stanza_router.lua
+++ b/core/stanza_router.lua
@@ -1,4 +1,4 @@
--- Prosody IM v0.4
+-- Prosody IM
 -- Copyright (C) 2008-2009 Matthew Wild
 -- Copyright (C) 2008-2009 Waqas Hussain
 -- 
@@ -6,30 +6,16 @@
 -- COPYING file in the source package for more information.
 --
 
-
-
 local log = require "util.logger".init("stanzarouter")
 
 local hosts = _G.hosts;
-
+local tostring = tostring;
 local st = require "util.stanza";
 local send_s2s = require "core.s2smanager".send_to_host;
-local user_exists = require "core.usermanager".user_exists;
-
-local rostermanager = require "core.rostermanager";
-local offlinemanager = require "core.offlinemanager";
-
 local modules_handle_stanza = require "core.modulemanager".handle_stanza;
 local component_handle_stanza = require "core.componentmanager".handle_stanza;
-
-local tostring = tostring;
-local t_insert = table.insert;
-local pairs = pairs;
-local ipairs = ipairs;
-
 local jid_split = require "util.jid".split;
 local jid_prepped_split = require "util.jid".prepped_split;
-local fire_event = prosody.events.fire_event;
 
 function core_process_stanza(origin, stanza)
        (origin.log or log)("debug", "Received[%s]: %s", origin.type, stanza:top_tag())
@@ -153,51 +139,49 @@ function core_post_stanza(origin, stanza)
        end
 
        local event_data = {origin=origin, stanza=stanza};
-       if origin.full_jid then -- c2s connection
+       if origin.full_jid == stanza.attr.from 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 h.type == "component" then
                        component_handle_stanza(origin, stanza);
                        return;
-               else
-                       if h.events.fire_event(stanza.name..to_type, event_data) then return; end -- do processing
-               end
-               if not modules_handle_stanza(h.host, origin, stanza) then
-                       if stanza.attr.xmlns == "jabber:client" and stanza.attr.type ~= "result" and stanza.attr.type ~= "error" then
-                               origin.send(st.error_reply(stanza, "cancel", "service-unavailable"));
-                       end
                end
+               modules_handle_stanza(h.host, origin, stanza);
        else
                core_route_stanza(origin, stanza);
        end
 end
 
 function core_route_stanza(origin, stanza)
-       local to = stanza.attr.to;
-       local node, host, resource = jid_split(to);
-       local to_bare = node and (node.."@"..host) or host; -- bare JID
-       local from = stanza.attr.from;
-       local from_node, from_host, from_resource = jid_split(from);
-       local from_bare = from_node and (from_node.."@"..from_host) or from_host; -- bare JID
+       local node, host, resource = jid_split(stanza.attr.to);
+       local from_node, from_host, from_resource = jid_split(stanza.attr.from);
 
        -- Auto-detect origin if not specified
        origin = origin or hosts[from_host];
        if not origin then return false; end
        
-       local host_session = hosts[host]
-       if host_session and host_session.type == "local" then
+       if hosts[host] then
                -- old stanza routing code removed
                core_post_stanza(origin, stanza);
        elseif origin.type == "c2s" then
                -- Remote host
-               local xmlns = stanza.attr.xmlns;
-               --stanza.attr.xmlns = "jabber:server";
-               stanza.attr.xmlns = nil;
-               log("debug", "sending s2s stanza: %s", tostring(stanza));
-               send_s2s(origin.host, host, stanza); -- TODO handle remote routing errors
-               stanza.attr.xmlns = xmlns; -- reset
+               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
+                       local xmlns = stanza.attr.xmlns;
+                       --stanza.attr.xmlns = "jabber:server";
+                       stanza.attr.xmlns = nil;
+                       log("debug", "sending s2s stanza: %s", tostring(stanza));
+                       send_s2s(origin.host, host, stanza); -- TODO handle remote routing errors
+                       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"));
+               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);
@@ -205,5 +189,4 @@ function core_route_stanza(origin, stanza)
        else
                log("warn", "received stanza from unhandled connection type: %s", origin.type);
        end
-       stanza.attr.to = to; -- reset
 end