mod_c2s: Remove connection object from session object when connection disconnected...

[prosody.git] / plugins / mod_tls.lua

diff --git a/plugins/mod_tls.lua b/plugins/mod_tls.lua
index 7aee29219cac32b41264888478c4796623867f37..2741b8d401f04a1ebee22a66a543b96ae3cb058a 100644 (file)
--- a/plugins/mod_tls.lua
+++ b/plugins/mod_tls.lua
@@ -1,15 +1,24 @@
 -- Prosody IM
--- Copyright (C) 2008-2009 Matthew Wild
--- Copyright (C) 2008-2009 Waqas Hussain
+-- Copyright (C) 2008-2010 Matthew Wild
+-- Copyright (C) 2008-2010 Waqas Hussain
 -- 
 -- This project is MIT/X11 licensed. Please see the
 -- COPYING file in the source package for more information.
 --
 
+local config = require "core.configmanager";
+local create_context = require "core.certmanager".create_context;
 local st = require "util.stanza";
 
-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 c2s_require_encryption = module:get_option("c2s_require_encryption") or module:get_option("require_encryption");
+local s2s_require_encryption = module:get_option("s2s_require_encryption");
+local allow_s2s_tls = module:get_option("s2s_allow_encryption") ~= false;
+local s2s_secure_auth = module:get_option("s2s_secure_auth");
+
+if s2s_secure_auth and s2s_require_encryption == false then
+       module:log("warn", "s2s_secure_auth implies s2s_require_encryption, but s2s_require_encryption is set to false");
+       s2s_require_encryption = true;
+end
 
 local xmlns_starttls = 'urn:ietf:params:xml:ns:xmpp-tls';
 local starttls_attr = { xmlns = xmlns_starttls };
@@ -17,19 +26,20 @@ local starttls_proceed = st.stanza("proceed", starttls_attr);
 local starttls_failure = st.stanza("failure", starttls_attr);
 local c2s_feature = st.stanza("starttls", starttls_attr);
 local s2s_feature = st.stanza("starttls", starttls_attr);
-if secure_auth_only then c2s_feature:tag("required"):up(); end
-if secure_s2s_only then s2s_feature:tag("required"):up(); end
+if c2s_require_encryption then c2s_feature:tag("required"):up(); end
+if s2s_require_encryption then s2s_feature:tag("required"):up(); end
 
 local global_ssl_ctx = prosody.global_ssl_ctx;
 
+local hosts = prosody.hosts;
 local host = hosts[module.host];
 
 local function can_do_tls(session)
        if session.type == "c2s_unauthed" then
                return session.conn.starttls and host.ssl_ctx_in;
-       elseif session.type == "s2sin_unauthed" then
+       elseif session.type == "s2sin_unauthed" and allow_s2s_tls then
                return session.conn.starttls and host.ssl_ctx_in;
-       elseif session.direction == "outgoing" then
+       elseif session.direction == "outgoing" and allow_s2s_tls then
                return session.conn.starttls and host.ssl_ctx;
        end
        return false;
@@ -44,7 +54,7 @@ module:hook("stanza/urn:ietf:params:xml:ns:xmpp-tls:starttls", function(event)
                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.log("debug", "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);
@@ -72,7 +82,7 @@ end);
 module:hook_stanza("http://etherx.jabber.org/streams", "features", function (session, stanza)
        module:log("debug", "Received features element");
        if can_do_tls(session) and stanza:child_with_ns(xmlns_starttls) then
-               module:log("%s is offering TLS, taking up the offer...", session.to_host);
+               module:log("debug", "%s is offering TLS, taking up the offer...", session.to_host);
                session.sends2s("<starttls xmlns='"..xmlns_starttls.."'/>");
                return true;
        end
@@ -82,7 +92,29 @@ module:hook_stanza(xmlns_starttls, "proceed", function (session, stanza)
        module:log("debug", "Proceeding with TLS on s2sout...");
        session:reset_stream();
        local ssl_ctx = session.from_host and hosts[session.from_host].ssl_ctx or global_ssl_ctx;
-       session.conn:starttls(ssl_ctx, true);
+       session.conn:starttls(ssl_ctx);
        session.secure = false;
        return true;
 end);
+
+local function assert_log(ret, err)
+       if not ret then
+               module:log("error", "Unable to initialize TLS: %s", err);
+       end
+       return ret;
+end
+
+function module.load()
+       local ssl_config = config.rawget(module.host, "ssl");
+       if not ssl_config then
+               local base_host = module.host:match("%.(.*)");
+               ssl_config = config.get(base_host, "ssl");
+       end
+       host.ssl_ctx = assert_log(create_context(host.host, "client", ssl_config)); -- for outgoing connections
+       host.ssl_ctx_in = assert_log(create_context(host.host, "server", ssl_config)); -- for incoming connections
+end
+
+function module.unload()
+       host.ssl_ctx = nil;
+       host.ssl_ctx_in = nil;
+end