moduleapi: Experimental API for modules to measure the rate+duration of events

[prosody.git] / core / certmanager.lua

diff --git a/core/certmanager.lua b/core/certmanager.lua
index 1c1518a6df6fa0cef2527d25ba27ddf69fe248d4..b40c13c1c8951f906c353cef524cb50ca680cdab 100644 (file)
--- a/core/certmanager.lua
+++ b/core/certmanager.lua
@@ -6,28 +6,44 @@
 -- COPYING file in the source package for more information.
 --
 
+local softreq = require"util.dependencies".softreq;
+local ssl = softreq"ssl";
+if not ssl then
+       return {
+               create_context = function ()
+                       return nil, "LuaSec (required for encryption) was not found";
+               end;
+               reload_ssl_config = function () end;
+       }
+end
+
 local configmanager = require "core.configmanager";
 local log = require "util.logger".init("certmanager");
-local ssl = ssl;
-local ssl_newcontext = ssl and ssl.newcontext;
+local ssl_context = ssl.context or softreq"ssl.context";
+local ssl_x509 = ssl.x509 or softreq"ssl.x509";
+local ssl_newcontext = ssl.newcontext;
 local new_config = require"util.sslconfig".new;
 
 local tostring = tostring;
 local pairs = pairs;
 local type = type;
 local io_open = io.open;
+local select = select;
 
 local prosody = prosody;
 local resolve_path = require"util.paths".resolve_relative_path;
 local config_path = prosody.paths.config;
 
-local luasec_has_noticket, luasec_has_verifyext, luasec_has_no_compression;
-if ssl then
-       local luasec_major, luasec_minor = ssl._VERSION:match("^(%d+)%.(%d+)");
-       luasec_has_noticket = tonumber(luasec_major)>0 or tonumber(luasec_minor)>=4;
-       luasec_has_verifyext = tonumber(luasec_major)>0 or tonumber(luasec_minor)>=5;
-       luasec_has_no_compression = tonumber(luasec_major)>0 or tonumber(luasec_minor)>=5;
-end
+local luasec_major, luasec_minor = ssl._VERSION:match("^(%d+)%.(%d+)");
+local luasec_version = luasec_major * 100 + luasec_minor;
+local luasec_has = {
+       -- TODO If LuaSec ever starts exposing these things itself, use that instead
+       cipher_server_preference = luasec_version >= 2;
+       no_ticket = luasec_version >= 4;
+       no_compression = luasec_version >= 5;
+       single_dh_use = luasec_version >= 2;
+       single_ecdh_use = luasec_version >= 2;
+};
 
 module "certmanager"
 
@@ -37,15 +53,15 @@ local global_ssl_config = configmanager.get("*", "ssl");
 -- Built-in defaults
 local core_defaults = {
        capath = "/etc/ssl/certs";
+       depth = 9;
        protocol = "tlsv1+";
-       verify = (ssl and ssl.x509 and { "peer", "client_once", }) or "none";
+       verify = (ssl_x509 and { "peer", "client_once", }) or "none";
        options = {
-               cipher_server_preference = true;
-               no_ticket = luasec_has_noticket;
-               no_compression = luasec_has_no_compression and configmanager.get("*", "ssl_compression") ~= true;
-               -- Has no_compression? Then it has these too...
-               single_dh_use = luasec_has_no_compression;
-               single_ecdh_use = luasec_has_no_compression;
+               cipher_server_preference = luasec_has.cipher_server_preference;
+               no_ticket = luasec_has.no_ticket;
+               no_compression = luasec_has.no_compression and configmanager.get("*", "ssl_compression") ~= true;
+               single_dh_use = luasec_has.single_dh_use;
+               single_ecdh_use = luasec_has.single_ecdh_use;
        };
        verifyext = { "lsec_continue", "lsec_ignore_purpose" };
        curve = "secp384r1";
@@ -55,16 +71,14 @@ local path_options = { -- These we pass through resolve_path()
        key = true, certificate = true, cafile = true, capath = true, dhparam = true
 }
 
-if ssl and not luasec_has_verifyext and ssl.x509 then
+if luasec_version < 5 and ssl_x509 then
        -- COMPAT mw/luasec-hg
        for i=1,#core_defaults.verifyext do -- Remove lsec_ prefix
                core_defaults.verify[#core_defaults.verify+1] = core_defaults.verifyext[i]:sub(6);
        end
 end
 
-function create_context(host, mode, user_ssl_config)
-       if not ssl then return nil, "LuaSec (required for encryption) was not found"; end
-
+function create_context(host, mode, ...)
        local cfg = new_config();
        cfg:apply(core_defaults);
        cfg:apply(global_ssl_config);
@@ -73,9 +87,11 @@ function create_context(host, mode, user_ssl_config)
                -- We can't read the password interactively when daemonized
                password = function() log("error", "Encrypted certificate for %s requires 'ssl' 'password' to be set in config", host); end;
        });
-       cfg:apply(user_ssl_config);
 
-       user_ssl_config = cfg:final();
+       for i = select('#', ...), 1, -1 do
+               cfg:apply(select(i, ...));
+       end
+       local user_ssl_config = cfg:final();
 
        if mode == "server" then
                if not user_ssl_config.key then return nil, "No key present in SSL/TLS configuration for "..host; end
@@ -105,7 +121,7 @@ function create_context(host, mode, user_ssl_config)
        -- of it ourselves (W/A for #x)
        if ctx and user_ssl_config.ciphers then
                local success;
-               success, err = ssl.context.setcipher(ctx, user_ssl_config.ciphers);
+               success, err = ssl_context.setcipher(ctx, user_ssl_config.ciphers);
                if not success then ctx = nil; end
        end
 
@@ -135,12 +151,12 @@ function create_context(host, mode, user_ssl_config)
                        log("error", "SSL/TLS: Error initialising for %s: %s", host, err);
                end
        end
-       return ctx, err;
+       return ctx, err, user_ssl_config;
 end
 
 function reload_ssl_config()
        global_ssl_config = configmanager.get("*", "ssl");
-       if luasec_has_no_compression then
+       if luasec_has.no_compression then
                core_defaults.options.no_compression = configmanager.get("*", "ssl_compression") ~= true;
        end
 end