X-Git-Url: https://git.enpas.org/?a=blobdiff_plain;f=core%2Fstanza_router.lua;h=dac098bbccae4af59c7d044d79f027e4303f706a;hb=612cbf433a303ccd49eec61b6709751e37dfb04a;hp=9bb58ad5a1f7825f14de5e29ff0d94b78e1190b1;hpb=44f09995e0ba0ba89353b327f0b0a02c107eacac;p=prosody.git

diff --git a/core/stanza_router.lua b/core/stanza_router.lua
index 9bb58ad5..dac098bb 100644
--- 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,74 +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
-	end
-
-	if host and fire_event(host.."/"..stanza.name, event_data) then
-		-- event handled
-	elseif stanza.name == "presence" and origin.host and fire_event(origin.host.."/"..stanza.name, event_data) then
-		-- event handled
-	elseif not to then
-		modules_handle_stanza(host or origin.host or origin.to_host, origin, stanza);
-	elseif hosts[to] and hosts[to].type == "local" then -- directed at a local server
-		modules_handle_stanza(host or origin.host or origin.to_host, origin, stanza);
-	elseif hosts[to_bare] and hosts[to_bare].type == "component" then -- hack to allow components to handle node@server
-		component_handle_stanza(origin, stanza);
-	elseif hosts[host] and hosts[host].type == "component" then -- directed at a component
-		component_handle_stanza(origin, stanza);
-	elseif hosts[host] and hosts[host].type == "local" and stanza.name == "iq" and not resource then -- directed at bare JID
-		modules_handle_stanza(host or origin.host or origin.to_host, origin, stanza);
+		modules_handle_stanza(h.host, origin, stanza);
 	else
 		core_route_stanza(origin, stanza);
 	end
 end
 
 function core_route_stanza(origin, stanza)
-	-- Hooks
-	--- ...later
-
-	-- Deliver
-	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
 	
-	if hosts[to_bare] and hosts[to_bare].type == "component" then -- hack to allow components to handle node@server
-		return component_handle_stanza(origin, stanza);
-	elseif hosts[host] and hosts[host].type == "component" then -- directed at a component
-		return component_handle_stanza(origin, stanza);
-	end
-
-	if stanza.name == "presence" and (stanza.attr.type ~= nil and stanza.attr.type ~= "unavailable" and stanza.attr.type ~= "error") then resource = nil; 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);
@@ -228,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