X-Git-Url: https://git.enpas.org/?a=blobdiff_plain;f=core%2Fstanza_router.lua;h=ad312b850ef16d4dbe2ae7e70c5ba2b92fd9c6b2;hb=4f30ec4ac8e956391e63a65fe8b8515d615ad5ea;hp=eddeb9cd23804c6440946187815389c78c4c0520;hpb=94bff6ebbb3bd7f764c4eba5a9035c5d0e0668e2;p=prosody.git

diff --git a/core/stanza_router.lua b/core/stanza_router.lua
index eddeb9cd..ad312b85 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,19 @@
 -- COPYING file in the source package for more information.
 --
 
-
-
 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;
-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;
+
+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())
@@ -40,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
@@ -124,7 +114,7 @@ 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
@@ -153,73 +143,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.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
+			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);
@@ -227,5 +193,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