Massive Argeo APIs refactoring

[lgpl/argeo-commons.git] / org.argeo.cms / src / org / argeo / cms / auth / IdentLoginModule.java

diff --git a/org.argeo.cms/src/org/argeo/cms/auth/IdentLoginModule.java b/org.argeo.cms/src/org/argeo/cms/auth/IdentLoginModule.java
index ff741d8a05464588a27d33782b3bab852e77d968..ccf7fc724af1e8bf322c4c4545a84348883f3f9e 100644 (file)
--- a/org.argeo.cms/src/org/argeo/cms/auth/IdentLoginModule.java
+++ b/org.argeo.cms/src/org/argeo/cms/auth/IdentLoginModule.java
@@ -9,16 +9,14 @@ import javax.security.auth.callback.CallbackHandler;
 import javax.security.auth.callback.UnsupportedCallbackException;
 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.api.cms.CmsLog;
+import org.argeo.cms.auth.ident.IdentClient;
 import org.argeo.cms.internal.kernel.Activator;
-import org.argeo.ident.IdentClient;
 
 /** Use an ident service to identify. */
 public class IdentLoginModule implements LoginModule {
-       private final static Log log = LogFactory.getLog(IdentLoginModule.class);
+       private final static CmsLog log = CmsLog.getLog(IdentLoginModule.class);
 
        private CallbackHandler callbackHandler = null;
        private Map<String, Object> sharedState = null;
@@ -35,7 +33,7 @@ public class IdentLoginModule implements LoginModule {
        public boolean login() throws LoginException {
                if (callbackHandler == null)
                        return false;
-               HttpRequestCallback httpCallback = new HttpRequestCallback();
+               RemoteAuthCallback httpCallback = new RemoteAuthCallback();
                try {
                        callbackHandler.handle(new Callback[] { httpCallback });
                } catch (IOException e) {
@@ -43,7 +41,9 @@ public class IdentLoginModule implements LoginModule {
                } catch (UnsupportedCallbackException e) {
                        return false;
                }
-               HttpServletRequest request = httpCallback.getRequest();
+               RemoteAuthRequest request = httpCallback.getRequest();
+               if (request == null)
+                       return false;
                IdentClient identClient = Activator.getIdentClient(request.getRemoteAddr());
                if (identClient == null)
                        return false;