Improve logging

[lgpl/argeo-commons.git] / org.argeo.cms / src / org / argeo / cms / auth / HttpSessionLoginModule.java

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 48220a86876b7db2b3092ad9395757cc648514c5..1bbe359b9f8b478a6d986e75f32d47717e42873b 100644 (file)
--- a/org.argeo.cms/src/org/argeo/cms/auth/HttpSessionLoginModule.java
+++ b/org.argeo.cms/src/org/argeo/cms/auth/HttpSessionLoginModule.java
@@ -21,6 +21,7 @@ import javax.servlet.http.HttpSession;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.argeo.cms.CmsException;
+import org.argeo.cms.internal.kernel.Activator;
 import org.osgi.framework.BundleContext;
 import org.osgi.framework.FrameworkUtil;
 import org.osgi.framework.InvalidSyntaxException;
@@ -79,9 +80,8 @@ public class HttpSessionLoginModule implements LoginModule {
                                httpSession = request.getSession(true);
                        }
                        String httpSessionId = httpSession.getId();
-                       // authorization = (Authorization)
-                       // request.getSession().getAttribute(HttpContext.AUTHORIZATION);
-                       // if (authorization == null) {
+                       if (log.isTraceEnabled())
+                               log.trace("HTTP login: " + request.getPathInfo() + " #" + httpSessionId);
                        Collection<ServiceReference<CmsSession>> sr;
                        try {
                                sr = bc.getServiceReferences(CmsSession.class,
@@ -107,8 +107,12 @@ public class HttpSessionLoginModule implements LoginModule {
                extractHttpAuth(request);
                extractClientCertificate(request);
                if (authorization == null) {
+                       if (log.isTraceEnabled())
+                               log.trace("HTTP login: " + false);
                        return false;
                } else {
+                       if (log.isTraceEnabled())
+                               log.trace("HTTP login: " + true);
                        return true;
                }
        }
@@ -198,16 +202,23 @@ 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) {
-                       sharedState.put(CmsAuthUtils.SHARED_STATE_NAME, certs[0].getSubjectX500Principal().getName());
+               if (null != certs && certs.length > 0) {// Servlet container verified the client certificate
+                       String certDn = certs[0].getSubjectX500Principal().getName();
+                       sharedState.put(CmsAuthUtils.SHARED_STATE_NAME, certDn);
                        sharedState.put(CmsAuthUtils.SHARED_STATE_CERTIFICATE_CHAIN, certs);
-               } else {
-                       // When client has been verified by reverse proxy
-                       String certDn = req.getHeader("SSL_CLIENT_S_DN");
-                       if (certDn != null) {
+                       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 && !certDn.trim().equals("(null)")) {
                                sharedState.put(CmsAuthUtils.SHARED_STATE_NAME, certDn);
-                               String issuerDn = req.getHeader("SSL_CLIENT_I_DN");
-                               sharedState.put(CmsAuthUtils.SHARED_STATE_CERTIFICATE_CHAIN, issuerDn);
+                               sharedState.put(CmsAuthUtils.SHARED_STATE_CERTIFICATE_CHAIN, "");
+                               if (log.isDebugEnabled())
+                                       log.debug("Client certificate " + certDn + " verified by reverse proxy");
                        }
                }
        }