X-Git-Url: https://git.enpas.org/?a=blobdiff_plain;f=plugins%2Fmod_tls.lua;h=6fde0a1e80964d9db491d2b19669100d792abef6;hb=16b4fa23d18cb061379f1c4a2c253e1220bb96dd;hp=8a45080341ec32afc70e91658a40f7f5ef49794c;hpb=68559169a08b07d7e52c72571231cdee564c1b62;p=prosody.git

diff --git a/plugins/mod_tls.lua b/plugins/mod_tls.lua
index 8a450803..6fde0a1e 100644
--- a/plugins/mod_tls.lua
+++ b/plugins/mod_tls.lua
@@ -14,45 +14,44 @@ local xmlns_starttls = 'urn:ietf:params:xml:ns:xmpp-tls';
 local secure_auth_only = module:get_option("c2s_require_encryption") or module:get_option("require_encryption");
 local secure_s2s_only = module:get_option("s2s_require_encryption");
 
-module:add_handler("c2s_unauthed", "starttls", xmlns_starttls,
-		function (session, stanza)
-			if session.conn.starttls then
-				session.send(st.stanza("proceed", { xmlns = xmlns_starttls }));
-				session:reset_stream();
-				if session.host and hosts[session.host].ssl_ctx_in then
-					session.conn.set_sslctx(hosts[session.host].ssl_ctx_in);
-				end
-				session.conn.starttls();
-				session.log("info", "TLS negotiation started...");
-				session.secure = false;
-			else
-				-- FIXME: What reply?
-				session.log("warn", "Attempt to start TLS, but TLS is not available on this connection");
-			end
-		end);
-		
-module:add_handler("s2sin_unauthed", "starttls", xmlns_starttls,
-		function (session, stanza)
-			if session.conn.starttls then
-				session.sends2s(st.stanza("proceed", { xmlns = xmlns_starttls }));
-				session:reset_stream();
-				if session.to_host and hosts[session.to_host].ssl_ctx_in then
-					session.conn.set_sslctx(hosts[session.to_host].ssl_ctx_in);
-				end
-				session.conn.starttls();
-				session.log("info", "TLS negotiation started for incoming s2s...");
-				session.secure = false;
-			else
-				-- FIXME: What reply?
-				session.log("warn", "Attempt to start TLS, but TLS is not available on this s2s connection");
-			end
-		end);
+local global_ssl_ctx = prosody.global_ssl_ctx;
+
+function c2s_starttls_handler(session, stanza)
+	if session.conn.starttls then
+		session.send(st.stanza("proceed", { xmlns = xmlns_starttls }));
+		session:reset_stream();
+		local ssl_ctx = session.host and hosts[session.host].ssl_ctx_in or global_ssl_ctx;
+		session.conn:starttls(ssl_ctx);
+		session.log("info", "TLS negotiation started...");
+		session.secure = false;
+	else
+		-- FIXME: What reply?
+		session.log("warn", "Attempt to start TLS, but TLS is not available on this connection");
+	end
+end
+
+function s2s_starttls_handler(session, stanza)
+	if session.conn.starttls then
+		session.sends2s(st.stanza("proceed", { xmlns = xmlns_starttls }));
+		session:reset_stream();
+		local ssl_ctx = session.to_host and hosts[session.to_host].ssl_ctx_in or global_ssl_ctx;
+		session.conn:starttls(ssl_ctx);
+		session.log("info", "TLS negotiation started for incoming s2s...");
+		session.secure = false;
+	else
+		-- FIXME: What reply?
+		session.log("warn", "Attempt to start TLS, but TLS is not available on this s2s connection");
+	end
+end
+
+module:add_handler("c2s_unauthed", "starttls", xmlns_starttls, c2s_starttls_handler);
+module:add_handler("s2sin_unauthed", "starttls", xmlns_starttls, s2s_starttls_handler);
 
 
 local starttls_attr = { xmlns = xmlns_starttls };
 module:add_event_hook("stream-features", 
 		function (session, features)
-			if session.conn.starttls then
+			if not session.username and session.conn.starttls then
 				features:tag("starttls", starttls_attr);
 				if secure_auth_only then
 					features:tag("required"):up():up();
@@ -65,7 +64,7 @@ module:add_event_hook("stream-features",
 module:hook("s2s-stream-features", 
 		function (data)
 			local session, features = data.session, data.features;
-			if session.to_host and session.conn.starttls then
+			if session.to_host and session.type ~= "s2sin" and session.conn.starttls then
 				features:tag("starttls", starttls_attr):up();
 				if secure_s2s_only then
 					features:tag("required"):up():up();
@@ -89,9 +88,9 @@ module:hook_stanza(xmlns_stream, "features",
 module:hook_stanza(xmlns_starttls, "proceed",
 		function (session, stanza)
 			module:log("debug", "Proceeding with TLS on s2sout...");
-			local format, to_host, from_host = string.format, session.to_host, session.from_host;
 			session:reset_stream();
-			session.conn.starttls(true);
+			local ssl_ctx = session.from_host and hosts[session.from_host].ssl_ctx or global_ssl_ctx;
+			session.conn:starttls(ssl_ctx, true);
 			session.secure = false;
 			return true;
 		end);