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

Merge 13.0->trunk

Browse source
This commit is contained in:
Kim Alvefur 2025-04-01 18:31:26 +02:00
commit 126262edb3
3 changed files with 6 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
plugins/mod_s2s.lua
View file

@ -999,7 +999,7 @@ local function friendly_cert_error(session) --> string
local cert_errors = set.new(session.cert_chain_errors[1]); local cert_errors = set.new(session.cert_chain_errors[1]);
if cert_errors:contains("certificate has expired") then if cert_errors:contains("certificate has expired") then
return "has expired"; return "has expired";
elseif cert_errors:contains("self signed certificate") then elseif cert_errors:contains("self signed certificate") or cert_errors:contains("self-signed certificate") then
return "is self-signed"; return "is self-signed";
elseif cert_errors:contains("no matching DANE TLSA records") then elseif cert_errors:contains("no matching DANE TLSA records") then
return "does not match any DANE TLSA records"; return "does not match any DANE TLSA records";

5
plugins/mod_tls.lua
View file

@ -55,6 +55,7 @@ function module.load(reload)
module:log("debug", "Creating context for c2s"); module:log("debug", "Creating context for c2s");
local request_client_certs = { verify = { "peer", "client_once", }; }; local request_client_certs = { verify = { "peer", "client_once", }; };
local custom_cert_verification = { verifyext = { "lsec_continue", "lsec_ignore_purpose" }; };
local xmpp_alpn = { alpn = "xmpp-server" }; local xmpp_alpn = { alpn = "xmpp-server" };
ssl_ctx_c2s, err_c2s, ssl_cfg_c2s = create_context(host.host, "server", host_c2s, host_ssl, global_c2s); -- for incoming client connections ssl_ctx_c2s, err_c2s, ssl_cfg_c2s = create_context(host.host, "server", host_c2s, host_ssl, global_c2s); -- for incoming client connections
@ -67,7 +68,9 @@ function module.load(reload)
module:log("debug", "Creating context for s2sin"); module:log("debug", "Creating context for s2sin");
-- for incoming server connections -- for incoming server connections
ssl_ctx_s2sin, err_s2sin, ssl_cfg_s2sin = create_context(host.host, "server", host_s2s, host_ssl, global_s2s, request_client_certs); ssl_ctx_s2sin, err_s2sin, ssl_cfg_s2sin = create_context(host.host, "server",
host_s2s, host_ssl, global_s2s, request_client_certs, custom_cert_verification
);
if not ssl_ctx_s2sin then module:log("error", "Error creating contexts for s2sin: %s", err_s2sin); end if not ssl_ctx_s2sin then module:log("error", "Error creating contexts for s2sin: %s", err_s2sin); end
if reload then if reload then

1
prosodyctl
View file

@ -195,6 +195,7 @@ local function service_command_warning(service_command)
elseif init == "rc.d" then elseif init == "rc.d" then
show_warning(" /etc/init.d/prosody %s", service_command); show_warning(" /etc/init.d/prosody %s", service_command);
end end
show_warning("");
else else
show_warning(" it may conflict with your system's service manager."); show_warning(" it may conflict with your system's service manager.");
show_warning(""); show_warning("");