X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=org.argeo.cms%2Fsrc%2Forg%2Fargeo%2Fcms%2Fauth%2FCmsAuthUtils.java;h=4d59c5263a76afe974b600244c8ad6b848c98243;hb=34ba1b915e1d406f6574c0be93e1e9da3eab1978;hp=63936c89754a1a81b2d2b222c557e43823fc0f3c;hpb=e01be1347b84f99eb1e4a1c0e9829cfe7fbd89f9;p=lgpl%2Fargeo-commons.git

diff --git a/org.argeo.cms/src/org/argeo/cms/auth/CmsAuthUtils.java b/org.argeo.cms/src/org/argeo/cms/auth/CmsAuthUtils.java
index 63936c897..4d59c5263 100644
--- a/org.argeo.cms/src/org/argeo/cms/auth/CmsAuthUtils.java
+++ b/org.argeo.cms/src/org/argeo/cms/auth/CmsAuthUtils.java
@@ -2,31 +2,47 @@ package org.argeo.cms.auth;
 
 import java.security.Principal;
 import java.util.Set;
+import java.util.UUID;
 
 import javax.naming.InvalidNameException;
 import javax.naming.ldap.LdapName;
 import javax.security.auth.Subject;
 import javax.security.auth.x500.X500Principal;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpSession;
 
 //import org.apache.jackrabbit.core.security.AnonymousPrincipal;
 //import org.apache.jackrabbit.core.security.SecurityConstants;
 //import org.apache.jackrabbit.core.security.principal.AdminPrincipal;
 import org.argeo.cms.CmsException;
+import org.argeo.cms.internal.auth.CmsSessionImpl;
 import org.argeo.cms.internal.auth.ImpliedByPrincipal;
+import org.argeo.cms.internal.http.WebCmsSessionImpl;
+import org.argeo.node.NodeConstants;
 import org.argeo.node.security.AnonymousPrincipal;
 import org.argeo.node.security.DataAdminPrincipal;
 import org.argeo.node.security.NodeSecurityUtils;
