Software / code / prosody
Changeset
8456:891239e7e896
Merge 0.10->trunk
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Tue, 05 Dec 2017 12:26:08 +0100 |
| parents | 8454:90962ef41bf3 (current diff) 8455:1d0862814bfc (diff) |
| children | 8457:20c5ace92b19 |
| files | |
| diffstat | 2 files changed, 14 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/plugins/mod_dialback.lua Tue Dec 05 11:59:43 2017 +0100 +++ b/plugins/mod_dialback.lua Tue Dec 05 12:26:08 2017 +0100 @@ -14,7 +14,6 @@ local sha256_hash = require "util.hashes".sha256; local sha256_hmac = require "util.hashes".hmac_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"; @@ -24,6 +23,19 @@ 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) + local host = session.direction == "outgoing" and session.to_host or session.from_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 }; end
--- a/plugins/mod_limits.lua Tue Dec 05 11:59:43 2017 +0100 +++ b/plugins/mod_limits.lua Tue Dec 05 12:26:08 2017 +0100 @@ -1,4 +1,4 @@ --- Because we deal we pre-authed sessions and streams we can't be host-specific +-- Because we deal with pre-authed sessions and streams we can't be host-specific module:set_global(); local filters = require "util.filters";
