X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=org.argeo.cms%2Fsrc%2Forg%2Fargeo%2Fcms%2Fauth%2FAnonymousLoginModule.java;h=0217eb8ef7c9fe745214443b8bc451d09de925ca;hb=4185ff8826f893a4a1f054f61a11b89333c3e85d;hp=12a0704158a22de18935fc101c966d02a47ed2a3;hpb=34ba1b915e1d406f6574c0be93e1e9da3eab1978;p=lgpl%2Fargeo-commons.git

diff --git a/org.argeo.cms/src/org/argeo/cms/auth/AnonymousLoginModule.java b/org.argeo.cms/src/org/argeo/cms/auth/AnonymousLoginModule.java
index 12a070415..0217eb8ef 100644
--- a/org.argeo.cms/src/org/argeo/cms/auth/AnonymousLoginModule.java
+++ b/org.argeo.cms/src/org/argeo/cms/auth/AnonymousLoginModule.java
@@ -1,16 +1,15 @@
 package org.argeo.cms.auth;
 
+import java.util.Locale;
 import java.util.Map;
 
 import javax.security.auth.Subject;
 import javax.security.auth.callback.CallbackHandler;
 import javax.security.auth.login.LoginException;
 import javax.security.auth.spi.LoginModule;
-import javax.servlet.http.HttpServletRequest;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.argeo.cms.CmsException;
 import org.osgi.framework.BundleContext;
 import org.osgi.framework.FrameworkUtil;
 import org.osgi.service.useradmin.Authorization;
@@ -36,7 +35,7 @@ public class AnonymousLoginModule implements LoginModule {
 			bc = FrameworkUtil.getBundle(AnonymousLoginModule.class).getBundleContext();
 			assert bc != null;
 		} catch (Exception e) {
-			throw new CmsException("Cannot initialize login module", e);
+			throw new IllegalStateException("Cannot initialize login module", e);
 		}
 	}
 
@@ -49,23 +48,26 @@ public class AnonymousLoginModule implements LoginModule {
 	public boolean commit() throws LoginException {
 		UserAdmin userAdmin = bc.getService(bc.getServiceReference(UserAdmin.class));
 		Authorization authorization = userAdmin.getAuthorization(null);
-		CmsAuthUtils.addAuthorization(subject, authorization,
-				(HttpServletRequest) sharedState.get(CmsAuthUtils.SHARED_STATE_HTTP_REQUEST));
-		if (log.isDebugEnabled())
-			log.debug("Anonymous logged in to CMS: " + subject);
+		RemoteAuthRequest request = (RemoteAuthRequest) sharedState.get(CmsAuthUtils.SHARED_STATE_HTTP_REQUEST);
+		Locale locale = Locale.getDefault();
+		if (request != null)
+			locale = request.getLocale();
+		CmsAuthUtils.addAuthorization(subject, authorization);
+		CmsAuthUtils.registerSessionAuthorization(request, subject, authorization, locale);
+		if (log.isTraceEnabled())
+			log.trace("Anonymous logged in to CMS: " + subject);
 		return true;
 	}
 
 	@Override
 	public boolean abort() throws LoginException {
-		// authorization = null;
 		return true;
 	}
 
 	@Override
 	public boolean logout() throws LoginException {
-		if (log.isDebugEnabled())
-			log.debug("Logging out anonymous from CMS... " + subject);
+		if (log.isTraceEnabled())
+			log.trace("Logging out anonymous from CMS... " + subject);
 		CmsAuthUtils.cleanUp(subject);
 		return true;
 	}