X-Git-Url: https://git.enpas.org/?a=blobdiff_plain;f=net%2Fxmppcomponent_listener.lua;h=6f02b136954027a78a8ac03c01a95065a3c95dd2;hb=9e7852cb46aea48f82809d1c8d67f9d036178779;hp=b87f7c96cf500e285bfbdda8552b1df35c916ad9;hpb=2f3a9c1f031f043e3984488f0ec5affa53a2f2f3;p=prosody.git

diff --git a/net/xmppcomponent_listener.lua b/net/xmppcomponent_listener.lua
index b87f7c96..6f02b136 100644
--- a/net/xmppcomponent_listener.lua
+++ b/net/xmppcomponent_listener.lua
@@ -18,6 +18,7 @@ local connlisteners = require "net.connlisteners";
 local cm_register_component = require "core.componentmanager".register_component;
 local cm_deregister_component = require "core.componentmanager".deregister_component;
 local uuid_gen = require "util.uuid".generate;
+local jid_split = require "util.jid".split;
 local sha1 = require "util.hashes".sha1;
 local st = require "util.stanza";
 local init_xmlhandlers = require "core.xmlhandlers";
@@ -72,13 +73,10 @@ function stream_callbacks.streamopened(session, attr)
 		return;
 	end
 	
-	-- Store the original host (this is used for config, etc.)
-	session.user = attr.to;
-	-- Set the host for future reference
-	session.host = config.get(attr.to, "core", "component_address") or attr.to;
 	-- Note that we don't create the internal component 
 	-- until after the external component auths successfully
 
+	session.host = attr.to;
 	session.streamid = uuid_gen();
 	session.notopen = nil;
 	
@@ -88,7 +86,7 @@ function stream_callbacks.streamopened(session, attr)
 end
 
 function stream_callbacks.streamclosed(session)
-	session.log("Received </stream:stream>");
+	session.log("debug", "Received </stream:stream>");
 	session:close();
 end
 
@@ -99,6 +97,31 @@ function stream_callbacks.handlestanza(session, stanza)
 	if not stanza.attr.xmlns and stanza.name == "handshake" then
 		stanza.attr.xmlns = xmlns_component;
 	end
+	if not stanza.attr.xmlns or stanza.attr.xmlns == "jabber:client" then
+		local from = stanza.attr.from;
+		if from then
+			if session.component_validate_from then
+				local _, domain = jid_split(stanza.attr.from);
+				if domain ~= session.host then
+					-- Return error
+					session.log("warn", "Component sent stanza with missing or invalid 'from' address");
+					session:close{
+						condition = "invalid-from";
+						text = "Component tried to send from address <"..tostring(from)
+							   .."> which is not in domain <"..tostring(session.host)..">";
+					};
+					return;
+				end
+			end
+		else
+			stanza.attr.from = session.host;
+		end
+		if not stanza.attr.to then
+			session.log("warn", "Rejecting stanza with no 'to' address");
+			session.send(st.error_reply(stanza, "modify", "bad-request", "Components MUST specify a 'to' address on stanzas"));
+			return;
+		end
+	end
 	return core_process_stanza(session, stanza);
 end
 
@@ -180,7 +203,7 @@ function component_listener.ondisconnect(conn, err)
 	local session = sessions[conn];
 	if session then
 		(session.log or log)("info", "component disconnected: %s (%s)", tostring(session.host), tostring(err));
-		if session.host then
+		if hosts[session.host] then
 			log("debug", "Deregistering component");
 			cm_deregister_component(session.host);
 			hosts[session.host].connected = nil;