mod_tls: Don't offer TLS on hosts that don't have any certs
authorMatthew Wild <mwild1@gmail.com>
Fri, 12 Feb 2010 21:33:22 +0000 (21:33 +0000)
committerMatthew Wild <mwild1@gmail.com>
Fri, 12 Feb 2010 21:33:22 +0000 (21:33 +0000)
plugins/mod_tls.lua

index 49ee18c9e4461444fc8a76b726ec9348f345b42e..54b48161b5fe4385a74e3695eb21f23fc16d8719 100644 (file)
@@ -14,9 +14,11 @@ 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");
 
+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("c2s_unauthed", "starttls", xmlns_starttls,
                
 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