Merge 0.9->trunk

[prosody.git] / core / certmanager.lua

diff --git a/core/certmanager.lua b/core/certmanager.lua
index a9f8b644f51f701ba6f176173918e280faf31496..4b96e774a8d3cec6ec276498c3f4e6b47b9b26c7 100644 (file)
--- a/core/certmanager.lua
+++ b/core/certmanager.lua
@@ -17,34 +17,40 @@ local prosody = prosody;
 local resolve_path = configmanager.resolve_relative_path;
 local config_path = prosody.paths.config;
 
-local luasec_has_noticket, luasec_has_verifyext;
+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", }) or "none";
 local default_options = { "no_sslv2", luasec_has_noticket and "no_ticket" or nil };
 local default_verifyext = { "lsec_continue", "lsec_ignore_purpose" };
 
-if not luasec_has_verifyext and ssl.x509 then
+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
 
 function create_context(host, mode, user_ssl_config)
        user_ssl_config = user_ssl_config or default_ssl_config;
 
        if not ssl then return nil, "LuaSec (required for encryption) was not found"; end
        if not user_ssl_config then return nil, "No SSL/TLS configuration present for "..host; end
+       if not user_ssl_config.key then return nil, "No key present in SSL/TLS configuration for "..host; end
+       if not user_ssl_config.certificate then return nil, "No certificate present in SSL/TLS configuration for "..host; end
        
        local ssl_config = {
                mode = mode;
@@ -58,6 +64,8 @@ function create_context(host, mode, user_ssl_config)
                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;
+               dhparam = user_ssl_config.dhparam;
        };
 
        local ctx, err = ssl_newcontext(ssl_config);
@@ -100,7 +108,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);