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

mod_dialback: Remove d-w-d feature

Browse source 
Backs out 1d0862814bfc and 2fdd71b08126

Largely unused, undocumented and did not have enough tests to provide
confidence in its correct operation.
This commit is contained in:
Kim Alvefur 2021-05-12 17:22:02 +02:00
parent 1cd5049c77
commit c2ce30433a
2 changed files with 1 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

22
plugins/mod_dialback.lua
View file

@ -22,19 +22,6 @@ local xmlns_stream = "http://etherx.jabber.org/streams";
local dialback_requests = setmetatable({}, { __mode = 'v' }); local dialback_requests = setmetatable({}, { __mode = 'v' });
local dialback_secret = sha256_hash(module:get_option_string("dialback_secret", uuid_gen()), true); local dialback_secret = sha256_hash(module:get_option_string("dialback_secret", uuid_gen()), true);
local dwd = module:get_option_boolean("dialback_without_dialback", false);
--- Helper to check that a session peer's certificate is valid
function check_cert_status(session, host)
local conn = session.conn:socket()
local cert
if conn.getpeercertificate then
cert = conn:getpeercertificate()
end
return module:fire_event("s2s-check-certificate", { host = host, session = session, cert = cert });
end
function module.save() function module.save()
return { dialback_secret = dialback_secret }; return { dialback_secret = dialback_secret };
@ -104,15 +91,6 @@ module:hook("stanza/jabber:server:dialback:result", function(event)
origin:close("improper-addressing"); origin:close("improper-addressing");
end end
if dwd and origin.secure then
if check_cert_status(origin, from) == false then
return
elseif origin.cert_chain_status == "valid" and origin.cert_identity_status == "valid" then
origin.sends2s(st.stanza("db:result", { to = from, from = to, id = attr.id, type = "valid" }));
module:fire_event("s2s-authenticated", { session = origin, host = from });
return true;
end
end
origin.hosts[from] = { dialback_key = stanza[1] }; origin.hosts[from] = { dialback_key = stanza[1] };

2
plugins/mod_s2s/mod_s2s.lua
View file

@ -276,7 +276,7 @@ function make_authenticated(event)
end end
--- Helper to check that a session peer's certificate is valid --- Helper to check that a session peer's certificate is valid
function check_cert_status(session) local function check_cert_status(session)
local host = session.direction == "outgoing" and session.to_host or session.from_host local host = session.direction == "outgoing" and session.to_host or session.from_host
local conn = session.conn:socket() local conn = session.conn:socket()
local cert local cert