X-Git-Url: https://git.enpas.org/?a=blobdiff_plain;f=plugins%2Fmod_tls.lua;h=7aee29219cac32b41264888478c4796623867f37;hb=6518e568cb7853ababe6225af3b4c67485e84650;hp=dfc1e338c38269ec3f0ddb86850959e3b3302bb0;hpb=db25534848b9b29f452f0a0d0ec926238c9c504c;p=prosody.git

diff --git a/plugins/mod_tls.lua b/plugins/mod_tls.lua
index dfc1e338..7aee2921 100644
--- a/plugins/mod_tls.lua
+++ b/plugins/mod_tls.lua
@@ -22,10 +22,23 @@ if secure_s2s_only then s2s_feature:tag("required"):up(); end
 
 local global_ssl_ctx = prosody.global_ssl_ctx;
 
+local host = hosts[module.host];
+
+local function can_do_tls(session)
+	if session.type == "c2s_unauthed" then
+		return session.conn.starttls and host.ssl_ctx_in;
+	elseif session.type == "s2sin_unauthed" then
+		return session.conn.starttls and host.ssl_ctx_in;
+	elseif session.direction == "outgoing" then
+		return session.conn.starttls and host.ssl_ctx;
+	end
+	return false;
+end
+
 -- Hook <starttls/>
 module:hook("stanza/urn:ietf:params:xml:ns:xmpp-tls:starttls", function(event)
 	local origin = event.origin;
-	if origin.conn.starttls then
+	if can_do_tls(origin) then
 		(origin.sends2s or origin.send)(starttls_proceed);
 		origin:reset_stream();
 		local host = origin.to_host or origin.host;
@@ -44,13 +57,13 @@ end);
 -- Advertize stream feature
 module:hook("stream-features", function(event)
 	local origin, features = event.origin, event.features;
-	if not origin.username and origin.conn.starttls then
+	if can_do_tls(origin) then
 		features:add_child(c2s_feature);
 	end
 end);
 module:hook("s2s-stream-features", function(event)
-	local session, features = event.session, event.features;
-	if session.to_host and session.type ~= "s2sin" and session.conn.starttls then
+	local origin, features = event.origin, event.features;
+	if can_do_tls(origin) then
 		features:add_child(s2s_feature);
 	end
 end);
@@ -58,12 +71,13 @@ end);
 -- For s2sout connections, start TLS if we can
 module:hook_stanza("http://etherx.jabber.org/streams", "features", function (session, stanza)
 	module:log("debug", "Received features element");
-	if session.conn.starttls and stanza:child_with_ns(xmlns_starttls) then
+	if can_do_tls(session) and stanza:child_with_ns(xmlns_starttls) then
 		module:log("%s is offering TLS, taking up the offer...", session.to_host);
 		session.sends2s("<starttls xmlns='"..xmlns_starttls.."'/>");
 		return true;
 	end
 end, 500);
+
 module:hook_stanza(xmlns_starttls, "proceed", function (session, stanza)
 	module:log("debug", "Proceeding with TLS on s2sout...");
 	session:reset_stream();