X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=org.argeo.cms%2Fsrc%2Forg%2Fargeo%2Fcms%2Fauth%2FCmsAuthUtils.java;h=33a8dc62eb4a4979299bbadf501ac7cc0002f4d8;hb=b45e59192a4bb34a6b38a9bfa416b3dc3f6b7892;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..33a8dc62e 100644 --- a/org.argeo.cms/src/org/argeo/cms/auth/CmsAuthUtils.java +++ b/org.argeo.cms/src/org/argeo/cms/auth/CmsAuthUtils.java @@ -1,8 +1,8 @@ package org.argeo.cms.auth; import java.security.Principal; -import java.util.Collection; import java.util.Set; +import java.util.UUID; import javax.naming.InvalidNameException; import javax.naming.ldap.LdapName; @@ -11,30 +11,26 @@ 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.cms.internal.auth.CmsSessionImpl; import org.argeo.cms.internal.auth.ImpliedByPrincipal; -import org.argeo.cms.internal.kernel.WebCmsSessionImpl; +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.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 { - 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"; + // 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 */ @@ -46,7 +42,7 @@ class CmsAuthUtils { final static String HEADER_AUTHORIZATION = "Authorization"; final static String HEADER_WWW_AUTHENTICATE = "WWW-Authenticate"; - static void addAuthentication(Subject subject, Authorization authorization) { + static void addAuthorization(Subject subject, Authorization authorization, HttpServletRequest request) { assert subject != null; checkSubjectEmpty(subject); assert authorization != null; @@ -90,6 +86,8 @@ class CmsAuthUtils { } catch (InvalidNameException e) { throw new CmsException("Cannot commit", e); } + + registerSessionAuthorization(request, subject, authorization); } private static void checkSubjectEmpty(Subject subject) { @@ -107,95 +105,70 @@ 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, + private static void registerSessionAuthorization(HttpServletRequest request, Subject subject, Authorization authorization) { - String httpSessId = request.getSession().getId(); - if (authorization.getName() != null) { - request.setAttribute(HttpContext.REMOTE_USER, authorization.getName()); + if (request != null) { + HttpSession httpSession = request.getSession(false); + 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); - 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); + CmsSessionImpl cmsSession = (CmsSessionImpl) CmsSessionImpl.getByLocalId(httpSessId); + if (cmsSession != null) { + if (authorization.getName() != null) { + if (cmsSession.getAuthorization().getName() == null) { + // FIXME make it more generic + 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) { + // FIXME make it more generic + cmsSession.close(); + cmsSession = null; + } } - 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); } - } - 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 + ")"); - } - } - 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); + if (cmsSession == null) + cmsSession = new WebCmsSessionImpl(subject, authorization, 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 } + } - 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; + 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() {