X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;ds=sidebyside;f=org.argeo.cms%2Fsrc%2Forg%2Fargeo%2Fcms%2Fauth%2FCmsAuthUtils.java;h=fb7a6123acba9bc94677c8caab12f37ae78ab9a1;hb=bf8bd05b74a873460a3ec5d5cf4b666a9ce2c372;hp=2e585237df754f36a479e5e48e76e11c9272c0e6;hpb=db7aecc7170c024e0e39135cf6b8aa6ce7569ccb;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 2e585237d..fb7a6123a 100644 --- a/org.argeo.cms/src/org/argeo/cms/auth/CmsAuthUtils.java +++ b/org.argeo.cms/src/org/argeo/cms/auth/CmsAuthUtils.java @@ -1,47 +1,58 @@ package org.argeo.cms.auth; import java.security.Principal; -import java.util.Arrays; -import java.util.Collections; -import java.util.List; +import java.util.Collection; 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.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +//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.node.NodeConstants; +import org.argeo.cms.internal.http.WebCmsSessionImpl; +import org.argeo.node.security.AnonymousPrincipal; +import org.argeo.node.security.DataAdminPrincipal; +import org.argeo.node.security.NodeSecurityUtils; +import org.osgi.framework.BundleContext; +import org.osgi.framework.InvalidSyntaxException; +import org.osgi.framework.ServiceReference; +import org.osgi.service.http.HttpContext; import org.osgi.service.useradmin.Authorization; class CmsAuthUtils { - final static LdapName ROLE_ADMIN_NAME, ROLE_ANONYMOUS_NAME, ROLE_USER_NAME; - final static List RESERVED_ROLES; - final static X500Principal ROLE_ANONYMOUS_PRINCIPAL; - static { - try { - // ROLE_KERNEL_NAME = new LdapName(AuthConstants.ROLE_KERNEL); - ROLE_ADMIN_NAME = new LdapName(NodeConstants.ROLE_ADMIN); - ROLE_USER_NAME = new LdapName(NodeConstants.ROLE_USER); - ROLE_ANONYMOUS_NAME = new LdapName(NodeConstants.ROLE_ANONYMOUS); - RESERVED_ROLES = Collections.unmodifiableList(Arrays.asList(new LdapName[] { ROLE_ADMIN_NAME, - ROLE_ANONYMOUS_NAME, ROLE_USER_NAME, new LdapName(AuthConstants.ROLE_GROUP_ADMIN), - new LdapName(NodeConstants.ROLE_USER_ADMIN) })); - ROLE_ANONYMOUS_PRINCIPAL = new X500Principal(ROLE_ANONYMOUS_NAME.toString()); - } catch (InvalidNameException e) { - throw new Error("Cannot initialize login module class", e); - } - } + private final static Log log = LogFactory.getLog(CmsAuthUtils.class); + + /** 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"; + + 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 addAuthentication(Subject subject, Authorization authorization) { assert subject != null; + checkSubjectEmpty(subject); assert authorization != null; - + // required for display name: subject.getPrivateCredentials().add(authorization); @@ -53,16 +64,16 @@ class CmsAuthUtils { final LdapName name; final Principal userPrincipal; if (authName == null) { - name = ROLE_ANONYMOUS_NAME; - userPrincipal = ROLE_ANONYMOUS_PRINCIPAL; + name = NodeSecurityUtils.ROLE_ANONYMOUS_NAME; + userPrincipal = new AnonymousPrincipal(); principals.add(userPrincipal); - principals.add(new AnonymousPrincipal()); + // principals.add(new AnonymousPrincipal()); } else { name = new LdapName(authName); - checkUserName(name); + NodeSecurityUtils.checkUserName(name); userPrincipal = new X500Principal(name.toString()); principals.add(userPrincipal); - principals.add(new ImpliedByPrincipal(ROLE_USER_NAME, userPrincipal)); + principals.add(new ImpliedByPrincipal(NodeSecurityUtils.ROLE_USER_NAME, userPrincipal)); } // Add roles provided by authorization @@ -71,10 +82,10 @@ class CmsAuthUtils { if (roleName.equals(name)) { // skip } else { - checkImpliedPrincipalName(roleName); + 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()); } } @@ -83,26 +94,137 @@ class CmsAuthUtils { } } - static void checkUserName(LdapName name) { - if (RESERVED_ROLES.contains(name)) - throw new CmsException(name + " is a reserved name"); + 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 checkImpliedPrincipalName(LdapName roleName) { - if (ROLE_USER_NAME.equals(roleName) || ROLE_ANONYMOUS_NAME.equals(roleName)) - throw new CmsException(roleName + " cannot be listed as role"); - } - - static void cleanUp(Subject subject){ + static void cleanUp(Subject subject) { // Argeo subject.getPrincipals().removeAll(subject.getPrincipals(X500Principal.class)); subject.getPrincipals().removeAll(subject.getPrincipals(ImpliedByPrincipal.class)); // Jackrabbit - subject.getPrincipals().removeAll(subject.getPrincipals(AdminPrincipal.class)); - subject.getPrincipals().removeAll(subject.getPrincipals(AnonymousPrincipal.class)); + // 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"; + + static void registerSessionAuthorization(BundleContext bc, HttpServletRequest request, Subject subject, + Authorization authorization) { + HttpSession httpSession = request.getSession(); + String httpSessId = httpSession.getId(); + if (authorization.getName() != null) { + request.setAttribute(HttpContext.REMOTE_USER, authorization.getName()); + request.setAttribute(HttpContext.AUTHORIZATION, authorization); + + CmsSession cmsSession = CmsSessionImpl.getByLocalId(httpSessId); + if (cmsSession == null) + cmsSession = new WebCmsSessionImpl(subject, authorization, httpSessId); + request.setAttribute(CmsSession.class.getName(), cmsSession); + // else + // throw new CmsException("Already a CMS session registered for + // "+httpSessId); + + // if (httpSession.getAttribute(HttpContext.AUTHORIZATION) == null) + // { + + // Collection> sr; + // try { + // sr = bc.getServiceReferences(CmsSession.class, + // "(" + CmsSession.SESSION_LOCAL_ID + "=" + httpSessId + ")"); + // } catch (InvalidSyntaxException e) { + // throw new CmsException("Cannot get CMS session for id " + + // httpSessId, e); + // } + // ServiceReference cmsSessionRef; + // if (sr.size() == 1) { + // cmsSessionRef = sr.iterator().next(); + // } else if (sr.size() == 0) { + // WebCmsSessionImpl cmsSessionImpl = new WebCmsSessionImpl(subject, + // authorization, httpSessId); + // cmsSessionRef = + // cmsSessionImpl.getServiceRegistration().getReference(); + // if (log.isDebugEnabled()) + // log.debug("Initialized " + cmsSessionImpl + " for " + + // authorization.getName()); + // } else + // throw new CmsException(sr.size() + " CMS sessions registered for + // " + httpSessId); + // + // cmsSession = (CmsSession) bc.getService(cmsSessionRef); + // cmsSession.addHttpSession(request); + // if (log.isTraceEnabled()) + // log.trace("Added " + request.getServletPath() + " to " + + // cmsSession + " (" + request.getRequestURI() + // + ")"); + // httpSession.setAttribute(HttpContext.REMOTE_USER, + // authorization.getName()); + // httpSession.setAttribute(HttpContext.AUTHORIZATION, + // authorization); + 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 + ")"); + } + } + // } + } + + static boolean logoutSession(BundleContext bc, Subject subject) { + UUID nodeSessionId; + if (subject.getPrivateCredentials(CmsSessionId.class).size() == 1) + nodeSessionId = subject.getPrivateCredentials(CmsSessionId.class).iterator().next().getUuid(); + else + return false; + Collection> srs; + try { + srs = bc.getServiceReferences(CmsSession.class, "(" + CmsSession.SESSION_UUID + "=" + nodeSessionId + ")"); + } catch (InvalidSyntaxException e) { + throw new CmsException("Cannot retrieve CMS session #" + nodeSessionId, e); + } + + if (srs.size() == 0) { + if (log.isTraceEnabled()) + log.warn("No CMS web session found for http session " + nodeSessionId); + return false; + } else if (srs.size() > 1) + throw new CmsException(srs.size() + " CMS web sessions found for http session " + nodeSessionId); + + WebCmsSessionImpl cmsSession = (WebCmsSessionImpl) bc.getService(srs.iterator().next()); + cmsSession.cleanUp(); + subject.getPrivateCredentials().removeAll(subject.getPrivateCredentials(CmsSessionId.class)); + if (log.isDebugEnabled()) + log.debug("Cleaned up " + cmsSession); + return true; + } + + 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() { } + }