X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=org.argeo.cms%2Fsrc%2Forg%2Fargeo%2Fcms%2Fauth%2FRemoteSessionLoginModule.java;h=8f05096906e12d613cd77343c120a0235d4765b2;hb=81d9084e2c9fd9d33ca1d864171d28f9564647d8;hp=b5734afd3221957b1fe80a7ef82ffc21f3090993;hpb=c2366f32052deada7d96f635e86f745f438f094e;p=lgpl%2Fargeo-commons.git

diff --git a/org.argeo.cms/src/org/argeo/cms/auth/RemoteSessionLoginModule.java b/org.argeo.cms/src/org/argeo/cms/auth/RemoteSessionLoginModule.java
index b5734afd3..8f0509690 100644
--- a/org.argeo.cms/src/org/argeo/cms/auth/RemoteSessionLoginModule.java
+++ b/org.argeo.cms/src/org/argeo/cms/auth/RemoteSessionLoginModule.java
@@ -14,12 +14,11 @@ import javax.security.auth.callback.UnsupportedCallbackException;
 import javax.security.auth.login.LoginException;
 import javax.security.auth.spi.LoginModule;
 
-import org.argeo.api.cms.CmsConstants;
 import org.argeo.api.cms.CmsLog;
+import org.argeo.cms.CmsDeployProperty;
 import org.argeo.cms.internal.auth.CmsSessionImpl;
 import org.argeo.cms.internal.runtime.CmsContextImpl;
-import org.argeo.cms.internal.runtime.KernelUtils;
-import org.osgi.service.http.HttpContext;
+import org.argeo.cms.internal.runtime.CmsStateImpl;
 import org.osgi.service.useradmin.Authorization;
 
 /** Use the HTTP session as the basis for authentication. */
@@ -53,17 +52,17 @@ public class RemoteSessionLoginModule implements LoginModule {
 	public boolean login() throws LoginException {
 		if (callbackHandler == null)
 			return false;
-		RemoteAuthCallback httpCallback = new RemoteAuthCallback();
+		RemoteAuthCallback remoteAuthCallback = new RemoteAuthCallback();
 		try {
-			callbackHandler.handle(new Callback[] { httpCallback });
+			callbackHandler.handle(new Callback[] { remoteAuthCallback });
 		} catch (IOException e) {
 			throw new LoginException("Cannot handle http callback: " + e.getMessage());
 		} catch (UnsupportedCallbackException e) {
 			return false;
 		}
-		request = httpCallback.getRequest();
+		request = remoteAuthCallback.getRequest();
 		if (request == null) {
-			RemoteAuthSession httpSession = httpCallback.getHttpSession();
+			RemoteAuthSession httpSession = remoteAuthCallback.getHttpSession();
 			if (httpSession == null)
 				return false;
 			// TODO factorize with below
@@ -78,7 +77,7 @@ public class RemoteSessionLoginModule implements LoginModule {
 					log.trace("Retrieved authorization from " + cmsSession);
 			}
 		} else {
-			authorization = (Authorization) request.getAttribute(HttpContext.AUTHORIZATION);
+			authorization = (Authorization) request.getAttribute(RemoteAuthRequest.AUTHORIZATION);
 			if (authorization == null) {// search by session ID
 				RemoteAuthSession httpSession = request.getSession();
 				if (httpSession == null) {
@@ -109,7 +108,7 @@ public class RemoteSessionLoginModule implements LoginModule {
 		} else {
 			if (log.isTraceEnabled())
 				log.trace("HTTP login: " + true);
-			request.setAttribute(HttpContext.AUTHORIZATION, authorization);
+			request.setAttribute(RemoteAuthRequest.AUTHORIZATION, authorization);
 			return true;
 		}
 	}
@@ -211,7 +210,8 @@ public class RemoteSessionLoginModule implements LoginModule {
 			if (log.isDebugEnabled())
 				log.debug("Client certificate " + certDn + " verified by servlet container");
 		} // Reverse proxy verified the client certificate
-		String clientDnHttpHeader = KernelUtils.getFrameworkProp(CmsConstants.HTTP_PROXY_SSL_DN);
+		String clientDnHttpHeader = CmsStateImpl.getDeployProperty(CmsContextImpl.getCmsContext().getCmsState(),
+				CmsDeployProperty.HTTP_PROXY_SSL_HEADER_DN);
 		if (clientDnHttpHeader != null) {
 			String certDn = req.getHeader(clientDnHttpHeader);
 			// TODO retrieve more cf. https://httpd.apache.org/docs/current/mod/mod_ssl.html