X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=org.argeo.cms%2Fsrc%2Forg%2Fargeo%2Fcms%2Fauth%2FCmsAuthUtils.java;h=1efb93afdd36b9ad1432f4976d4351c48dfa2277;hb=da9d144b6b241e1526a3bd255dff905a7969a5bc;hp=e9462c3add31cb7dbd0ef16f48afb00e2225a611;hpb=3df0adaee4a48c10452fb2064fb8e608b9c985d1;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 e9462c3ad..1efb93afd 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.Locale; import java.util.Set; import java.util.UUID; @@ -10,25 +9,21 @@ 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.argeo.api.NodeConstants; -import org.argeo.api.security.AnonymousPrincipal; -import org.argeo.api.security.DataAdminPrincipal; -import org.argeo.api.security.NodeSecurityUtils; +import org.argeo.api.cms.AnonymousPrincipal; +import org.argeo.api.cms.CmsConstants; +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.http.WebCmsSessionImpl; -import org.argeo.cms.internal.kernel.Activator; +import org.argeo.cms.internal.runtime.CmsContextImpl; +import org.argeo.cms.security.NodeSecurityUtils; import org.argeo.osgi.useradmin.AuthenticatingUser; -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; -/** Centrlaises security related registrations. */ +/** Centralises security related registrations. */ class CmsAuthUtils { // Standard final static String SHARED_STATE_NAME = AuthenticatingUser.SHARED_STATE_NAME; @@ -44,6 +39,8 @@ class CmsAuthUtils { 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 SINGLE_USER_LOCAL_ID = "single-user"; + static void addAuthorization(Subject subject, Authorization authorization) { assert subject != null; checkSubjectEmpty(subject); @@ -52,9 +49,7 @@ class CmsAuthUtils { // required for display name: subject.getPrivateCredentials().add(authorization); - if (Activator.isSingleUser()) { - subject.getPrincipals().add(new DataAdminPrincipal()); - } + boolean singleUser = authorization instanceof SingleUserAuthorization; Set principals = subject.getPrincipals(); try { @@ -73,8 +68,9 @@ class CmsAuthUtils { userPrincipal = new X500Principal(name.toString()); principals.add(userPrincipal); - if (Activator.isSingleUser()) { + if (singleUser) { principals.add(new ImpliedByPrincipal(NodeSecurityUtils.ROLE_ADMIN_NAME, userPrincipal)); + principals.add(new DataAdminPrincipal()); } } @@ -123,82 +119,102 @@ class CmsAuthUtils { // subject.getPrincipals().removeAll(subject.getPrincipals(AnonymousPrincipal.class)); } - synchronized static void registerSessionAuthorization(HttpServletRequest request, Subject subject, + @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) { - HttpSession httpSession = request.getSession(false); + RemoteAuthSession httpSession = request.getSession(); assert httpSession != null; String httpSessId = httpSession.getId(); - String remoteUser = authorization.getName() != null ? authorization.getName() - : NodeConstants.ROLE_ANONYMOUS; + boolean anonymous = authorization.getName() == null; + String remoteUser = !anonymous ? authorization.getName() : CmsConstants.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())) { + CmsSessionImpl cmsSession; + CmsSessionImpl currentLocalSession = CmsContextImpl.getCmsContext().getCmsSessionByLocalId(httpSessId); + if (currentLocalSession != null) { + boolean currentLocalSessionAnonymous = currentLocalSession.getAuthorization().getName() == null; + if (!anonymous) { + if (currentLocalSessionAnonymous) { + currentLocalSession.close(); + // new CMS session + UUID cmsSessionUuid = CmsContextImpl.getCmsContext().getUuidFactory().timeUUID(); + cmsSession = new WebCmsSessionImpl(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 " + cmsSession); - } - // keyring - if (cmsSession != null) + + " for existing CMS session " + currentLocalSession); + } else { + // keep current session + cmsSession = currentLocalSession; + // keyring subject.getPrivateCredentials().addAll(cmsSession.getSecretKeys()); + } } else {// anonymous - if (cmsSession.getAuthorization().getName() != null) { - cmsSession.close(); - // TODO rather throw an exception ? log a warning ? - cmsSession = null; + if (!currentLocalSessionAnonymous) { + currentLocalSession.close(); + throw new IllegalStateException( + "Existing CMS session " + currentLocalSession + " was not logged out properly."); } + // keep current session + cmsSession = currentLocalSession; } - } else if (cmsSession == null) { - cmsSession = new WebCmsSessionImpl(subject, authorization, locale, request); + } else { + // new CMS session + UUID cmsSessionUuid = CmsContextImpl.getCmsContext().getUuidFactory().timeUUID(); + cmsSession = new WebCmsSessionImpl(cmsSessionUuid, subject, authorization, locale, request); + CmsContextImpl.getCmsContext().registerCmsSession(cmsSession); } - // request.setAttribute(CmsSession.class.getName(), cmsSession); - if (cmsSession != 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(httpSessionId.getValue())) - throw new IllegalStateException( - "Subject already logged with session " + storedSessionId + " (not " + nodeSessionId + ")"); - } + + 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(httpSessionId.getValue())) + throw new IllegalStateException( + "Subject already logged with session " + storedSessionId + " (not " + nodeSessionId + ")"); } } else { - // TODO desktop, CLI + 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); } } - public static CmsSession 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); - } - CmsSession cmsSession; - if (sr.size() == 1) { - cmsSession = 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 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);