moduleapi: in module:provides(), add the name of the module in item._provided_by

[prosody.git] / core / certmanager.lua

diff --git a/core/certmanager.lua b/core/certmanager.lua
index 6b31b21e54a0b8cf456a127f6ce245b630eb9dc0..b91f7110b57205be6335a2e047200dc4b597b94c 100644 (file)
--- a/core/certmanager.lua
+++ b/core/certmanager.lua
@@ -1,38 +1,75 @@
+-- Prosody IM
+-- 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 configmanager = require "core.configmanager";
 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 = prosody.resolve_relative_path;
+local resolve_path = configmanager.resolve_relative_path;
+local config_path = prosody.paths.config;
+
+local luasec_has_noticket, luasec_has_verifyext;
+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;
+end
 
 module "certmanager"
 
 -- Global SSL options if not overridden per-host
-local default_ssl_config = configmanager.get("*", "core", "ssl") or {};
+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" };
 
-function create_context(host, mode, config)
-       if not ssl then return nil; end
-       
-       local user_ssl_config = config and config.core.ssl or default_ssl_config;
+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
+
+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
        
        local ssl_config = {
                mode = mode;
                protocol = user_ssl_config.protocol or "sslv23";
-               key = resolve_path(user_ssl_config.key);
-               password = user_ssl_config.password;
-               certificate = resolve_path(user_ssl_config.certificate);
-               capath = resolve_path(user_ssl_config.capath or default_capath);
-               cafile = resolve_path(user_ssl_config.cafile);
-               verify = user_ssl_config.verify or "none";
-               options = user_ssl_config.options or "no_sslv2";
-               ciphers = user_ssl_config.ciphers;
+               key = resolve_path(config_path, user_ssl_config.key);
+               password = user_ssl_config.password or function() log("error", "Encrypted certificate for %s requires 'ssl' 'password' to be set in config", host); end;
+               certificate = resolve_path(config_path, user_ssl_config.certificate);
+               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;
        };
 
        local ctx, err = ssl_newcontext(ssl_config);
+
+       -- LuaSec ignores the cipher list from the config, so we have to take care
+       -- 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);
+               if not success then ctx = nil; end
+       end
+
        if not ctx then
                err = err or "invalid ssl config"
                local file = err:match("^error loading (.-) %(");
@@ -54,17 +91,16 @@ function create_context(host, mode, config)
                        else
                                reason = "Reason: "..tostring(reason):lower();
                        end
-                       log("error", "SSL/TLS: Failed to load %s: %s", file, reason);
+                       log("error", "SSL/TLS: Failed to load '%s': %s (for %s)", file, reason, host);
                else
-                       log("error", "SSL/TLS: Error initialising for host %s: %s", host, err );
+                       log("error", "SSL/TLS: Error initialising for %s: %s", host, err);
                end
-               ssl = false
-        end
-        return ctx, err;
+       end
+       return ctx, err;
 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);