X-Git-Url: https://git.enpas.org/?a=blobdiff_plain;f=plugins%2Fmod_component.lua;h=a5136f6ca528f3628e32b065b81dcb09f871ebc7;hb=4586c8a7bcb1d8913ea40005acc41f4205cbf878;hp=3eaacb8eaf123994cea5237db7163c11b51cf5a4;hpb=a438279b6409d9edb636ae948161c6ccf067472b;p=prosody.git

diff --git a/plugins/mod_component.lua b/plugins/mod_component.lua
index 3eaacb8e..a5136f6c 100644
--- a/plugins/mod_component.lua
+++ b/plugins/mod_component.lua
@@ -25,43 +25,47 @@ local hosts = prosody.hosts;
 
 local log = module._log;
 
+local opt_keepalives = module:get_option_boolean("component_tcp_keepalives", module:get_option_boolean("tcp_keepalives", true));
+
 local sessions = module:shared("sessions");
 
 function module.add_host(module)
 	if module:get_host_type() ~= "component" then
 		error("Don't load mod_component manually, it should be for a component, please see http://prosody.im/doc/components", 0);
 	end
-
+	
 	local env = module.environment;
 	env.connected = false;
+	env.session = false;
 
 	local send;
 
 	local function on_destroy(session, err)
 		env.connected = false;
+		env.session = false;
 		send = nil;
 		session.on_destroy = nil;
 	end
-
+	
 	-- Handle authentication attempts by component
 	local function handle_component_auth(event)
 		local session, stanza = event.origin, event.stanza;
-
+		
 		if session.type ~= "component_unauthed" then return; end
-
+	
 		if (not session.host) or #stanza.tags > 0 then
 			(session.log or log)("warn", "Invalid component handshake for host: %s", session.host);
 			session:close("not-authorized");
 			return true;
 		end
-
+		
 		local secret = module:get_option("component_secret");
 		if not secret then
 			(session.log or log)("warn", "Component attempted to identify as %s, but component_secret is not set", session.host);
 			session:close("not-authorized");
 			return true;
 		end
-
+		
 		local supplied_token = t_concat(stanza);
 		local calculated_token = sha1(session.streamid..secret, true);
 		if supplied_token:lower() ~= calculated_token:lower() then
@@ -69,24 +73,31 @@ function module.add_host(module)
 			session:close{ condition = "not-authorized", text = "Given token does not match calculated token" };
 			return true;
 		end
-
+		
 		if env.connected then
-			module:log("error", "Second component attempted to connect, denying connection");
-			session:close{ condition = "conflict", text = "Component already connected" };
-			return true;
+			local policy = module:get_option_string("component_conflict_resolve", "kick_new");
+			if policy == "kick_old" then
+				env.session:close{ condition = "conflict", text = "Replaced by a new connection" };
+			else -- kick_new
+				module:log("error", "Second component attempted to connect, denying connection");
+				session:close{ condition = "conflict", text = "Component already connected" };
+				return true;
+			end
 		end
-
+		
 		env.connected = true;
+		env.session = session;
 		send = session.send;
 		session.on_destroy = on_destroy;
 		session.component_validate_from = module:get_option_boolean("validate_from_addresses", true);
 		session.type = "component";
 		module:log("info", "External component successfully authenticated");
 		session.send(st.stanza("handshake"));
-
+		module:fire_event("component-authenticated", { session = session });
+	
 		return true;
 	end
-	module:hook("stanza/jabber:component:accept:handshake", handle_component_auth);
+	module:hook("stanza/jabber:component:accept:handshake", handle_component_auth, -1);
 
 	-- Handle stanzas addressed to this component
 	local function handle_stanza(event)
@@ -114,7 +125,7 @@ function module.add_host(module)
 		end
 		return true;
 	end
-
+	
 	module:hook("iq/bare", handle_stanza, -1);
 	module:hook("message/bare", handle_stanza, -1);
 	module:hook("presence/bare", handle_stanza, -1);
@@ -175,9 +186,7 @@ function stream_callbacks.streamopened(session, attr)
 	session.streamid = uuid_gen();
 	session.notopen = nil;
 	-- Return stream header
-	session.send("<?xml version='1.0'?>");
-	session.send(st.stanza("stream:stream", { xmlns=xmlns_component,
-			["xmlns:stream"]='http://etherx.jabber.org/streams', id=session.streamid, from=session.host }):top_tag());
+	session:open_stream();
 end
 
 function stream_callbacks.streamclosed(session)
@@ -270,13 +279,17 @@ function listener.onconnect(conn)
 	session.log = logger.init(conn_name);
 	session.close = session_close;
 
+	if opt_keepalives then
+		conn:setoption("keepalive", opt_keepalives);
+	end
+	
 	session.log("info", "Incoming Jabber component connection");
-
+	
 	local stream = new_xmpp_stream(session, stream_callbacks);
 	session.stream = stream;
-
+	
 	session.notopen = true;
-
+	
 	function session.reset_stream()
 		session.notopen = true;
 		session.stream:reset();
@@ -288,7 +301,7 @@ function listener.onconnect(conn)
 		module:log("debug", "Received invalid XML (%s) %d bytes: %s", tostring(err), #data, data:sub(1, 300):gsub("[\r\n]+", " "):gsub("[%z\1-\31]", "_"));
 		session:close("not-well-formed");
 	end
-
+	
 	session.dispatch_stanza = stream_callbacks.handlestanza;
 
 	sessions[conn] = session;
@@ -313,6 +326,10 @@ function listener.ondisconnect(conn, err)
 	end
 end
 
+function listener.ondetach(conn)
+	sessions[conn] = nil;
+end
+
 module:provides("net", {
 	name = "component";
 	private = true;