X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=org.argeo.cms%2Fsrc%2Forg%2Fargeo%2Fcms%2Fauth%2FHttpSessionLoginModule.java;h=7622eef27da26c49f13d6a56ef63a68e27f1387e;hb=e89299764ff15d485c94849d5b6e283d7502dac5;hp=61268ca34f895956541935b557d7202fa93ad061;hpb=54fb8849152a3d91f7ba52aeeffb236f5e70fbdf;p=lgpl%2Fargeo-commons.git

diff --git a/org.argeo.cms/src/org/argeo/cms/auth/HttpSessionLoginModule.java b/org.argeo.cms/src/org/argeo/cms/auth/HttpSessionLoginModule.java
index 61268ca34..7622eef27 100644
--- a/org.argeo.cms/src/org/argeo/cms/auth/HttpSessionLoginModule.java
+++ b/org.argeo.cms/src/org/argeo/cms/auth/HttpSessionLoginModule.java
@@ -200,17 +200,22 @@ public class HttpSessionLoginModule implements LoginModule {
 	private void extractClientCertificate(HttpServletRequest req) {
 		X509Certificate[] certs = (X509Certificate[]) req.getAttribute("javax.servlet.request.X509Certificate");
 		if (null != certs && certs.length > 0) {// Servlet container verified the client certificate
-			sharedState.put(CmsAuthUtils.SHARED_STATE_NAME, certs[0].getSubjectX500Principal().getName());
+			String certDn = certs[0].getSubjectX500Principal().getName();
+			sharedState.put(CmsAuthUtils.SHARED_STATE_NAME, certDn);
 			sharedState.put(CmsAuthUtils.SHARED_STATE_CERTIFICATE_CHAIN, certs);
+			if (log.isDebugEnabled())
+				log.debug("Client certificate " + certDn + " verified by servlet container");
 		} // Reverse proxy verified the client certificate
 		String clientDnHttpHeader = Activator.getHttpProxySslHeader();
 		if (clientDnHttpHeader != null) {
 			String certDn = req.getHeader(clientDnHttpHeader);
 			// TODO retrieve more cf. https://httpd.apache.org/docs/current/mod/mod_ssl.html
 			// String issuerDn = req.getHeader("SSL_CLIENT_I_DN");
-			if (certDn != null) {
+			if (certDn != null && !certDn.trim().equals("")) {
 				sharedState.put(CmsAuthUtils.SHARED_STATE_NAME, certDn);
 				sharedState.put(CmsAuthUtils.SHARED_STATE_CERTIFICATE_CHAIN, "");
+				if (log.isDebugEnabled())
+					log.debug("Client certificate " + certDn + " verified by reverse proxy");
 			}
 		}
 	}