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=4c09650d4b0546bdc5c6220a23f23de99903cf95;hpb=52a45835da8cd816ac2e2b22ee9b84101fe8fb06;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 4c09650d4..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,20 +9,17 @@ 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.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; @@ -43,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); @@ -122,28 +120,30 @@ class CmsAuthUtils { } @SuppressWarnings("unused") - synchronized static void registerSessionAuthorization(HttpServletRequest request, Subject subject, + 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(); boolean anonymous = authorization.getName() == null; - String remoteUser = !anonymous ? authorization.getName() : NodeConstants.ROLE_ANONYMOUS; + String remoteUser = !anonymous ? authorization.getName() : CmsConstants.ROLE_ANONYMOUS; request.setAttribute(HttpContext.REMOTE_USER, remoteUser); request.setAttribute(HttpContext.AUTHORIZATION, authorization); CmsSessionImpl cmsSession; - CmsSessionImpl currentLocalSession = CmsSessionImpl.getByLocalId(httpSessId); + CmsSessionImpl currentLocalSession = CmsContextImpl.getCmsContext().getCmsSessionByLocalId(httpSessId); if (currentLocalSession != null) { boolean currentLocalSessionAnonymous = currentLocalSession.getAuthorization().getName() == null; if (!anonymous) { if (currentLocalSessionAnonymous) { currentLocalSession.close(); // new CMS session - cmsSession = new WebCmsSessionImpl(subject, authorization, locale, request); + 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 " + currentLocalSession); @@ -164,7 +164,9 @@ class CmsAuthUtils { } } else { // new CMS session - cmsSession = new WebCmsSessionImpl(subject, authorization, locale, request); + UUID cmsSessionUuid = CmsContextImpl.getCmsContext().getUuidFactory().timeUUID(); + cmsSession = new WebCmsSessionImpl(cmsSessionUuid, subject, authorization, locale, request); + CmsContextImpl.getCmsContext().registerCmsSession(cmsSession); } if (cmsSession == null)// should be dead code (cf. SuppressWarning of the method) @@ -180,34 +182,39 @@ class CmsAuthUtils { "Subject already logged with session " + storedSessionId + " (not " + nodeSessionId + ")"); } } else { - CmsSessionImpl cmsSession = new CmsSessionImpl(subject, authorization, locale, "desktop"); + 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);