X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=org.argeo.cms%2Fsrc%2Forg%2Fargeo%2Fcms%2Fauth%2FHttpSessionLoginModule.java;h=48220a86876b7db2b3092ad9395757cc648514c5;hb=715f6820660b91d532e3bd75a53786267066e1a7;hp=be8a693baa2c9a6da376fc11c929e2defa1b2995;hpb=02a6354c17ddb160513580e9e3c7826d9475b177;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 be8a693ba..48220a868 100644
--- a/org.argeo.cms/src/org/argeo/cms/auth/HttpSessionLoginModule.java
+++ b/org.argeo.cms/src/org/argeo/cms/auth/HttpSessionLoginModule.java
@@ -2,7 +2,9 @@ package org.argeo.cms.auth;
 
 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;
 
@@ -14,8 +16,8 @@ import javax.security.auth.login.LoginException;
 import javax.security.auth.spi.LoginModule;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+import javax.servlet.http.HttpSession;
 
-import org.apache.commons.codec.binary.Base64;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.argeo.cms.CmsException;
@@ -39,6 +41,7 @@ public class HttpSessionLoginModule implements LoginModule {
 	private BundleContext bc;
 
 	private Authorization authorization;
+	private Locale locale;
 
 	@SuppressWarnings("unchecked")
 	@Override
@@ -68,7 +71,14 @@ public class HttpSessionLoginModule implements LoginModule {
 			return false;
 		authorization = (Authorization) request.getAttribute(HttpContext.AUTHORIZATION);
 		if (authorization == null) {// search by session ID
-			String httpSessionId = request.getSession().getId();
+			HttpSession httpSession = request.getSession(false);
+			if (httpSession == null) {
+				// TODO make sure this is always safe
+				if (log.isTraceEnabled())
+					log.trace("Create http session");
+				httpSession = request.getSession(true);
+			}
+			String httpSessionId = httpSession.getId();
 			// authorization = (Authorization)
 			// request.getSession().getAttribute(HttpContext.AUTHORIZATION);
 			// if (authorization == null) {
@@ -81,7 +91,10 @@ 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
 				if (log.isTraceEnabled())
 					log.trace("Retrieved authorization from " + cmsSession);
 			} else if (sr.size() == 0)
@@ -93,29 +106,15 @@ public class HttpSessionLoginModule implements LoginModule {
 		sharedState.put(CmsAuthUtils.SHARED_STATE_HTTP_REQUEST, request);
 		extractHttpAuth(request);
 		extractClientCertificate(request);
-		if (authorization == null)
+		if (authorization == null) {
 			return false;
-		sharedState.put(CmsAuthUtils.SHARED_STATE_AUTHORIZATION, authorization);
-		return true;
+		} else {
+			return true;
+		}
 	}
 
 	@Override
 	public boolean commit() throws LoginException {
-		// TODO create CmsSession in another module
-		Authorization authorizationToRegister;
-		if (authorization == null) {
-			authorizationToRegister = (Authorization) sharedState.get(CmsAuthUtils.SHARED_STATE_AUTHORIZATION);
-		} else { // this login module did the authorization
-			CmsAuthUtils.addAuthentication(subject, authorization);
-			authorizationToRegister = authorization;
-		}
-		if (authorizationToRegister == null) {
-			return false;
-		}
-		if (request == null)
-			return false;
-		CmsAuthUtils.registerSessionAuthorization(bc, request, subject, authorizationToRegister);
-
 		byte[] outToken = (byte[]) sharedState.get(CmsAuthUtils.SHARED_STATE_SPNEGO_OUT_TOKEN);
 		if (outToken != null) {
 			response.setHeader(CmsAuthUtils.HEADER_WWW_AUTHENTICATE,
@@ -123,7 +122,12 @@ public class HttpSessionLoginModule implements LoginModule {
 		}
 
 		if (authorization != null) {
-			// CmsAuthUtils.addAuthentication(subject, authorization);
+			// 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 {
@@ -145,7 +149,8 @@ public class HttpSessionLoginModule implements LoginModule {
 
 	@Override
 	public boolean logout() throws LoginException {
-		return CmsAuthUtils.logoutSession(bc, subject);
+		cleanUp();
+		return true;
 	}
 
 	private void extractHttpAuth(final HttpServletRequest httpRequest) {
@@ -157,7 +162,8 @@ public class HttpSessionLoginModule implements LoginModule {
 				if (basic.equalsIgnoreCase("Basic")) {
 					try {
 						// TODO manipulate char[]
-						String credentials = new String(Base64.decodeBase64(st.nextToken()), "UTF-8");
+						Base64.Decoder decoder = Base64.getDecoder();
+						String credentials = new String(decoder.decode(st.nextToken()), "UTF-8");
 						// log.debug("Credentials: " + credentials);
 						int p = credentials.indexOf(":");
 						if (p != -1) {
@@ -173,19 +179,37 @@ public class HttpSessionLoginModule implements LoginModule {
 					}
 				} else if (basic.equalsIgnoreCase("Negotiate")) {
 					String spnegoToken = st.nextToken();
-					byte[] authToken = Base64.decodeBase64(spnegoToken);
+					Base64.Decoder decoder = Base64.getDecoder();
+					byte[] authToken = decoder.decode(spnegoToken);
 					sharedState.put(CmsAuthUtils.SHARED_STATE_SPNEGO_TOKEN, authToken);
 				}
 			}
 		}
+
+		// auth token
+		// String mail = request.getParameter(LdapAttrs.mail.name());
+		// String authPassword = request.getParameter(LdapAttrs.authPassword.name());
+		// if (authPassword != null) {
+		// sharedState.put(CmsAuthUtils.SHARED_STATE_PWD, authPassword);
+		// if (mail != null)
+		// sharedState.put(CmsAuthUtils.SHARED_STATE_NAME, mail);
+		// }
 	}
 
-	private X509Certificate[] extractClientCertificate(HttpServletRequest req) {
+	private void extractClientCertificate(HttpServletRequest req) {
 		X509Certificate[] certs = (X509Certificate[]) req.getAttribute("javax.servlet.request.X509Certificate");
 		if (null != certs && certs.length > 0) {
-			return certs;
+			sharedState.put(CmsAuthUtils.SHARED_STATE_NAME, certs[0].getSubjectX500Principal().getName());
+			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) {
+				sharedState.put(CmsAuthUtils.SHARED_STATE_NAME, certDn);
+				String issuerDn = req.getHeader("SSL_CLIENT_I_DN");
+				sharedState.put(CmsAuthUtils.SHARED_STATE_CERTIFICATE_CHAIN, issuerDn);
+			}
 		}
-		return null;
 	}
 
 }