local new_config = require"util.sslconfig".new;
local stat = require "lfs".attributes;
-local tostring = tostring;
+local tonumber, tostring = tonumber, tostring;
local pairs = pairs;
local type = type;
local io_open = io.open;
local config_path = prosody.paths.config;
local luasec_major, luasec_minor = ssl._VERSION:match("^(%d+)%.(%d+)");
-local luasec_version = luasec_major * 100 + luasec_minor;
+local luasec_version = tonumber(luasec_major) * 100 + tonumber(luasec_minor);
local luasec_has = {
-- TODO If LuaSec ever starts exposing these things itself, use that instead
cipher_server_preference = luasec_version >= 2;
local crt_try = { "", "/%s.crt", "/%s/fullchain.pem", "/%s.pem", };
local key_try = { "", "/%s.key", "/%s/privkey.pem", "/%s.pem", };
-local function find_cert(host)
- local certs = configmanager.get(host, "certificate") or global_certificates;
- certs = resolve_path(config_path, certs);
+local function find_cert(user_certs, name)
+ local certs = resolve_path(config_path, user_certs or global_certificates);
for i = 1, #crt_try do
- local crt_path = certs .. crt_try[i]:format(host);
- local key_path = certs .. key_try[i]:format(host);
+ local crt_path = certs .. crt_try[i]:format(name);
+ local key_path = certs .. key_try[i]:format(name);
if stat(crt_path, "mode") == "file" then
- if stat(key_path, "mode") == "file" then
- return { certificate = crt_path, key = key_path };
- end
if key_path:sub(-4) == ".crt" then
key_path = key_path:sub(1, -4) .. "key";
if stat(key_path, "mode") == "file" then
return { certificate = crt_path, key = key_path };
end
+ elseif stat(key_path, "mode") == "file" then
+ return { certificate = crt_path, key = key_path };
end
end
end
end
+local function find_host_cert(host)
+ if not host then return nil; end
+ return find_cert(configmanager.get(host, "certificate"), host) or find_host_cert(host:match("%.(.+)$"));
+end
+
+local function find_service_cert(service, port)
+ local cert_config = configmanager.get("*", service.."_certificate");
+ if type(cert_config) == "table" then
+ cert_config = cert_config[port] or cert_config.default;
+ end
+ return find_cert(cert_config, service);
+end
+
-- Built-in defaults
local core_defaults = {
capath = "/etc/ssl/certs";
local function create_context(host, mode, ...)
local cfg = new_config();
cfg:apply(core_defaults);
- cfg:apply(global_ssl_config);
- cfg:apply(find_cert(host) or find_cert(host:match("%.(.*)")));
+ local service_name, port = host:match("^(%w+) port (%d+)$");
+ if service_name then
+ cfg:apply(find_service_cert(service_name, tonumber(port)));
+ else
+ cfg:apply(find_host_cert(host));
+ end
cfg:apply({
mode = mode,
-- 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(global_ssl_config);
for i = select('#', ...), 1, -1 do
cfg:apply(select(i, ...));