X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=org.argeo.cms%2Fsrc%2Forg%2Fargeo%2Fcms%2Fauth%2FAnonymousLoginModule.java;h=c5d067c0817bdf75a910d4a3dc92406a51923472;hb=7064547ae5d85225546f1b8f15d6b5c82f30fe22;hp=eca28e8b9bd444192f18f3bacbeb49468fdd7731;hpb=c3765dd55c290196cdc8c986d2cb897a4045d534;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 eca28e8b9..c5d067c08 100644
--- a/org.argeo.cms/src/org/argeo/cms/auth/AnonymousLoginModule.java
+++ b/org.argeo.cms/src/org/argeo/cms/auth/AnonymousLoginModule.java
@@ -7,11 +7,9 @@ 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;
@@ -37,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);
 		}
 	}
 
@@ -50,11 +48,12 @@ public class AnonymousLoginModule implements LoginModule {
 	public boolean commit() throws LoginException {
 		UserAdmin userAdmin = bc.getService(bc.getServiceReference(UserAdmin.class));
 		Authorization authorization = userAdmin.getAuthorization(null);
-		HttpServletRequest request = (HttpServletRequest) sharedState.get(CmsAuthUtils.SHARED_STATE_HTTP_REQUEST);
+		HttpRequest request = (HttpRequest) sharedState.get(CmsAuthUtils.SHARED_STATE_HTTP_REQUEST);
 		Locale locale = Locale.getDefault();
 		if (request != null)
 			locale = request.getLocale();
-		CmsAuthUtils.addAuthorization(subject, authorization, locale, request);
+		CmsAuthUtils.addAuthorization(subject, authorization);
+		CmsAuthUtils.registerSessionAuthorization(request, subject, authorization, locale);
 		if (log.isTraceEnabled())
 			log.trace("Anonymous logged in to CMS: " + subject);
 		return true;
@@ -62,7 +61,6 @@ public class AnonymousLoginModule implements LoginModule {
 
 	@Override
 	public boolean abort() throws LoginException {
-		// authorization = null;
 		return true;
 	}