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=fb7a6123acba9bc94677c8caab12f37ae78ab9a1;hpb=3714331f776988facff3632d86ad3f6d6352220c;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 fb7a6123a..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,7 +1,6 @@ package org.argeo.cms.auth; import java.security.Principal; -import java.util.Collection; import java.util.Set; import java.util.UUID; @@ -12,8 +11,6 @@ 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; @@ -21,22 +18,19 @@ 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.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 */ @@ -48,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; @@ -92,6 +86,8 @@ class CmsAuthUtils { } catch (InvalidNameException e) { throw new CmsException("Cannot commit", e); } + + registerSessionAuthorization(request, subject, authorization); } private static void checkSubjectEmpty(Subject subject) { @@ -109,70 +105,49 @@ 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) { - HttpSession httpSession = request.getSession(); - String httpSessId = httpSession.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); - CmsSession cmsSession = CmsSessionImpl.getByLocalId(httpSessId); + 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; + } + } + } + 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); + 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); @@ -182,36 +157,9 @@ class CmsAuthUtils { throw new CmsException( "Subject already logged with session " + storedSessionId + " (not " + nodeSessionId + ")"); } + } else { + // TODO desktop, CLI } - // } - } - - 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) {