X-Git-Url: https://git.enpas.org/?a=blobdiff_plain;f=plugins%2Fmod_tls.lua;h=a2667ff6b7be4d632af9d09a5ba319a1c4137ba6;hb=41573d87fc81c46bb1144c080757d41de9fce1b7;hp=3e3bd5545cf8a3a4727e4d934c82c90a10912d94;hpb=67531a4a9d17647e5365bfec563342345c515969;p=prosody.git

diff --git a/plugins/mod_tls.lua b/plugins/mod_tls.lua
index 3e3bd554..a2667ff6 100644
--- a/plugins/mod_tls.lua
+++ b/plugins/mod_tls.lua
@@ -1,6 +1,6 @@
 -- Prosody IM
--- Copyright (C) 2008-2009 Matthew Wild
--- Copyright (C) 2008-2009 Waqas Hussain
+-- Copyright (C) 2008-2010 Matthew Wild
+-- Copyright (C) 2008-2010 Waqas Hussain
 -- 
 -- This project is MIT/X11 licensed. Please see the
 -- COPYING file in the source package for more information.
@@ -10,6 +10,7 @@ local st = require "util.stanza";
 
 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");
+local allow_s2s_tls = module:get_option("s2s_allow_encryption") ~= false;
 
 local xmlns_starttls = 'urn:ietf:params:xml:ns:xmpp-tls';
 local starttls_attr = { xmlns = xmlns_starttls };
@@ -24,10 +25,21 @@ 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" and allow_s2s_tls then
+		return session.conn.starttls and host.ssl_ctx_in;
+	elseif session.direction == "outgoing" and allow_s2s_tls 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;
@@ -46,13 +58,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 and host.ssl_ctx_in then
+	if can_do_tls(origin) then
 		features:add_child(c2s_feature);
 	end
 end);
 module:hook("s2s-stream-features", function(event)
 	local origin, features = event.origin, event.features;
-	if origin.to_host and origin.type ~= "s2sin" and origin.conn.starttls and host.ssl_ctx_in then
+	if can_do_tls(origin) then
 		features:add_child(s2s_feature);
 	end
 end);
@@ -60,17 +72,18 @@ 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();
 	local ssl_ctx = session.from_host and hosts[session.from_host].ssl_ctx or global_ssl_ctx;
-	session.conn:starttls(ssl_ctx, true);
+	session.conn:starttls(ssl_ctx);
 	session.secure = false;
 	return true;
 end);