X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=org.argeo.cms%2Fsrc%2Forg%2Fargeo%2Fcms%2Fauth%2FCmsAuthUtils.java;h=65ccbd6aba15c7c2cfa71fcb7f39d7107eb5d7a0;hb=12a285bfc5d33b64e39a1083a24b5d65515acf52;hp=86800e282627441a3d6dbda5cf1d49320ba69b2e;hpb=7e333073d07b780efe681306a1842a750cbea83c;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 86800e282..65ccbd6ab 100644 --- a/org.argeo.cms/src/org/argeo/cms/auth/CmsAuthUtils.java +++ b/org.argeo.cms/src/org/argeo/cms/auth/CmsAuthUtils.java @@ -1,26 +1,52 @@ package org.argeo.cms.auth; import java.security.Principal; +import java.util.Locale; 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 */ + // final static String SHARED_STATE_AUTHORIZATION = + // "org.osgi.service.useradmin.authorization"; + /** From com.sun.security.auth.module.*LoginModule */ + final static String SHARED_STATE_NAME = "javax.security.auth.login.name"; + /** From com.sun.security.auth.module.*LoginModule */ + 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, Locale locale, + HttpServletRequest request) { assert subject != null; + checkSubjectEmpty(subject); assert authorization != null; // required for display name: @@ -54,27 +80,103 @@ class CmsAuthUtils { } else { NodeSecurityUtils.checkImpliedPrincipalName(roleName); principals.add(new ImpliedByPrincipal(roleName.toString(), userPrincipal)); - // if (roleName.equals(ROLE_ADMIN_NAME)) - // principals.add(new - // AdminPrincipal(SecurityConstants.ADMIN_ID)); + if (roleName.equals(NodeSecurityUtils.ROLE_ADMIN_NAME)) + principals.add(new DataAdminPrincipal()); } } } catch (InvalidNameException e) { throw new CmsException("Cannot commit", e); } + + registerSessionAuthorization(request, subject, authorization, locale); + } + + private static void checkSubjectEmpty(Subject subject) { + if (!subject.getPrincipals(AnonymousPrincipal.class).isEmpty()) + throw new IllegalStateException("Already logged in as anonymous: " + subject); + if (!subject.getPrincipals(X500Principal.class).isEmpty()) + throw new IllegalStateException("Already logged in as user: " + subject); + if (!subject.getPrincipals(DataAdminPrincipal.class).isEmpty()) + throw new IllegalStateException("Already logged in as data admin: " + subject); + if (!subject.getPrincipals(ImpliedByPrincipal.class).isEmpty()) + throw new IllegalStateException("Already authorized: " + subject); } static void cleanUp(Subject subject) { // 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)); } + private synchronized static void registerSessionAuthorization(HttpServletRequest request, Subject subject, + Authorization authorization, Locale locale) { + // synchronized in order to avoid multiple registrations + // TODO move it to a service in order to avoid static synchronization + if (request != null) { + HttpSession httpSession = request.getSession(false); + assert httpSession != null; + 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); + + CmsSessionImpl cmsSession = CmsSessionImpl.getByLocalId(httpSessId); + if (cmsSession != null) { + if (authorization.getName() != null) { + if (cmsSession.getAuthorization().getName() == null) { + cmsSession.close(); + 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) { + cmsSession.close(); + // TODO rather throw an exception ? log a warning ? + cmsSession = null; + } + } + } + + if (cmsSession == null) + cmsSession = new WebCmsSessionImpl(subject, authorization, locale, request); + // 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 getSinglePrincipal(Subject subject, Class clss) { + Set 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() { } + }