mirrors/prosody
1
0
Fork 0
mirror of https://github.com/bjc/prosody.git synced 2025-04-03 21:27:38 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge 0.10->trunk

Browse source
This commit is contained in:
Kim Alvefur 2017-11-20 02:22:09 +01:00
commit 38c157896a
2 changed files with 35 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

47
core/certmanager.lua
View file

@ -27,6 +27,7 @@ local stat = require "lfs".attributes;
local tonumber, tostring = tonumber, tostring; local tonumber, tostring = tonumber, tostring;
local pairs = pairs; local pairs = pairs;
local t_remove = table.remove;
local type = type; local type = type;
local io_open = io.open; local io_open = io.open;
local select = select; local select = select;
@ -37,13 +38,20 @@ local config_path = prosody.paths.config or ".";
local luasec_major, luasec_minor = ssl._VERSION:match("^(%d+)%.(%d+)"); local luasec_major, luasec_minor = ssl._VERSION:match("^(%d+)%.(%d+)");
local luasec_version = tonumber(luasec_major) * 100 + tonumber(luasec_minor); local luasec_version = tonumber(luasec_major) * 100 + tonumber(luasec_minor);
local luasec_has = { local luasec_has = softreq"ssl.config" or {
-- TODO If LuaSec ever starts exposing these things itself, use that instead algorithms = {
cipher_server_preference = luasec_version >= 2; ec = luasec_version >= 5;
no_ticket = luasec_version >= 4; };
no_compression = luasec_version >= 5; capabilities = {
single_dh_use = luasec_version >= 2; curves_list = luasec_version >= 7;
single_ecdh_use = luasec_version >= 2; };
options = {
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; local _ENV = nil;
@ -99,14 +107,14 @@ local core_defaults = {
protocol = "tlsv1+"; protocol = "tlsv1+";
verify = (ssl_x509 and { "peer", "client_once", }) or "none"; verify = (ssl_x509 and { "peer", "client_once", }) or "none";
options = { options = {
cipher_server_preference = luasec_has.cipher_server_preference; cipher_server_preference = luasec_has.options.cipher_server_preference;
no_ticket = luasec_has.no_ticket; no_ticket = luasec_has.options.no_ticket;
no_compression = luasec_has.no_compression and configmanager.get("*", "ssl_compression") ~= true; no_compression = luasec_has.options.no_compression and configmanager.get("*", "ssl_compression") ~= true;
single_dh_use = luasec_has.single_dh_use; single_dh_use = luasec_has.options.single_dh_use;
single_ecdh_use = luasec_has.single_ecdh_use; single_ecdh_use = luasec_has.options.single_ecdh_use;
}; };
verifyext = { "lsec_continue", "lsec_ignore_purpose" }; verifyext = { "lsec_continue", "lsec_ignore_purpose" };
curve = "secp384r1"; curve = luasec_has.algorithms.ec and not luasec_has.capabilities.curves_list and "secp384r1";
curveslist = { curveslist = {
"X25519", "X25519",
"P-384", "P-384",
@ -124,6 +132,17 @@ local core_defaults = {
"!aNULL", -- Ciphers that does not authenticate the connection "!aNULL", -- Ciphers that does not authenticate the connection
}; };
} }
if luasec_has.curves then
for i = #core_defaults.curveslist, 1, -1 do
if not luasec_has.curves[ core_defaults.curveslist[i] ] then
t_remove(core_defaults.curveslist, i);
end
end
else
core_defaults.curveslist = nil;
end
local path_options = { -- These we pass through resolve_path() local path_options = { -- These we pass through resolve_path()
key = true, certificate = true, cafile = true, capath = true, dhparam = true key = true, certificate = true, cafile = true, capath = true, dhparam = true
} }
@ -227,7 +246,7 @@ end
local function reload_ssl_config() local function reload_ssl_config()
global_ssl_config = configmanager.get("*", "ssl"); global_ssl_config = configmanager.get("*", "ssl");
global_certificates = configmanager.get("*", "certificates") or "certs"; global_certificates = configmanager.get("*", "certificates") or "certs";
if luasec_has.no_compression then if luasec_has.options.no_compression then
core_defaults.options.no_compression = configmanager.get("*", "ssl_compression") ~= true; core_defaults.options.no_compression = configmanager.get("*", "ssl_compression") ~= true;
end end
end end

2
plugins/mod_debug_sql.lua
View file

@ -2,6 +2,8 @@
-- --
-- luacheck: ignore 213/uri -- luacheck: ignore 213/uri
module:set_global();
local engines = module:shared("/*/sql/connections"); local engines = module:shared("/*/sql/connections");
for uri, engine in pairs(engines) do for uri, engine in pairs(engines) do