X-Git-Url: https://git.enpas.org/?a=blobdiff_plain;f=plugins%2Fmod_tls.lua;h=c2f83a3a059e0e52c99f6aeabded5d893150dffe;hb=a5434101131437c12124d1b4f4a94f856449a27e;hp=4b1bc63b27c4ac09d883079983681d11302fe9e5;hpb=8f8da0f01e10f548f028467996a919654c509d4f;p=prosody.git

diff --git a/plugins/mod_tls.lua b/plugins/mod_tls.lua
index 4b1bc63b..c2f83a3a 100644
--- a/plugins/mod_tls.lua
+++ b/plugins/mod_tls.lua
@@ -11,7 +11,8 @@ local st = require "util.stanza";
 local xmlns_stream = 'http://etherx.jabber.org/streams';
 local xmlns_starttls = 'urn:ietf:params:xml:ns:xmpp-tls';
 
-local secure_auth_only = module:get_option("require_encryption");
+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)
@@ -34,6 +35,7 @@ module:add_handler("s2sin_unauthed", "starttls", xmlns_starttls,
 				session:reset_stream();
 				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");
@@ -55,9 +57,16 @@ module:add_event_hook("stream-features",
 		end);
 
 module:add_event_hook("s2s-stream-features", 
-		function (session, features)												
-			if session.conn.starttls then
-				--features:tag("starttls", starttls_attr):up();
+		function (session, features)
+			-- This hook is possibly called once per host (at least if the
+			-- remote server does not specify a to/from.
+			if session.to_host and session.conn.starttls and not features:child_with_ns(xmlns_starttls) then
+				features:tag("starttls", starttls_attr):up();
+				if secure_s2s_only then
+					features:tag("required"):up():up();
+				else
+					features:up();
+				end
 			end
 		end);
 
@@ -78,5 +87,6 @@ module:hook_stanza(xmlns_starttls, "proceed",
 			local format, to_host, from_host = string.format, session.to_host, session.from_host;
 			session:reset_stream();
 			session.conn.starttls(true);
+			session.secure = false;
 			return true;
 		end);