net.dns: Fixed whitespace/indentation.

[prosody.git] / plugins / mod_tls.lua

diff --git a/plugins/mod_tls.lua b/plugins/mod_tls.lua
index 09470083bd5143e15580546ddeaa41580d6161e7..73b5ae095184eab3c76fd7b06e3f3a841d4744dc 100644 (file)
--- a/plugins/mod_tls.lua
+++ b/plugins/mod_tls.lua
@@ -14,12 +14,15 @@ 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 global_ssl_ctx = prosody.global_ssl_ctx;
+
 module:add_handler("c2s_unauthed", "starttls", xmlns_starttls,
                function (session, stanza)
                        if session.conn.starttls then
                                session.send(st.stanza("proceed", { xmlns = xmlns_starttls }));
                                session:reset_stream();
-                               session.conn.starttls();
+                               local ssl_ctx = session.host and hosts[session.host].ssl_ctx_in or global_ssl_ctx;
+                               session.conn:starttls(ssl_ctx);
                                session.log("info", "TLS negotiation started...");
                                session.secure = false;
                        else
@@ -33,7 +36,8 @@ module:add_handler("s2sin_unauthed", "starttls", xmlns_starttls,
                        if session.conn.starttls then
                                session.sends2s(st.stanza("proceed", { xmlns = xmlns_starttls }));
                                session:reset_stream();
-                               session.conn.starttls();
+                               local ssl_ctx = session.to_host and hosts[session.to_host].ssl_ctx_in or global_ssl_ctx;
+                               session.conn:starttls(ssl_ctx);
                                session.log("info", "TLS negotiation started for incoming s2s...");
                                session.secure = false;
                        else
@@ -73,7 +77,7 @@ module:hook("s2s-stream-features",
 module:hook_stanza(xmlns_stream, "features",
                function (session, stanza)
                        module:log("debug", "Received features element");
-                       if stanza:child_with_ns(xmlns_starttls) then
+                       if session.conn.starttls 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;
@@ -83,9 +87,9 @@ module:hook_stanza(xmlns_stream, "features",
 module:hook_stanza(xmlns_starttls, "proceed",
                function (session, stanza)
                        module:log("debug", "Proceeding with TLS on s2sout...");
-                       local format, to_host, from_host = string.format, session.to_host, session.from_host;
                        session:reset_stream();
-                       session.conn.starttls(true);
+                       local ssl_ctx = session.from_host and hosts[session.from_host].ssl_ctx or global_ssl_ctx;
+                       session.conn:starttls(ssl_ctx, true);
                        session.secure = false;
                        return true;
                end);