X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=org.argeo.cms%2Fsrc%2Forg%2Fargeo%2Fcms%2Fauth%2FHttpSessionLoginModule.java;h=1bbe359b9f8b478a6d986e75f32d47717e42873b;hb=6f20d8f8fb510fd7fbecfafd0254126624a5e9e1;hp=81ca5baf3778727783b1f73f6dd045b6a0d893f2;hpb=6d206b9052689ffa880cd4593bfefa704dc0dd46;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 81ca5baf3..1bbe359b9 100644
--- 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;
@@ -41,6 +42,7 @@ public class HttpSessionLoginModule implements LoginModule {
 	private BundleContext bc;
 
 	private Authorization authorization;
+	private Locale locale;
 
 	@SuppressWarnings("unchecked")
 	@Override
@@ -78,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,
@@ -90,6 +91,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
@@ -105,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;
 		}
 	}
@@ -120,8 +126,11 @@ public class HttpSessionLoginModule implements LoginModule {
 		}
 
 		if (authorization != null) {
-			Locale locale = request.getLocale();
-			CmsAuthUtils.addAuthorization(subject, authorization,locale , 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;
@@ -193,9 +202,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");
+			}
 		}
 	}