X-Git-Url: https://git.enpas.org/?a=blobdiff_plain;f=core%2Fstanza_router.lua;h=844cbf881a9c5d53eada5d5f6f99c00145ec65fa;hb=8a6a7668b61b7c7a9a533f407e2610e90aa8a1a5;hp=ca35b38a7163941b885882b1336562a9441be4b9;hpb=42162cee6e454afce29f0169c1acefe0d19151e3;p=prosody.git

diff --git a/core/stanza_router.lua b/core/stanza_router.lua
index ca35b38a..844cbf88 100644
--- a/core/stanza_router.lua
+++ b/core/stanza_router.lua
@@ -1,3 +1,12 @@
+-- Prosody IM v0.3
+-- Copyright (C) 2008 Matthew Wild
+-- Copyright (C) 2008 Waqas Hussain
+-- 
+-- This project is MIT/X11 licensed. Please see the
+-- COPYING file in the source package for more information.
+--
+
+
 
 local log = require "util.logger".init("stanzarouter")
 
@@ -27,10 +36,16 @@ local tonumber = tonumber;
 local s_find = string.find;
 
 local jid_split = require "util.jid".split;
+local jid_prepped_split = require "util.jid".prepped_split;
 local print = print;
+local function checked_error_reply(origin, stanza)
+	if (stanza.attr.xmlns == "jabber:client" or stanza.attr.xmlns == "jabber:server") and stanza.attr.type ~= "error" and stanza.attr.type ~= "result" then
+		origin.send(st.error_reply(stanza, "cancel", "service-unavailable")); -- FIXME correct error?
+	end
+end
 
 function core_process_stanza(origin, stanza)
-	(origin.log or log)("debug", "Received[%s]: %s", origin.type, stanza:pretty_print()) --top_tag())
+	(origin.log or log)("debug", "Received[%s]: %s", origin.type, stanza:top_tag())
 
 	if not stanza.attr.xmlns then stanza.attr.xmlns = "jabber:client"; end -- FIXME Hack. This should be removed when we fix namespace handling.
 	-- TODO verify validity of stanza (as well as JID validity)
@@ -52,36 +67,54 @@ function core_process_stanza(origin, stanza)
 	if origin.type == "c2s" then
 		stanza.attr.from = origin.full_jid;
 	end
-	local to = stanza.attr.to;
-	local node, host, resource = jid_split(to);
-	local to_bare = node and (node.."@"..host) or host; -- bare JID
+	local to, xmlns = stanza.attr.to, stanza.attr.xmlns;
 	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
-
-	if origin.type == "s2sin" then
-		if origin.from_host ~= from_host then -- remote server trying to impersonate some other server?
-			log("warn", "Received a stanza claiming to be from %s, over a conn authed for %s!", from, origin.from_host);
-			return; -- FIXME what should we do here? does this work with subdomains?
+	local node, host, resource;
+	local from_node, from_host, from_resource;
+	local to_bare, from_bare;
+	if to then
+		node, host, resource = jid_prepped_split(to);
+		if not host then
+			error("Invalid to JID");
+		end
+		to_bare = node and (node.."@"..host) or host; -- bare JID
+		if resource then to = to_bare.."/"..resource; else to = to_bare; end
+		stanza.attr.to = to;
+	end
+	if from then
+		from_node, from_host, from_resource = jid_prepped_split(from);
+		if not from_host then
+			error("Invalid from JID");
 		end
+		from_bare = from_node and (from_node.."@"..from_host) or from_host; -- bare JID
+		if from_resource then from = from_bare.."/"..from_resource; else from = from_bare; end
+		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
 
 	-- FIXME do stanzas not of jabber:client get handled by components?
