Merge with 0.5

[prosody.git] / plugins / mod_tls.lua

diff --git a/plugins/mod_tls.lua b/plugins/mod_tls.lua
index cd4f3acf9749ee6345ef2e82ac01a1dfce49519e..79a74deb2d5e31343cfd33ca0de246dad7958fa9 100644 (file)
--- a/plugins/mod_tls.lua
+++ b/plugins/mod_tls.lua
@@ -11,7 +11,8 @@ 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)
@@ -55,14 +56,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.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 +73,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;
@@ -83,5 +86,6 @@ module:hook_stanza(xmlns_starttls, "proceed",
                        local format, to_host, from_host = string.format, session.to_host, session.from_host;
                        session:reset_stream();
                        session.conn.starttls(true);
+                       session.secure = false;
                        return true;
                end);