X-Git-Url: https://git.enpas.org/?a=blobdiff_plain;f=core%2Fhostmanager.lua;h=b3493e6736711e0147c93391609060db49f775a2;hb=23c6f9b64369d6ac527c8e03bea3ad81d31fbe80;hp=15484574eb8e890d1d576f097868cd99fb1823b0;hpb=2ebb2035345a800fc0f72213d4b356635725e98c;p=prosody.git

diff --git a/core/hostmanager.lua b/core/hostmanager.lua
index 15484574..b3493e67 100644
--- a/core/hostmanager.lua
+++ b/core/hostmanager.lua
@@ -11,10 +11,19 @@ local ssl = ssl
 local hosts = hosts;
 local configmanager = require "core.configmanager";
 local eventmanager = require "core.eventmanager";
+local modulemanager = require "core.modulemanager";
 local events_new = require "util.events".new;
 
+local uuid_gen = require "util.uuid".generate;
+
+if not _G.prosody.incoming_s2s then
+	require "core.s2smanager";
+end
+local incoming_s2s = _G.prosody.incoming_s2s;
+
 -- These are the defaults if not overridden in the config
-local default_ssl_ctx = { mode = "client", protocol = "sslv23", capath = "/etc/ssl/certs", verify = "none"; };
+local default_ssl_ctx = { mode = "client", protocol = "sslv23", capath = "/etc/ssl/certs", verify = "none", options = "no_sslv2"; };
+local default_ssl_ctx_in = { mode = "server", protocol = "sslv23", capath = "/etc/ssl/certs", verify = "none", options = "no_sslv2"; };
 
 local log = require "util.logger".init("hostmanager");
 
@@ -40,10 +49,11 @@ eventmanager.add_event_hook("server-starting", load_enabled_hosts);
 
 function activate(host, host_config)
 	hosts[host] = {type = "local", connected = true, sessions = {}, 
-	               host = host, s2sout = {}, events = events_new(), 
-	               disallow_s2s = configmanager.get(host, "core", "disallow_s2s") 
-	                 or (configmanager.get(host, "core", "anonymous_login") 
-	                     and (configmanager.get(host, "core", "disallow_s2s") ~= false))
+			host = host, s2sout = {}, events = events_new(), 
+			disallow_s2s = configmanager.get(host, "core", "disallow_s2s") 
+				or (configmanager.get(host, "core", "anonymous_login") 
+				and (configmanager.get(host, "core", "disallow_s2s") ~= false));
+			dialback_secret = configmanager.get(host, "core", "dialback_secret") or uuid_gen();
 	              };
 	for option_name in pairs(host_config.core) do
 		if option_name:match("_ports$") then
@@ -55,6 +65,7 @@ function activate(host, host_config)
 		local ssl_config = host_config.core.ssl or configmanager.get("*", "core", "ssl");
 		if ssl_config then
         		hosts[host].ssl_ctx = ssl.newcontext(setmetatable(ssl_config, { __index = default_ssl_ctx }));
+        		hosts[host].ssl_ctx_in = ssl.newcontext(setmetatable(ssl_config, { __index = default_ssl_ctx_in }));
         	end
         end
 
@@ -62,19 +73,44 @@ function activate(host, host_config)
 	eventmanager.fire_event("host-activated", host, host_config);
 end
 
-function deactivate(host)
+function deactivate(host, reason)
 	local host_session = hosts[host];
 	log("info", "Deactivating host: %s", host);
 	eventmanager.fire_event("host-deactivating", host, host_session);
 	
+	reason = reason or { condition = "host-gone", text = "This server has stopped serving "..host };
+	
 	-- Disconnect local users, s2s connections
-	for user, session_list in pairs(host_session.sessions) do
-		for resource, session in pairs(session_list) do
-			session:close("host-gone");
+	if host_session.sessions then
+		for username, user in pairs(host_session.sessions) do
+			for resource, session in pairs(user.sessions) do
+				log("debug", "Closing connection for %s@%s/%s", username, host, resource);
+				session:close(reason);
+			end
 		end
 	end
-	-- Components?
-	
+	if host_session.s2sout then
+		for remotehost, session in pairs(host_session.s2sout) do
+			if session.close then
+				log("debug", "Closing outgoing connection to %s", remotehost);
+				if session.srv_hosts then session.srv_hosts = nil; end
+				session:close(reason);
+			end
+		end
+	end
+	for remote_session in pairs(incoming_s2s) do
+		if remote_session.to_host == host then
+			log("debug", "Closing incoming connection from %s", remote_session.from_host or "<unknown>");
+			remote_session:close(reason);
+		end
+	end
+
+	if host_session.modules then
+		for module in pairs(host_session.modules) do
+			modulemanager.unload(host, module);
+		end
+	end
+
 	hosts[host] = nil;
 	eventmanager.fire_event("host-deactivated", host);
 	log("info", "Deactivated host: %s", host);