aboutsummaryrefslogtreecommitdiffstats
path: root/plugins
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2014-07-25 21:03:16 +0200
committerKim Alvefur <zash@zash.se>2014-07-25 21:03:16 +0200
commita960fa32aced10e5c55a68286eef89d78a3748e9 (patch)
treeb60e5c6d52f9e19b31dedde9879d3553a596ec3b /plugins
parentbd170409998f293bc35db5569a4f3cfc432f9c2f (diff)
downloadprosody-a960fa32aced10e5c55a68286eef89d78a3748e9.tar.gz
prosody-a960fa32aced10e5c55a68286eef89d78a3748e9.zip
mod_s2s_auth_certs: Pick a logging function once and stick with it
Diffstat (limited to 'plugins')
-rw-r--r--plugins/mod_s2s_auth_certs.lua9
1 files changed, 5 insertions, 4 deletions
diff --git a/plugins/mod_s2s_auth_certs.lua b/plugins/mod_s2s_auth_certs.lua
index be81f51b..efc81130 100644
--- a/plugins/mod_s2s_auth_certs.lua
+++ b/plugins/mod_s2s_auth_certs.lua
@@ -9,6 +9,7 @@ module:hook("s2s-check-certificate", function(event)
local conn = session.conn:socket();
if cert then
+ local log = session.log or log;
local chain_valid, errors;
if conn.getpeerverification then
chain_valid, errors = conn:getpeerverification();
@@ -20,13 +21,13 @@ module:hook("s2s-check-certificate", function(event)
end
-- Is there any interest in printing out all/the number of errors here?
if not chain_valid then
- (session.log or log)("debug", "certificate chain validation result: invalid");
+ log("debug", "certificate chain validation result: invalid");
for depth, t in pairs(errors or NULL) do
- (session.log or log)("debug", "certificate error(s) at depth %d: %s", depth-1, table.concat(t, ", "))
+ log("debug", "certificate error(s) at depth %d: %s", depth-1, table.concat(t, ", "))
end
session.cert_chain_status = "invalid";
else
- (session.log or log)("debug", "certificate chain validation result: valid");
+ log("debug", "certificate chain validation result: valid");
session.cert_chain_status = "valid";
-- We'll go ahead and verify the asserted identity if the
@@ -37,7 +38,7 @@ module:hook("s2s-check-certificate", function(event)
else
session.cert_identity_status = "invalid"
end
- (session.log or log)("debug", "certificate identity validation result: %s", session.cert_identity_status);
+ log("debug", "certificate identity validation result: %s", session.cert_identity_status);
end
end
end