Make client certificate authorization more robust

[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 ccd02b5b2783f8a26535958e7ebdcf5c89b5480b..cbd54063cbda19c4496a4930566000f3a735ef36 100644 (file)
--- a/org.argeo.cms/src/org/argeo/cms/auth/HttpSessionLoginModule.java
+++ b/org.argeo.cms/src/org/argeo/cms/auth/HttpSessionLoginModule.java
@@ -4,6 +4,7 @@ import java.io.IOException;
 import java.security.cert.X509Certificate;
 import java.util.Base64;
 import java.util.Collection;
+import java.util.Locale;
 import java.util.Map;
 import java.util.StringTokenizer;
 
@@ -20,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;
@@ -40,6 +42,7 @@ public class HttpSessionLoginModule implements LoginModule {
        private BundleContext bc;
 
        private Authorization authorization;
+       private Locale locale;
 
        @SuppressWarnings("unchecked")
        @Override
@@ -89,6 +92,7 @@ public class HttpSessionLoginModule implements LoginModule {
                        }
                        if (sr.size() == 1) {
                                CmsSession cmsSession = bc.getService(sr.iterator().next());
+                               locale = cmsSession.getLocale();
                                authorization = cmsSession.getAuthorization();
                                if (authorization.getName() == null)
                                        authorization = null;// anonymous is not sufficient
@@ -119,7 +123,12 @@ public class HttpSessionLoginModule implements LoginModule {
                }
 
                if (authorization != null) {
-                       CmsAuthUtils.addAuthorization(subject, authorization, request.getLocale(), request);
+                       // Locale locale = request.getLocale();
+                       if (locale == null)
+                               locale = request.getLocale();
+                       subject.getPublicCredentials().add(locale);
+                       CmsAuthUtils.addAuthorization(subject, authorization, locale, request);
+                       CmsAuthUtils.registerSessionAuthorization(request, subject, authorization, locale);
                        cleanUp();
                        return true;
                } else {
@@ -190,9 +199,24 @@ 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);
+                       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);
+                               sharedState.put(CmsAuthUtils.SHARED_STATE_CERTIFICATE_CHAIN, "");
+                               if (log.isDebugEnabled())
+                                       log.debug("Client certificate " + certDn + " verified by reverse proxy");
+                       }
                }
        }