mod_s2s: Log certificate identity validation result

[prosody.git] / core / certmanager.lua

diff --git a/core/certmanager.lua b/core/certmanager.lua
index 8a22f3dfadcacb01ba9cfe374aee269a1b48e565..5dee58765bcbf72a81a0fe74c3d2b8a6166bb677 100644 (file)
--- a/core/certmanager.lua
+++ b/core/certmanager.lua
@@ -11,25 +11,43 @@ local log = require "util.logger".init("certmanager");
 local ssl = ssl;
 local ssl_newcontext = ssl and ssl.newcontext;
 
-local setmetatable, tostring = setmetatable, tostring;
+local tostring = tostring;
 
 local prosody = prosody;
 local resolve_path = configmanager.resolve_relative_path;
 local config_path = prosody.paths.config;
 
-local luasec_has_noticket;
+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
 
 module "certmanager"
 
 -- Global SSL options if not overridden per-host
-local default_ssl_config = configmanager.get("*", "core", "ssl");
+local default_ssl_config = configmanager.get("*", "ssl");
 local default_capath = "/etc/ssl/certs";
-local default_verify = (ssl and ssl.x509 and { "peer", "client_once", "continue", "ignore_purpose" }) or "none";
+local default_verify = (ssl and ssl.x509 and { "peer", "client_once", }) or "none";
 local default_options = { "no_sslv2", luasec_has_noticket and "no_ticket" or nil };
+local default_verifyext = { "lsec_continue", "lsec_ignore_purpose" };
+
+if ssl and not luasec_has_verifyext and ssl.x509 then
+       -- COMPAT mw/luasec-hg
+       for i=1,#default_verifyext do -- Remove lsec_ prefix
+               default_verify[#default_verify+1] = default_verifyext[i]:sub(6);
+       end
+end
+if luasec_has_no_compression and configmanager.get("*", "ssl_compression") ~= true then
+       default_options[#default_options+1] = "no_compression";
+end
+
+if luasec_has_no_compression then -- Has no_compression? Then it has these too...
+       default_options[#default_options+1] = "single_dh_use";
+       default_options[#default_options+1] = "single_ecdh_use";
+end
 
 function create_context(host, mode, user_ssl_config)
        user_ssl_config = user_ssl_config or default_ssl_config;
@@ -46,8 +64,12 @@ function create_context(host, mode, user_ssl_config)
                capath = resolve_path(config_path, user_ssl_config.capath or default_capath);
                cafile = resolve_path(config_path, user_ssl_config.cafile);
                verify = user_ssl_config.verify or default_verify;
+               verifyext = user_ssl_config.verifyext or default_verifyext;
                options = user_ssl_config.options or default_options;
                depth = user_ssl_config.depth;
+               curve = user_ssl_config.curve or "secp384r1";
+               ciphers = user_ssl_config.ciphers or "HIGH:!DSS:!aNULL@STRENGTH";
+               dhparam = user_ssl_config.dhparam;
        };
 
        local ctx, err = ssl_newcontext(ssl_config);
@@ -90,7 +112,7 @@ function create_context(host, mode, user_ssl_config)
 end
 
 function reload_ssl_config()
-       default_ssl_config = configmanager.get("*", "core", "ssl");
+       default_ssl_config = configmanager.get("*", "ssl");
 end
 
 prosody.events.add_handler("config-reloaded", reload_ssl_config);