Software / code / prosody
Changeset
11558:d0e9ffccdef9 0.11 0.11.9
mod_dialback: Remove d-w-d feature
Backs out 1d0862814bfc and 2fdd71b08126
Largely unused, undocumented and did not have enough tests to provide
confidence in its correct operation.
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Wed, 12 May 2021 17:22:02 +0200 |
| parents | 11557:6be890ca492e |
| children | 11559:56785f32e1d4 |
| files | plugins/mod_dialback.lua plugins/mod_s2s/mod_s2s.lua |
| diffstat | 2 files changed, 1 insertions(+), 23 deletions(-) [+] |
line wrap: on
line diff
--- a/plugins/mod_dialback.lua Sun Jun 23 16:16:26 2019 +0200 +++ b/plugins/mod_dialback.lua Wed May 12 17:22:02 2021 +0200 @@ -22,19 +22,6 @@ local dialback_requests = setmetatable({}, { __mode = 'v' }); 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() return { dialback_secret = dialback_secret }; @@ -104,15 +91,6 @@ origin:close("improper-addressing"); 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] };
--- a/plugins/mod_s2s/mod_s2s.lua Sun Jun 23 16:16:26 2019 +0200 +++ b/plugins/mod_s2s/mod_s2s.lua Wed May 12 17:22:02 2021 +0200 @@ -276,7 +276,7 @@ end --- 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 conn = session.conn:socket() local cert
