X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=org.argeo.cms%2Fsrc%2Forg%2Fargeo%2Fcms%2Fauth%2FCmsAuthUtils.java;h=33a9d7ae429bb365c9cd316493783aed3f9ca196;hb=4185ff8826f893a4a1f054f61a11b89333c3e85d;hp=f5503d5c5d74185b4dfbb18b2c2c102efdd8a08e;hpb=a4dac2851e23533c64a23a056da0d82574d8e300;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 f5503d5c5..33a9d7ae4 100644
--- a/org.argeo.cms/src/org/argeo/cms/auth/CmsAuthUtils.java
+++ b/org.argeo.cms/src/org/argeo/cms/auth/CmsAuthUtils.java
@@ -10,17 +10,16 @@ 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.cms.CmsSession;
+import org.argeo.api.cms.CmsSessionId;
 import org.argeo.api.security.AnonymousPrincipal;
 import org.argeo.api.security.DataAdminPrincipal;
 import org.argeo.api.security.NodeSecurityUtils;
 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.osgi.useradmin.AuthenticatingUser;
 import org.osgi.framework.BundleContext;
 import org.osgi.framework.InvalidSyntaxException;
@@ -28,7 +27,7 @@ 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;
@@ -52,9 +51,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<Principal> principals = subject.getPrincipals();
 		try {
@@ -73,8 +70,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());
 				}
 			}
 
@@ -124,12 +122,12 @@ 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;
@@ -182,11 +180,13 @@ class CmsAuthUtils {
 						"Subject already logged with session " + storedSessionId + " (not " + nodeSessionId + ")");
 			}
 		} else {
-			// TODO desktop, CLI
+			CmsSessionImpl cmsSession = new CmsSessionImpl(subject, authorization, locale, "desktop");
+			CmsSessionId nodeSessionId = new CmsSessionId(cmsSession.getUuid());
+			subject.getPrivateCredentials().add(nodeSessionId);
 		}
 	}
 
-	public static CmsSession cmsSessionFromHttpSession(BundleContext bc, String httpSessionId) {
+	public static CmsSessionImpl cmsSessionFromHttpSession(BundleContext bc, String httpSessionId) {
 		Authorization authorization = null;
 		Collection<ServiceReference<CmsSession>> sr;
 		try {
@@ -195,9 +195,9 @@ class CmsAuthUtils {
 		} catch (InvalidSyntaxException e) {
 			throw new IllegalArgumentException("Cannot get CMS session for id " + httpSessionId, e);
 		}
-		CmsSession cmsSession;
+		CmsSessionImpl cmsSession;
 		if (sr.size() == 1) {
-			cmsSession = bc.getService(sr.iterator().next());
+			cmsSession = (CmsSessionImpl) bc.getService(sr.iterator().next());
 //			locale = cmsSession.getLocale();
 			authorization = cmsSession.getAuthorization();
 			if (authorization.getName() == null)