Changeset

2872:cdc292d201fc

mod_tls: Don't offer TLS on hosts that don't have any certs
author Matthew Wild <mwild1@gmail.com>
date Fri, 12 Feb 2010 21:33:22 +0000
parents 2871:5613235be64a
children 2873:108ed17f1dd9
files plugins/mod_tls.lua
diffstat 1 files changed, 4 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/plugins/mod_tls.lua	Sun Feb 21 19:27:42 2010 -0500
+++ b/plugins/mod_tls.lua	Fri Feb 12 21:33:22 2010 +0000
@@ -14,9 +14,11 @@
 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 host = hosts[module.host];
+
 module:add_handler("c2s_unauthed", "starttls", xmlns_starttls,
 		function (session, stanza)
-			if session.conn.starttls then
+			if session.conn.starttls and host.ssl_ctx_in then
 				session.send(st.stanza("proceed", { xmlns = xmlns_starttls }));
 				session:reset_stream();
 				if session.host and hosts[session.host].ssl_ctx_in then
@@ -34,7 +36,7 @@
 		
 module:add_handler("s2sin_unauthed", "starttls", xmlns_starttls,
 		function (session, stanza)
-			if session.conn.starttls then
+			if session.conn.starttls and host.ssl_ctx_in 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