mod_s2s_auth_certs: Pick a logging function once and stick with it

This commit is contained in:
Kim Alvefur 2014-07-25 21:03:16 +02:00
parent bd17040999
commit a960fa32ac

View file

@ -9,6 +9,7 @@ module:hook("s2s-check-certificate", function(event)
local conn = session.conn:socket(); local conn = session.conn:socket();
if cert then if cert then
local log = session.log or log;
local chain_valid, errors; local chain_valid, errors;
if conn.getpeerverification then if conn.getpeerverification then
chain_valid, errors = conn:getpeerverification(); chain_valid, errors = conn:getpeerverification();
@ -20,13 +21,13 @@ module:hook("s2s-check-certificate", function(event)
end end
-- Is there any interest in printing out all/the number of errors here? -- Is there any interest in printing out all/the number of errors here?
if not chain_valid then 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 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 end
session.cert_chain_status = "invalid"; session.cert_chain_status = "invalid";
else else
(session.log or log)("debug", "certificate chain validation result: valid"); log("debug", "certificate chain validation result: valid");
session.cert_chain_status = "valid"; session.cert_chain_status = "valid";
-- We'll go ahead and verify the asserted identity if the -- We'll go ahead and verify the asserted identity if the
@ -37,7 +38,7 @@ module:hook("s2s-check-certificate", function(event)
else else
session.cert_identity_status = "invalid" session.cert_identity_status = "invalid"
end 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 end
end end