X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=org.argeo.cms%2Fsrc%2Forg%2Fargeo%2Fcms%2Fauth%2FCmsAuthUtils.java;h=37992072482e0cf36b1a08ed899de0afcf2f8601;hb=e75cf778a87f1b2ef7cfc57339ccbf9657282e92;hp=396af9343f48d74a3933c503b7437d6003c959ba;hpb=921b6cf95420aafa6b9cebe107c927e8062ed865;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 396af9343..379920724 100644
--- a/org.argeo.cms/src/org/argeo/cms/auth/CmsAuthUtils.java
+++ b/org.argeo.cms/src/org/argeo/cms/auth/CmsAuthUtils.java
@@ -20,13 +20,14 @@ import javax.security.auth.x500.X500Principal;
 
 import org.argeo.api.cms.AnonymousPrincipal;
 import org.argeo.api.cms.CmsConstants;
+import org.argeo.api.cms.CmsSession;
 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.auth.RemoteCmsSessionImpl;
 import org.argeo.cms.internal.runtime.CmsContextImpl;
-import org.argeo.osgi.useradmin.AuthenticatingUser;
+import org.argeo.cms.osgi.useradmin.AuthenticatingUser;
 import org.osgi.service.useradmin.Authorization;
 
 /** Centralises security related registrations. */
@@ -44,6 +45,7 @@ class CmsAuthUtils {
 	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";
+	final static String SHARED_STATE_OS_USERNAME = "org.argeo.cms.os.username";
 
 	final static String SINGLE_USER_LOCAL_ID = "single-user";
 
@@ -144,7 +146,7 @@ class CmsAuthUtils {
 			CmsSessionImpl cmsSession;
 			CmsSessionImpl currentLocalSession = CmsContextImpl.getCmsContext().getCmsSessionByLocalId(httpSessId);
 			if (currentLocalSession != null) {
-				boolean currentLocalSessionAnonymous = currentLocalSession.getAuthorization().getName() == null;
+				boolean currentLocalSessionAnonymous = currentLocalSession.isAnonymous();
 				if (!anonymous) {
 					if (currentLocalSessionAnonymous) {
 						currentLocalSession.close();
@@ -191,6 +193,7 @@ class CmsAuthUtils {
 					throw new IllegalStateException(
 							"Subject already logged with session " + storedSessionId + " (not " + nodeSessionId + ")");
 			}
+			request.setAttribute(CmsSession.class.getName(), cmsSession);
 		} else {
 			CmsSessionImpl cmsSession = CmsContextImpl.getCmsContext().getCmsSessionByLocalId(SINGLE_USER_LOCAL_ID);
 			if (cmsSession == null) {