Software / code / prosody
Changeset
6301:2fdd71b08126
mod_dialback: Short-circuit dialback auth if certificate is considered valid
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Fri, 04 Jul 2014 21:48:25 +0200 |
| parents | 6300:4b0172dc5e3a |
| children | 6302:76699a0ae4c4 |
| files | plugins/mod_dialback.lua plugins/mod_s2s/mod_s2s.lua |
| diffstat | 2 files changed, 11 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/plugins/mod_dialback.lua Thu Jul 03 15:38:53 2014 +0200 +++ b/plugins/mod_dialback.lua Fri Jul 04 21:48:25 2014 +0200 @@ -13,6 +13,7 @@ local st = require "util.stanza"; local sha256_hash = require "util.hashes".sha256; local nameprep = require "util.encodings".stringprep.nameprep; +local check_cert_status = module:depends"s2s".check_cert_status; local uuid_gen = require"util.uuid".generate; local xmlns_stream = "http://etherx.jabber.org/streams"; @@ -20,6 +21,7 @@ local dialback_requests = setmetatable({}, { __mode = 'v' }); local dialback_secret = module.host .. module:get_option_string("dialback_secret", uuid_gen()); +local dwd = module:get_option_boolean("dialback_without_dialback", false); function module.save() return { dialback_secret = dialback_secret }; @@ -80,6 +82,14 @@ local attr = stanza.attr; local to, from = nameprep(attr.to), nameprep(attr.from); + 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 + if not hosts[to] then -- Not a host that we serve origin.log("warn", "%s tried to connect to %s, which we don't serve", from, to);
--- a/plugins/mod_s2s/mod_s2s.lua Thu Jul 03 15:38:53 2014 +0200 +++ b/plugins/mod_s2s/mod_s2s.lua Fri Jul 04 21:48:25 2014 +0200 @@ -235,7 +235,7 @@ end --- Helper to check that a session peer's certificate is valid -local function check_cert_status(session) +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
