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

mod_tls: Record STARTTLS state so it can be shown in Shell

Browse source 
This field can be viewed using s2s:show(nil, "... starttls") even
without any special support in mod_admin_shell, which can be added later
to make it nicer. One can then assume that a TLS connection with an
empty / nil starttls field means Direct TLS.
This commit is contained in:
Kim Alvefur 2022-08-02 19:26:26 +02:00
parent 79f4868b63
commit a2f8218a63
2 changed files with 6 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

4
plugins/mod_s2s.lua
View file

@ -429,7 +429,8 @@ function stream_callbacks._streamopened(session, attr)
session.had_stream = true; -- Had a stream opened at least once
-- TODO: Rename session.secure to session.encrypted
if session.secure == false then
if session.secure == false then -- Set by mod_tls during STARTTLS handshake
session.starttls = "completed";
session_secure(session);
end
@ -750,6 +751,7 @@ local function initialize_session(session)
local w = conn.write;
if conn:ssl() then
-- Direct TLS was used
session_secure(session);
end

3
plugins/mod_tls.lua
View file

@ -128,6 +128,7 @@ end);
-- Hook <starttls/>
module:hook("stanza/urn:ietf:params:xml:ns:xmpp-tls:starttls", function(event)
local origin = event.origin;
origin.starttls = "requested";
if can_do_tls(origin) then
if origin.conn.block_reads then
-- we need to ensure that no data is read anymore, otherwise we could end up in a situation where
@ -176,6 +177,7 @@ module:hook_tag("http://etherx.jabber.org/streams", "features", function (sessio
module:log("debug", "%s is not offering TLS", session.to_host);
return;
end
session.starttls = "initiated";
session.sends2s(starttls_initiate);
return true;
end
@ -193,6 +195,7 @@ module:hook_tag(xmlns_starttls, "proceed", function (session, stanza) -- luachec
if session.type == "s2sout_unauthed" and can_do_tls(session) then
module:log("debug", "Proceeding with TLS on s2sout...");
session:reset_stream();
session.starttls = "proceeding"
session.conn:starttls(session.ssl_ctx, session.to_host);
session.secure = false;
return true;