aboutsummaryrefslogtreecommitdiffstats
path: root/plugins/mod_s2s_auth_certs.lua
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2014-09-02 22:34:32 +0200
committerKim Alvefur <zash@zash.se>2014-09-02 22:34:32 +0200
commitc47fa42628b2119f7e37e83f22919bc905a53624 (patch)
tree5ae5bb832b9e41b4812e12421bb70daf1c3b7446 /plugins/mod_s2s_auth_certs.lua
parent46105d64bf9627c8618624281c966ec784f4fc12 (diff)
parentc80b30a71ceb555bb33d14c3c7dbee0a8c93eaee (diff)
downloadprosody-c47fa42628b2119f7e37e83f22919bc905a53624.tar.gz
prosody-c47fa42628b2119f7e37e83f22919bc905a53624.zip
Merge 0.10->trunk
Diffstat (limited to 'plugins/mod_s2s_auth_certs.lua')
-rw-r--r--plugins/mod_s2s_auth_certs.lua61
1 files changed, 32 insertions, 29 deletions
diff --git a/plugins/mod_s2s_auth_certs.lua b/plugins/mod_s2s_auth_certs.lua
index efc81130..dd0eb3cb 100644
--- a/plugins/mod_s2s_auth_certs.lua
+++ b/plugins/mod_s2s_auth_certs.lua
@@ -7,39 +7,42 @@ local log = module._log;
module:hook("s2s-check-certificate", function(event)
local session, host, cert = event.session, event.host, event.cert;
local conn = session.conn:socket();
+ local log = session.log or log;
- if cert then
- local log = session.log or log;
- local chain_valid, errors;
- if conn.getpeerverification then
- chain_valid, errors = conn:getpeerverification();
- elseif conn.getpeerchainvalid then -- COMPAT mw/luasec-hg
- chain_valid, errors = conn:getpeerchainvalid();
- errors = (not chain_valid) and { { errors } } or nil;
- else
- chain_valid, errors = false, { { "Chain verification not supported by this version of LuaSec" } };
+ if not cert then
+ log("warn", "No certificate provided by %s", host or "unknown host");
+ return;
+ end
+
+ local chain_valid, errors;
+ if conn.getpeerverification then
+ chain_valid, errors = conn:getpeerverification();
+ elseif conn.getpeerchainvalid then -- COMPAT mw/luasec-hg
+ chain_valid, errors = conn:getpeerchainvalid();
+ errors = (not chain_valid) and { { errors } } or nil;
+ else
+ chain_valid, errors = false, { { "Chain verification not supported by this version of LuaSec" } };
+ end
+ -- Is there any interest in printing out all/the number of errors here?
+ if not chain_valid then
+ log("debug", "certificate chain validation result: invalid");
+ for depth, t in pairs(errors or NULL) do
+ log("debug", "certificate error(s) at depth %d: %s", depth-1, table.concat(t, ", "))
end
- -- Is there any interest in printing out all/the number of errors here?
- if not chain_valid then
- log("debug", "certificate chain validation result: invalid");
- for depth, t in pairs(errors or NULL) do
- log("debug", "certificate error(s) at depth %d: %s", depth-1, table.concat(t, ", "))
- end
- session.cert_chain_status = "invalid";
- else
- log("debug", "certificate chain validation result: valid");
- session.cert_chain_status = "valid";
+ session.cert_chain_status = "invalid";
+ else
+ log("debug", "certificate chain validation result: valid");
+ session.cert_chain_status = "valid";
- -- We'll go ahead and verify the asserted identity if the
- -- connecting server specified one.
- if host then
- if cert_verify_identity(host, "xmpp-server", cert) then
- session.cert_identity_status = "valid"
- else
- session.cert_identity_status = "invalid"
- end
- log("debug", "certificate identity validation result: %s", session.cert_identity_status);
+ -- We'll go ahead and verify the asserted identity if the
+ -- connecting server specified one.
+ if host then
+ if cert_verify_identity(host, "xmpp-server", cert) then
+ session.cert_identity_status = "valid"
+ else
+ session.cert_identity_status = "invalid"
end
+ log("debug", "certificate identity validation result: %s", session.cert_identity_status);
end
end
end, 509);