mod_tls: Respond with proper error when TLS cannot be negotiated.

[prosody.git] / plugins / mod_tls.lua

diff --git a/plugins/mod_tls.lua b/plugins/mod_tls.lua
index cd4f3acf9749ee6345ef2e82ac01a1dfce49519e..9214dd1206fd3e38a78e824cd6ce8bc93af30215 100644 (file)
--- a/plugins/mod_tls.lua
+++ b/plugins/mod_tls.lua
@@ -11,41 +11,34 @@ local st = require "util.stanza";
 local xmlns_stream = 'http://etherx.jabber.org/streams';
 local xmlns_starttls = 'urn:ietf:params:xml:ns:xmpp-tls';
 
-local secure_auth_only = module:get_option("require_encryption");
+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");
 
-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();
-                               session.log("info", "TLS negotiation started...");
-                               session.secure = false;
-                       else
-                               -- FIXME: What reply?
-                               session.log("warn", "Attempt to start TLS, but TLS is not available on this connection");
-                       end
-               end);
-               
-module:add_handler("s2sin_unauthed", "starttls", xmlns_starttls,
-               function (session, stanza)
-                       if session.conn.starttls then
-                               session.sends2s(st.stanza("proceed", { xmlns = xmlns_starttls }));
-                               session:reset_stream();
-                               session.conn.starttls();
-                               session.log("info", "TLS negotiation started for incoming s2s...");
-                               session.secure = false;
-                       else
-                               -- FIXME: What reply?
-                               session.log("warn", "Attempt to start TLS, but TLS is not available on this s2s connection");
-                       end
-               end);
+local global_ssl_ctx = prosody.global_ssl_ctx;
+
+module:hook("stanza/urn:ietf:params:xml:ns:xmpp-tls:starttls", function(event)
+       local origin = event.origin;
+       if origin.conn.starttls and origin.type == "c2s_unauthed" or origin.type == "s2sin_unauthed" then
+               (origin.sends2s or origin.send)(st.stanza("proceed", { xmlns = xmlns_starttls }));
+               origin:reset_stream();
+               local host = origin.to_host or origin.host;
+               local ssl_ctx = host and hosts[host].ssl_ctx_in or global_ssl_ctx;
+               origin.conn:starttls(ssl_ctx);
+               origin.log("info", "TLS negotiation started for %s...", origin.type);
+               origin.secure = false;
+       else
+               origin.log("warn", "Attempt to start TLS, but TLS is not available on this %s connection", origin.type);
+               (origin.sends2s or origin.send)(st.stanza("failure", { xmlns = xmlns_starttls }));
+               origin:close();
+       end
+       return true;
+end);
 
 
 local starttls_attr = { xmlns = xmlns_starttls };
 module:add_event_hook("stream-features", 
                function (session, features)
-                       if session.conn.starttls then
+                       if not session.username and session.conn.starttls then
                                features:tag("starttls", starttls_attr);
                                if secure_auth_only then
                                        features:tag("required"):up():up();
@@ -55,14 +48,16 @@ module:add_event_hook("stream-features",
                        end
                end);
 
-module:add_event_hook("s2s-stream-features", 
-               function (session, features)
-                       -- This hook is possibly called once per host (at least if the
-                       -- remote server does not specify a to/from.
-                       if session.to_host and session.conn.starttls and not features:child_with_ns(xmlns_starttls) then
+module:hook("s2s-stream-features", 
+               function (data)
+                       local session, features = data.session, data.features;
+                       if session.to_host and session.type ~= "s2sin" and session.conn.starttls then
                                features:tag("starttls", starttls_attr):up();
-                               -- TODO: Make this optional :P
-                               --features:tag("required"):up():up();
+                               if secure_s2s_only then
+                                       features:tag("required"):up():up();
+                               else
+                                       features:up();
+                               end
                        end
                end);
 
@@ -70,7 +65,7 @@ module:add_event_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;
@@ -80,8 +75,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);