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

core.portmanager: Fix TLS context inheritance for SNI hosts (completes SNI support)

Browse source
This commit is contained in:
Kim Alvefur 2019-11-29 23:24:14 +01:00
parent b65b591c7a
commit 1f33d9c6bb
2 changed files with 6 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

1
core/certmanager.lua
View file

@ -252,4 +252,5 @@ return {
create_context = create_context; create_context = create_context;
reload_ssl_config = reload_ssl_config; reload_ssl_config = reload_ssl_config;
find_cert = find_cert; find_cert = find_cert;
find_host_cert = find_host_cert;
}; };

15
core/portmanager.lua
View file

@ -230,19 +230,14 @@ end
-- Event handlers -- Event handlers
local function add_sni_host(host, service) local function add_sni_host(host, service)
-- local global_ssl_config = config.get(host, "ssl") or {};
for name, interface, port, n, active_service --luacheck: ignore 213 for name, interface, port, n, active_service --luacheck: ignore 213
in active_services:iter(service, nil, nil, nil) do in active_services:iter(service, nil, nil, nil) do
if active_service.server.hosts and active_service.tls_cfg then if active_service.server.hosts and active_service.tls_cfg then
-- local config_prefix = (active_service.config_prefix or name).."_"; local config_prefix = (active_service.config_prefix or name).."_";
-- if config_prefix == "_" then if config_prefix == "_" then config_prefix = ""; end
-- config_prefix = ""; local prefix_ssl_config = config.get(host, config_prefix.."ssl");
-- end local autocert = certmanager.find_host_cert(host);
-- local prefix_ssl_config = config.get(host, config_prefix.."ssl") or global_ssl_config; local ssl, err, cfg = certmanager.create_context(host, "server", prefix_ssl_config, autocert, active_service.tls_cfg);
-- FIXME only global 'ssl' settings are mixed in here
-- TODO per host and per service settings should be merged in,
-- without overriding the per-host certificate
local ssl, err, cfg = certmanager.create_context(host, "server");
if ssl then if ssl then
active_service.server.hosts[host] = ssl; active_service.server.hosts[host] = ssl;
else else