Diff

plugins/mod_s2s_auth_certs.lua @ 6320:17344d25a0f6

mod_s2s_auth_certs: Pick a logging function once and stick with it
author Kim Alvefur <zash@zash.se>
date Fri, 25 Jul 2014 21:03:16 +0200
parent 6319:92d009af6eba
child 6373:84e7e418c29a
line wrap: on
line diff
--- a/plugins/mod_s2s_auth_certs.lua	Fri Jul 25 20:41:54 2014 +0200
+++ b/plugins/mod_s2s_auth_certs.lua	Fri Jul 25 21:03:16 2014 +0200
@@ -9,6 +9,7 @@
 	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 @@
 		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 @@
 				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