X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=org.argeo.cms%2Fsrc%2Forg%2Fargeo%2Fcms%2Fauth%2FCmsAuthUtils.java;h=37992072482e0cf36b1a08ed899de0afcf2f8601;hb=e75cf778a87f1b2ef7cfc57339ccbf9657282e92;hp=2432d9c0a45b5a1947e8b0d2d38deb184d07140e;hpb=b8da6ff850049dd39531c1e50f2eef38c4e3298e;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 2432d9c0a..379920724 100644 --- a/org.argeo.cms/src/org/argeo/cms/auth/CmsAuthUtils.java +++ b/org.argeo.cms/src/org/argeo/cms/auth/CmsAuthUtils.java @@ -1,52 +1,58 @@ package org.argeo.cms.auth; +import static org.argeo.api.cms.CmsConstants.ROLE_ADMIN; +import static org.argeo.api.cms.CmsConstants.ROLE_ANONYMOUS; +import static org.argeo.api.cms.CmsConstants.ROLE_USER; +import static org.argeo.api.cms.CmsConstants.ROLE_USER_ADMIN; + import java.security.Principal; -import java.util.Collection; +import java.util.Arrays; +import java.util.Collections; +import java.util.List; +import java.util.Locale; import java.util.Set; +import java.util.UUID; -import javax.naming.InvalidNameException; -import javax.naming.ldap.LdapName; +//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.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.api.cms.AnonymousPrincipal; +import org.argeo.api.cms.CmsConstants; +import org.argeo.api.cms.CmsSession; +import org.argeo.api.cms.CmsSessionId; +import org.argeo.api.cms.DataAdminPrincipal; +import org.argeo.cms.internal.auth.CmsSessionImpl; import org.argeo.cms.internal.auth.ImpliedByPrincipal; -import org.argeo.cms.internal.kernel.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.argeo.cms.internal.auth.RemoteCmsSessionImpl; +import org.argeo.cms.internal.runtime.CmsContextImpl; +import org.argeo.cms.osgi.useradmin.AuthenticatingUser; import org.osgi.service.useradmin.Authorization; +/** Centralises security related registrations. */ class CmsAuthUtils { - private final static Log log = LogFactory.getLog(CmsAuthUtils.class); + // Standard + final static String SHARED_STATE_NAME = AuthenticatingUser.SHARED_STATE_NAME; + final static String SHARED_STATE_PWD = AuthenticatingUser.SHARED_STATE_PWD; +// final static String HEADER_AUTHORIZATION = "Authorization"; +// final static String HEADER_WWW_AUTHENTICATE = "WWW-Authenticate"; - /** Shared HTTP request */ + // Argeo specific 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 SHARED_STATE_CERTIFICATE_CHAIN = "org.argeo.cms.auth.certificateChain"; + final static String SHARED_STATE_REMOTE_ADDR = "org.argeo.cms.auth.remote.addr"; + final static String SHARED_STATE_REMOTE_PORT = "org.argeo.cms.auth.remote.port"; + final static String SHARED_STATE_OS_USERNAME = "org.argeo.cms.os.username"; - final static String HEADER_AUTHORIZATION = "Authorization"; - final static String HEADER_WWW_AUTHENTICATE = "WWW-Authenticate"; + final static String SINGLE_USER_LOCAL_ID = "single-user"; - static void addAuthentication(Subject subject, Authorization authorization) { + private final static List RESERVED_ROLES = Collections + .unmodifiableList(Arrays.asList(new String[] { ROLE_ADMIN, ROLE_ANONYMOUS, ROLE_USER, ROLE_USER_ADMIN })); + + static void addAuthorization(Subject subject, Authorization authorization) { assert subject != null; checkSubjectEmpty(subject); assert authorization != null; @@ -54,42 +60,49 @@ class CmsAuthUtils { // required for display name: subject.getPrivateCredentials().add(authorization); + boolean singleUser = authorization instanceof SingleUserAuthorization; + Set principals = subject.getPrincipals(); - try { - String authName = authorization.getName(); - - // determine user's principal - final LdapName name; - final Principal userPrincipal; - if (authName == null) { - name = NodeSecurityUtils.ROLE_ANONYMOUS_NAME; - userPrincipal = new AnonymousPrincipal(); - principals.add(userPrincipal); - // principals.add(new AnonymousPrincipal()); - } else { - name = new LdapName(authName); - NodeSecurityUtils.checkUserName(name); - userPrincipal = new X500Principal(name.toString()); - principals.add(userPrincipal); - principals.add(new ImpliedByPrincipal(NodeSecurityUtils.ROLE_USER_NAME, userPrincipal)); +// try { + String authName = authorization.getName(); + + // determine user's principal +// final LdapName name; + final Principal userPrincipal; + if (authName == null) { +// name = NodeSecurityUtils.ROLE_ANONYMOUS_NAME; + userPrincipal = new AnonymousPrincipal(); + principals.add(userPrincipal); + } else { +// name = new LdapName(authName); + checkUserName(authName); + userPrincipal = new X500Principal(authName.toString()); + principals.add(userPrincipal); + + if (singleUser) { + principals.add(new ImpliedByPrincipal(CmsConstants.ROLE_ADMIN, userPrincipal)); + principals.add(new DataAdminPrincipal()); } + } - // Add roles provided by authorization - for (String role : authorization.getRoles()) { - LdapName roleName = new LdapName(role); - if (roleName.equals(name)) { - // skip - } else { - NodeSecurityUtils.checkImpliedPrincipalName(roleName); - principals.add(new ImpliedByPrincipal(roleName.toString(), userPrincipal)); - if (roleName.equals(NodeSecurityUtils.ROLE_ADMIN_NAME)) - principals.add(new DataAdminPrincipal()); - } + // Add roles provided by authorization + for (String role : authorization.getRoles()) { +// LdapName roleName = new LdapName(role); + if (role.equals(authName)) { + // skip + } else if (role.equals(CmsConstants.ROLE_ANONYMOUS)) { + // skip + } else { +// NodeSecurityUtils.checkImpliedPrincipalName(role); + principals.add(new ImpliedByPrincipal(role, userPrincipal)); + if (role.equals(CmsConstants.ROLE_ADMIN)) + principals.add(new DataAdminPrincipal()); } - - } catch (InvalidNameException e) { - throw new CmsException("Cannot commit", e); } + +// } catch (InvalidNameException e) { +// throw new IllegalArgumentException("Cannot commit", e); +// } } private static void checkSubjectEmpty(Subject subject) { @@ -107,95 +120,127 @@ 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"; - - static void registerSessionAuthorization(BundleContext bc, HttpServletRequest request, Subject subject, - Authorization authorization) { - String httpSessId = request.getSession().getId(); - if (authorization.getName() != null) { - request.setAttribute(HttpContext.REMOTE_USER, authorization.getName()); - request.setAttribute(HttpContext.AUTHORIZATION, authorization); - - HttpSession httpSession = request.getSession(); - if (httpSession.getAttribute(HttpContext.AUTHORIZATION) == null) { - - Collection> sr; - try { - sr = bc.getServiceReferences(WebCmsSession.class, - "(" + WebCmsSession.CMS_SESSION_ID + "=" + httpSessId + ")"); - } catch (InvalidSyntaxException e) { - throw new CmsException("Cannot get CMS session for id " + httpSessId, e); + @SuppressWarnings("unused") + synchronized static void registerSessionAuthorization(RemoteAuthRequest 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) { + RemoteAuthSession httpSession = request.getSession(); + String httpSessId = httpSession != null ? httpSession.getId() : null; + boolean anonymous = authorization.getName() == null; + String remoteUser = !anonymous ? authorization.getName() : CmsConstants.ROLE_ANONYMOUS; + request.setAttribute(RemoteAuthRequest.REMOTE_USER, remoteUser); + request.setAttribute(RemoteAuthRequest.AUTHORIZATION, authorization); + + CmsSessionImpl cmsSession; + CmsSessionImpl currentLocalSession = CmsContextImpl.getCmsContext().getCmsSessionByLocalId(httpSessId); + if (currentLocalSession != null) { + boolean currentLocalSessionAnonymous = currentLocalSession.isAnonymous(); + if (!anonymous) { + if (currentLocalSessionAnonymous) { + currentLocalSession.close(); + // new CMS session + UUID cmsSessionUuid = CmsContextImpl.getCmsContext().getUuidFactory().timeUUID(); + cmsSession = new RemoteCmsSessionImpl(cmsSessionUuid, subject, authorization, locale, request); + CmsContextImpl.getCmsContext().registerCmsSession(cmsSession); + } else if (!authorization.getName().equals(currentLocalSession.getAuthorization().getName())) { + throw new IllegalStateException("Inconsistent user " + authorization.getName() + + " for existing CMS session " + currentLocalSession); + } else { + // keep current session + cmsSession = currentLocalSession; + // credentials + // TODO control it more?? + subject.getPrivateCredentials().addAll(cmsSession.getSubject().getPrivateCredentials()); + subject.getPublicCredentials().addAll(cmsSession.getSubject().getPublicCredentials()); + } + } else {// anonymous + if (!currentLocalSessionAnonymous) { + currentLocalSession.close(); + throw new IllegalStateException( + "Existing CMS session " + currentLocalSession + " was not logged out properly."); + } + // keep current session + cmsSession = currentLocalSession; } - ServiceReference cmsSessionRef; - if (sr.size() == 1) { - cmsSessionRef = sr.iterator().next(); - } else if (sr.size() == 0) { - WebCmsSessionImpl cmsSessionImpl = new WebCmsSessionImpl(httpSessId, authorization); - 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); - - WebCmsSessionImpl cmsSession = (WebCmsSessionImpl) 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); + } else { + // new CMS session + UUID cmsSessionUuid = CmsContextImpl.getCmsContext().getUuidFactory().timeUUID(); + cmsSession = new RemoteCmsSessionImpl(cmsSessionUuid, subject, authorization, locale, request); + CmsContextImpl.getCmsContext().registerCmsSession(cmsSession); } - } - HttpSessionId httpSessionId = new HttpSessionId(httpSessId); - if (subject.getPrivateCredentials(HttpSessionId.class).size() == 0) - subject.getPrivateCredentials().add(httpSessionId); - else { - String storedSessionId = subject.getPrivateCredentials(HttpSessionId.class).iterator().next().getValue(); - // if (storedSessionId.equals(httpSessionId.getValue())) - throw new CmsException( - "Subject already logged with session " + storedSessionId + " (not " + httpSessionId + ")"); + + if (cmsSession == null)// should be dead code (cf. SuppressWarning of the method) + throw new IllegalStateException("CMS session cannot be null"); + + 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(nodeSessionId.getUuid())) + throw new IllegalStateException( + "Subject already logged with session " + storedSessionId + " (not " + nodeSessionId + ")"); + } + request.setAttribute(CmsSession.class.getName(), cmsSession); + } else { + CmsSessionImpl cmsSession = CmsContextImpl.getCmsContext().getCmsSessionByLocalId(SINGLE_USER_LOCAL_ID); + if (cmsSession == null) { + UUID cmsSessionUuid = CmsContextImpl.getCmsContext().getUuidFactory().timeUUID(); + cmsSession = new CmsSessionImpl(cmsSessionUuid, subject, authorization, locale, SINGLE_USER_LOCAL_ID); + CmsContextImpl.getCmsContext().registerCmsSession(cmsSession); + } + CmsSessionId nodeSessionId = new CmsSessionId(cmsSession.getUuid()); + subject.getPrivateCredentials().add(nodeSessionId); } } - static boolean logoutSession(BundleContext bc, Subject subject) { - String httpSessionId; - if (subject.getPrivateCredentials(HttpSessionId.class).size() == 1) - httpSessionId = subject.getPrivateCredentials(HttpSessionId.class).iterator().next().getValue(); - else - return false; - Collection> srs; - try { - srs = bc.getServiceReferences(WebCmsSession.class, - "(" + WebCmsSession.CMS_SESSION_ID + "=" + httpSessionId + ")"); - } catch (InvalidSyntaxException e) { - throw new CmsException("Cannot retrieve CMS session #" + httpSessionId, e); - } +// public static CmsSessionImpl cmsSessionFromHttpSession(BundleContext bc, String httpSessionId) { +// Authorization authorization = null; +// Collection> sr; +// try { +// sr = bc.getServiceReferences(CmsSession.class, +// "(" + CmsSession.SESSION_LOCAL_ID + "=" + httpSessionId + ")"); +// } catch (InvalidSyntaxException e) { +// throw new IllegalArgumentException("Cannot get CMS session for id " + httpSessionId, e); +// } +// CmsSessionImpl cmsSession; +// if (sr.size() == 1) { +// cmsSession = (CmsSessionImpl) bc.getService(sr.iterator().next()); +//// locale = cmsSession.getLocale(); +// authorization = cmsSession.getAuthorization(); +// if (authorization.getName() == null) +// return null;// anonymous is not sufficient +// } else if (sr.size() == 0) +// return null; +// else +// throw new IllegalStateException(sr.size() + ">1 web sessions detected for http session " + httpSessionId); +// return cmsSession; +// } + + 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(); + } - if (srs.size() == 0) { - if (log.isTraceEnabled()) - log.warn("No CMS web session found for http session " + httpSessionId); - return false; - } else if (srs.size() > 1) - throw new CmsException(srs.size() + " CMS web sessions found for http session " + httpSessionId); - - WebCmsSessionImpl cmsSession = (WebCmsSessionImpl) bc.getService(srs.iterator().next()); - cmsSession.cleanUp(); - subject.getPrivateCredentials().removeAll(subject.getPrivateCredentials(HttpSessionId.class)); - if (log.isDebugEnabled()) - log.debug("Cleaned up " + cmsSession); - return true; + private static void checkUserName(String name) throws IllegalArgumentException { + if (RESERVED_ROLES.contains(name)) + throw new IllegalArgumentException(name + " is a reserved name"); } private CmsAuthUtils() {