X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=org.argeo.cms%2Fsrc%2Forg%2Fargeo%2Fcms%2Fauth%2FCmsAuthUtils.java;h=396af9343f48d74a3933c503b7437d6003c959ba;hb=79c14508549e1af042485b4f888a3c54f5a68833;hp=e8a0dc2b72f82d01f3b68da95ea7d3ab44c43b28;hpb=4d675e1c871cfd8e4481e03cd496ab975b8b367d;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 e8a0dc2b7..396af9343 100644
--- a/org.argeo.cms/src/org/argeo/cms/auth/CmsAuthUtils.java
+++ b/org.argeo.cms/src/org/argeo/cms/auth/CmsAuthUtils.java
@@ -24,10 +24,9 @@ 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.auth.RemoteCmsSessionImpl;
 import org.argeo.cms.internal.runtime.CmsContextImpl;
 import org.argeo.osgi.useradmin.AuthenticatingUser;
-import org.osgi.service.http.HttpContext;
 import org.osgi.service.useradmin.Authorization;
 
 /** Centralises security related registrations. */
@@ -35,8 +34,8 @@ class CmsAuthUtils {
 	// 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";
+//	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";
@@ -136,12 +135,11 @@ class CmsAuthUtils {
 		// 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();
+			String httpSessId = httpSession != null ? httpSession.getId() : null;
 			boolean anonymous = authorization.getName() == null;
 			String remoteUser = !anonymous ? authorization.getName() : CmsConstants.ROLE_ANONYMOUS;
-			request.setAttribute(HttpContext.REMOTE_USER, remoteUser);
-			request.setAttribute(HttpContext.AUTHORIZATION, authorization);
+			request.setAttribute(RemoteAuthRequest.REMOTE_USER, remoteUser);
+			request.setAttribute(RemoteAuthRequest.AUTHORIZATION, authorization);
 
 			CmsSessionImpl cmsSession;
 			CmsSessionImpl currentLocalSession = CmsContextImpl.getCmsContext().getCmsSessionByLocalId(httpSessId);
@@ -152,7 +150,7 @@ class CmsAuthUtils {
 						currentLocalSession.close();
 						// new CMS session
 						UUID cmsSessionUuid = CmsContextImpl.getCmsContext().getUuidFactory().timeUUID();
-						cmsSession = new WebCmsSessionImpl(cmsSessionUuid, subject, authorization, locale, request);
+						cmsSession = new RemoteCmsSessionImpl(cmsSessionUuid, subject, authorization, locale, request);
 						CmsContextImpl.getCmsContext().registerCmsSession(cmsSession);
 					} else if (!authorization.getName().equals(currentLocalSession.getAuthorization().getName())) {
 						throw new IllegalStateException("Inconsistent user " + authorization.getName()
@@ -177,7 +175,7 @@ class CmsAuthUtils {
 			} else {
 				// new CMS session
 				UUID cmsSessionUuid = CmsContextImpl.getCmsContext().getUuidFactory().timeUUID();
-				cmsSession = new WebCmsSessionImpl(cmsSessionUuid, subject, authorization, locale, request);
+				cmsSession = new RemoteCmsSessionImpl(cmsSessionUuid, subject, authorization, locale, request);
 				CmsContextImpl.getCmsContext().registerCmsSession(cmsSession);
 			}