X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=org.argeo.cms%2Fsrc%2Forg%2Fargeo%2Fcms%2Fauth%2FCmsAuthUtils.java;h=46adcf8a516db80a509476947cbcb4c9ee5cd364;hb=c2366f32052deada7d96f635e86f745f438f094e;hp=d8d7e87216cb971cbd28c968fd64de8539557e7c;hpb=a444205e81419d439635a9e0ff3382ae3f5d9947;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 d8d7e8721..46adcf8a5 100644 --- a/org.argeo.cms/src/org/argeo/cms/auth/CmsAuthUtils.java +++ b/org.argeo.cms/src/org/argeo/cms/auth/CmsAuthUtils.java @@ -1,32 +1,50 @@ 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; import javax.naming.InvalidNameException; import javax.naming.ldap.LdapName; import javax.security.auth.Subject; import javax.security.auth.x500.X500Principal; -//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.CmsSession; +import org.argeo.api.cms.CmsSessionId; +import org.argeo.api.cms.DataAdminPrincipal; +import org.argeo.api.cms.AnonymousPrincipal; +import org.argeo.api.cms.CmsConstants; +import org.argeo.cms.internal.auth.CmsSessionImpl; import org.argeo.cms.internal.auth.ImpliedByPrincipal; -import org.argeo.node.security.AnonymousPrincipal; -import org.argeo.node.security.DataAdminPrincipal; -import org.argeo.node.security.NodeSecurityUtils; +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; +/** Centralises security related registrations. */ class CmsAuthUtils { - /** From org.osgi.service.http.HttpContext */ - static final String SHARED_STATE_AUTHORIZATION = "org.osgi.service.useradmin.authorization"; - /** From com.sun.security.auth.module.*LoginModule */ - static final String SHARED_STATE_NAME = "javax.security.auth.login.name"; - /** From com.sun.security.auth.module.*LoginModule */ - static final String SHARED_STATE_PWD = "javax.security.auth.login.password"; - - static void addAuthentication(Subject subject, Authorization authorization) { + // 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"; + + // Argeo specific + final static String SHARED_STATE_HTTP_REQUEST = "org.argeo.cms.auth.http.request"; + 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"; + + static void addAuthorization(Subject subject, Authorization authorization) { assert subject != null; checkSubjectEmpty(subject); assert authorization != null; @@ -34,6 +52,8 @@ class CmsAuthUtils { // required for display name: subject.getPrivateCredentials().add(authorization); + boolean singleUser = authorization instanceof SingleUserAuthorization; + Set principals = subject.getPrincipals(); try { String authName = authorization.getName(); @@ -45,13 +65,16 @@ class CmsAuthUtils { 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)); + + if (singleUser) { + principals.add(new ImpliedByPrincipal(NodeSecurityUtils.ROLE_ADMIN_NAME, userPrincipal)); + principals.add(new DataAdminPrincipal()); + } } // Add roles provided by authorization @@ -59,17 +82,18 @@ class CmsAuthUtils { LdapName roleName = new LdapName(role); if (roleName.equals(name)) { // skip + } else if (roleName.equals(NodeSecurityUtils.ROLE_ANONYMOUS_NAME)) { + // skip } else { NodeSecurityUtils.checkImpliedPrincipalName(roleName); principals.add(new ImpliedByPrincipal(roleName.toString(), userPrincipal)); - // if (roleName.equals(ROLE_ADMIN_NAME)) - // principals.add(new - // AdminPrincipal(SecurityConstants.ADMIN_ID)); + if (roleName.equals(NodeSecurityUtils.ROLE_ADMIN_NAME)) + principals.add(new DataAdminPrincipal()); } } } catch (InvalidNameException e) { - throw new CmsException("Cannot commit", e); + throw new IllegalArgumentException("Cannot commit", e); } } @@ -88,19 +112,117 @@ 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"; + @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(); + assert httpSession != null; + String httpSessId = httpSession.getId(); + 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 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); + } 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; + // keyring + subject.getPrivateCredentials().addAll(cmsSession.getSecretKeys()); + } + } else {// anonymous + if (!currentLocalSessionAnonymous) { + currentLocalSession.close(); + throw new IllegalStateException( + "Existing CMS session " + currentLocalSession + " was not logged out properly."); + } + // keep current session + cmsSession = currentLocalSession; + } + } else { + // new CMS session + cmsSession = new WebCmsSessionImpl(subject, authorization, locale, request); + CmsContextImpl.getCmsContext().registerCmsSession(cmsSession); + } + + 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 { + CmsSessionImpl cmsSession = new CmsSessionImpl(subject, authorization, locale, "desktop"); + CmsContextImpl.getCmsContext().registerCmsSession(cmsSession); + CmsSessionId nodeSessionId = new CmsSessionId(cmsSession.getUuid()); + subject.getPrivateCredentials().add(nodeSessionId); + } + } + +// 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(); + } private CmsAuthUtils() { } + }