Merge 0.9->0.10

[prosody.git] / core / certmanager.lua

diff --git a/core/certmanager.lua b/core/certmanager.lua
index a9b4018f1a901fd9b653676274ea8fd64c47edbf..05f0f809d93dd1e69f313a4010f2ae9c5cb51d47 100644 (file)
--- a/core/certmanager.lua
+++ b/core/certmanager.lua
@@ -19,6 +19,8 @@ end
 
 local configmanager = require "core.configmanager";
 local log = require "util.logger".init("certmanager");
+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;
 
@@ -32,13 +34,18 @@ 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;
 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;
-
-module "certmanager"
+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;
+};
+
+local _ENV = nil;
 
 -- Global SSL options if not overridden per-host
 local global_ssl_config = configmanager.get("*", "ssl");
@@ -46,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.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";
@@ -64,14 +71,14 @@ local path_options = { -- These we pass through resolve_path()
        key = true, certificate = true, cafile = true, capath = true, dhparam = true
 }
 
-if 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, ...)
+local function create_context(host, mode, ...)
        local cfg = new_config();
        cfg:apply(core_defaults);
        cfg:apply(global_ssl_config);
@@ -94,6 +101,8 @@ function create_context(host, mode, ...)
        for option in pairs(path_options) do
                if type(user_ssl_config[option]) == "string" then
                        user_ssl_config[option] = resolve_path(config_path, user_ssl_config[option]);
+               else
+                       user_ssl_config[option] = nil;
                end
        end
 
@@ -114,7 +123,7 @@ function create_context(host, mode, ...)
        -- 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
 
@@ -147,13 +156,16 @@ function create_context(host, mode, ...)
        return ctx, err, user_ssl_config;
 end
 
-function reload_ssl_config()
+local 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
 
 prosody.events.add_handler("config-reloaded", reload_ssl_config);
 
-return _M;
+return {
+       create_context = create_context;
+       reload_ssl_config = reload_ssl_config;
+};