-	if origin.type == "s2sin" or origin.type == "c2s" then
+	if (origin.type == "s2sin" or origin.type == "c2s") and (not xmlns or xmlns == "jabber:server" or xmlns == "jabber:client") then			
+		if origin.type == "s2sin" and not origin.dummy then
+			local host_status = origin.hosts[from_host];
+			if not host_status or not host_status.authed then -- remote server trying to impersonate some other server?
+				log("warn", "Received a stanza claiming to be from %s, over a conn authed for %s!", from_host, origin.from_host);
+				return; -- FIXME what should we do here? does this work with subdomains?
+			end
+		end
 		if not to then
 			core_handle_stanza(origin, stanza);
 		elseif hosts[to] and hosts[to].type == "local" then -- directed at a local server
 			core_handle_stanza(origin, stanza);
 		elseif stanza.attr.xmlns and stanza.attr.xmlns ~= "jabber:client" and stanza.attr.xmlns ~= "jabber:server" then
 			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[to] and hosts[to].type == "component" then -- hack to allow components to handle node@server/resource and server/resource
 			component_handle_stanza(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 origin.type == "c2s" and stanza.name == "presence" and stanza.attr.type ~= nil and stanza.attr.type ~= "unavailable" then
@@ -89,6 +122,10 @@ function core_process_stanza(origin, stanza)
 		elseif origin.type ~= "c2s" and stanza.name == "iq" and not resource then -- directed at bare JID
 			core_handle_stanza(origin, stanza);
 		else
+			if origin.type == "c2s" and stanza.name == "presence" and to ~= nil and not(origin.roster[to_bare] and (origin.roster[to_bare].subscription == "both" or origin.roster[to_bare].subscription == "from")) then
+				origin.directed = origin.directed or {};
+				t_insert(origin.directed, to); -- FIXME does it make more sense to add to_bare rather than to?
+			end
 			core_route_stanza(origin, stanza);
 		end
 	else
@@ -100,31 +137,27 @@ end
 -- that is, they are handled by this server
 function core_handle_stanza(origin, stanza)
 	-- Handlers
-	if modules_handle_stanza(stanza.attr.to or origin.host, origin, stanza) then return; end
-	if origin.type == "c2s" or origin.type == "c2s_unauthed" then
-		local session = origin;
-
-		if stanza.name == "presence" and origin.roster then
-			if stanza.attr.type == nil or stanza.attr.type == "unavailable" then
-				handle_normal_presence(origin, stanza, core_route_stanza);
-			else
-				log("warn", "Unhandled c2s presence: %s", tostring(stanza));
-				if (stanza.attr.xmlns == "jabber:client" or stanza.attr.xmlns == "jabber:server") and stanza.attr.type ~= "error" then
-					origin.send(st.error_reply(stanza, "cancel", "service-unavailable")); -- FIXME correct error?
+	if modules_handle_stanza(select(2, jid_split(stanza.attr.to)) or origin.host, origin, stanza) then return; end
+	if origin.type == "c2s" or origin.type == "s2sin" then
+		if origin.type == "c2s" then
+			if stanza.name == "presence" and origin.roster then
+				if stanza.attr.type == nil or stanza.attr.type == "unavailable" then
+					handle_normal_presence(origin, stanza, core_route_stanza);
+				else
+					log("warn", "Unhandled c2s presence: %s", tostring(stanza));
+					checked_error_reply(origin, stanza);
 				end
+			else
+				log("warn", "Unhandled c2s stanza: %s", tostring(stanza));
+				checked_error_reply(origin, stanza);
 			end
-		else
-			log("warn", "Unhandled c2s stanza: %s", tostring(stanza));
-			if (stanza.attr.xmlns == "jabber:client" or stanza.attr.xmlns == "jabber:server") and stanza.attr.type ~= "error" and stanza.attr.type ~= "result" then
-				origin.send(st.error_reply(stanza, "cancel", "service-unavailable")); -- FIXME correct error?
-			end
-		end -- TODO handle other stanzas
-	else
-		log("warn", "Unhandled origin: %s", origin.type);
-		if (stanza.attr.xmlns == "jabber:client" or stanza.attr.xmlns == "jabber:server") and stanza.attr.type ~= "error" and stanza.attr.type ~= "result" then
-			-- s2s stanzas can get here
-			origin.send(st.error_reply(stanza, "cancel", "service-unavailable")); -- FIXME correct error?
+		else -- s2s stanzas
+			log("warn", "Unhandled s2s stanza: %s", tostring(stanza));
+			checked_error_reply(origin, stanza);
 		end
+	else
+		log("warn", "Unhandled %s stanza: %s", origin.type, tostring(stanza));
+		checked_error_reply(origin, stanza);
 	end
 end
 
@@ -203,7 +236,7 @@ function core_route_stanza(origin, stanza)
 					else
 						-- TODO send unavailable presence or unsubscribed
 					end
-				elseif stanza.name == "message" then
+				elseif stanza.name == "message" then -- FIXME if full jid, then send out to resources with highest priority
 					if stanza.attr.type == "chat" or stanza.attr.type == "normal" or not stanza.attr.type then
 						offlinemanager.store(node, host, stanza);
 						-- FIXME don't store messages with only chat state notifications
@@ -211,12 +244,13 @@ function core_route_stanza(origin, stanza)
 					-- TODO allow configuration of offline storage
 					-- TODO send error if not storing offline
 				elseif stanza.name == "iq" then
-					-- TODO send IQ error
+					origin.send(st.error_reply(stanza, "cancel", "service-unavailable"));
 				end
 			else -- user does not exist
 				-- TODO we would get here for nodeless JIDs too. Do something fun maybe? Echo service? Let plugins use xmpp:server/resource addresses?
 				if stanza.name == "presence" then
-					if stanza.attr.type == "probe" then
+					local t = stanza.attr.type;
+					if t == "subscribe" or t == "probe" then
 						origin.send(st.presence({from = to_bare, to = from_bare, type = "unsubscribed"}));
 					end
 					-- else ignore