X-Git-Url: https://git.enpas.org/?a=blobdiff_plain;f=core%2Fstanza_router.lua;h=9533123e6eaa8b21f82bf30a993b6cf81ae9911d;hb=61fbebe4017d142510fbcfce61714ecb48b99503;hp=52028653448d110b6387fb2a7d7ecacba4948245;hpb=9f8f5a6813f8c31a4f3147e57ce3d3bef14aaf19;p=prosody.git

diff --git a/core/stanza_router.lua b/core/stanza_router.lua
index 52028653..9533123e 100644
--- a/core/stanza_router.lua
+++ b/core/stanza_router.lua
@@ -47,15 +47,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" or not stanza.attr.xmlns) and stanza.attr.type ~= "error" and stanza.attr.type ~= "result" then
+	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)
@@ -78,11 +79,28 @@ function core_process_stanza(origin, stanza)
 		stanza.attr.from = origin.full_jid;
 	end
 	local to, xmlns = stanza.attr.to, stanza.attr.xmlns;
-	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;
+	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");