+import org.osgi.service.http.HttpContext;
 import org.osgi.service.useradmin.Authorization;
 
 class CmsAuthUtils {
+	/** Shared HTTP request */
+	final static String SHARED_STATE_HTTP_REQUEST = "org.argeo.cms.auth.http.request";
 	/** From org.osgi.service.http.HttpContext */
-	static final String SHARED_STATE_AUTHORIZATION = "org.osgi.service.useradmin.authorization";
+	// final static String SHARED_STATE_AUTHORIZATION =
+	// "org.osgi.service.useradmin.authorization";
 	/** From com.sun.security.auth.module.*LoginModule */
-	static final String SHARED_STATE_NAME = "javax.security.auth.login.name";
+	final static String SHARED_STATE_NAME = "javax.security.auth.login.name";
 	/** From com.sun.security.auth.module.*LoginModule */
-	static final String SHARED_STATE_PWD = "javax.security.auth.login.password";
+	final static String SHARED_STATE_PWD = "javax.security.auth.login.password";
 
-	static void addAuthentication(Subject subject, Authorization authorization) {
+	final static String SHARED_STATE_SPNEGO_TOKEN = "org.argeo.cms.auth.spnegoToken";
+	final static String SHARED_STATE_SPNEGO_OUT_TOKEN = "org.argeo.cms.auth.spnegoOutToken";
+
+	final static String HEADER_AUTHORIZATION = "Authorization";
+	final static String HEADER_WWW_AUTHENTICATE = "WWW-Authenticate";
+
+	static void addAuthorization(Subject subject, Authorization authorization, HttpServletRequest request) {
 		assert subject != null;
 		checkSubjectEmpty(subject);
 		assert authorization != null;
@@ -70,6 +86,8 @@ class CmsAuthUtils {
 		} catch (InvalidNameException e) {
 			throw new CmsException("Cannot commit", e);
 		}
+
+		registerSessionAuthorization(request, subject, authorization);
 	}
 
 	private static void checkSubjectEmpty(Subject subject) {
@@ -87,19 +105,74 @@ class CmsAuthUtils {
 		// Argeo
 		subject.getPrincipals().removeAll(subject.getPrincipals(X500Principal.class));
 		subject.getPrincipals().removeAll(subject.getPrincipals(ImpliedByPrincipal.class));
+		subject.getPrincipals().removeAll(subject.getPrincipals(AnonymousPrincipal.class));
+		subject.getPrincipals().removeAll(subject.getPrincipals(DataAdminPrincipal.class));
+
+		subject.getPrivateCredentials().removeAll(subject.getPrivateCredentials(CmsSessionId.class));
+		subject.getPrivateCredentials().removeAll(subject.getPrivateCredentials(Authorization.class));
 		// Jackrabbit
 		// subject.getPrincipals().removeAll(subject.getPrincipals(AdminPrincipal.class));
 		// subject.getPrincipals().removeAll(subject.getPrincipals(AnonymousPrincipal.class));
 	}
 
-	// SHARED STATE KEYS
-	// compatible with com.sun.security.auth.module.*LoginModule
-	// public static final String SHARED_STATE_USERNAME =
-	// "javax.security.auth.login.name";
-	// public static final String SHARED_STATE_PASSWORD =
-	// "javax.security.auth.login.password";
+	private static void registerSessionAuthorization(HttpServletRequest request, Subject subject,
+			Authorization authorization) {
+		if (request != null) {
+			HttpSession httpSession = request.getSession();
+			String httpSessId = httpSession.getId();
+			String remoteUser = authorization.getName() != null ? authorization.getName()
+					: NodeConstants.ROLE_ANONYMOUS;
+			request.setAttribute(HttpContext.REMOTE_USER, remoteUser);
+			request.setAttribute(HttpContext.AUTHORIZATION, authorization);
+
+			CmsSession cmsSession = CmsSessionImpl.getByLocalId(httpSessId);
+			if (cmsSession != null) {
+				if (authorization.getName() != null) {
+					if (cmsSession.getAuthorization().getName() == null) {
+						// FIXME make it more generic
+						((WebCmsSessionImpl) cmsSession).cleanUp();
+						cmsSession = null;
+					} else if (!authorization.getName().equals(cmsSession.getAuthorization().getName())) {
+						throw new CmsException("Inconsistent user " + authorization.getName()
+								+ " for existing CMS session " + cmsSession);
+					}
+				} else {// anonymous
+					if (cmsSession.getAuthorization().getName() != null) {
+						// FIXME make it more generic
+						((WebCmsSessionImpl) cmsSession).cleanUp();
+						cmsSession = null;
+					}
+				}
+			}
+
+			if (cmsSession == null)
+				cmsSession = new WebCmsSessionImpl(subject, authorization, httpSessId);
+			// request.setAttribute(CmsSession.class.getName(), cmsSession);
+			CmsSessionId nodeSessionId = new CmsSessionId(cmsSession.getUuid());
+			if (subject.getPrivateCredentials(CmsSessionId.class).size() == 0)
+				subject.getPrivateCredentials().add(nodeSessionId);
+			else {
+				UUID storedSessionId = subject.getPrivateCredentials(CmsSessionId.class).iterator().next().getUuid();
+				// if (storedSessionId.equals(httpSessionId.getValue()))
+				throw new CmsException(
+						"Subject already logged with session " + storedSessionId + " (not " + nodeSessionId + ")");
+			}
+		} else {
+			// TODO desktop, CLI
+		}
+	}
+
+	public static <T extends Principal> T getSinglePrincipal(Subject subject, Class<T> clss) {
+		Set<T> principals = subject.getPrincipals(clss);
+		if (principals.isEmpty())
+			return null;
+		if (principals.size() > 1)
+			throw new IllegalStateException("Only one " + clss + " principal expected in " + subject);
+		return principals.iterator().next();
+	}
 
 	private CmsAuthUtils() {
 
 	}
+
 }