Improve user directory

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

diff --git a/org.argeo.cms/src/org/argeo/cms/auth/UserAdminLoginModule.java b/org.argeo.cms/src/org/argeo/cms/auth/UserAdminLoginModule.java
index 52ac0970bf7cbb28c69af37cf283cc25d2e3e26c..68a08c5d95feb953a17b34e9080d83695fb6ca5d 100644 (file)
--- a/org.argeo.cms/src/org/argeo/cms/auth/UserAdminLoginModule.java
+++ b/org.argeo.cms/src/org/argeo/cms/auth/UserAdminLoginModule.java
@@ -2,8 +2,8 @@ package org.argeo.cms.auth;
 
 import java.io.IOException;
 import java.security.PrivilegedAction;
-import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.HashSet;
 import java.util.List;
 import java.util.Locale;
 import java.util.Map;
@@ -19,7 +19,6 @@ import javax.security.auth.callback.PasswordCallback;
 import javax.security.auth.callback.UnsupportedCallbackException;
 import javax.security.auth.kerberos.KerberosPrincipal;
 import javax.security.auth.login.CredentialNotFoundException;
-import javax.security.auth.login.FailedLoginException;
 import javax.security.auth.login.LoginException;
 import javax.security.auth.spi.LoginModule;
 import javax.servlet.http.HttpServletRequest;
@@ -28,6 +27,7 @@ import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.argeo.cms.CmsException;
 import org.argeo.naming.LdapAttrs;
+import org.argeo.osgi.useradmin.AuthenticatingUser;
 import org.argeo.osgi.useradmin.IpaUtils;
 import org.osgi.framework.BundleContext;
 import org.osgi.framework.FrameworkUtil;
@@ -43,13 +43,15 @@ public class UserAdminLoginModule implements LoginModule {
        private Map<String, Object> sharedState = null;
 
        private List<String> indexedUserProperties = Arrays
-                       .asList(new String[] { LdapAttrs.uid.name(), LdapAttrs.mail.name(), LdapAttrs.cn.name() });
+                       .asList(new String[] { LdapAttrs.mail.name(), LdapAttrs.uid.name(), LdapAttrs.authPassword.name() });
 
        // private state
        private BundleContext bc;
        private User authenticatedUser = null;
        private Locale locale;
 
+       private Authorization bindAuthorization = null;
+
        @SuppressWarnings("unchecked")
        @Override
        public void initialize(Subject subject, CallbackHandler callbackHandler, Map<String, ?> sharedState,
@@ -66,21 +68,7 @@ public class UserAdminLoginModule implements LoginModule {
 
        @Override
        public boolean login() throws LoginException {
-               // Authorization sharedAuth = (Authorization)
-               // sharedState.get(CmsAuthUtils.SHARED_STATE_AUTHORIZATION);
-               // if (sharedAuth != null) {
-               // if (callbackHandler == null && sharedAuth.getName() != null)
-               // throw new LoginException("Shared authorization should be anonymous");
-               // return false;
-               // }
                UserAdmin userAdmin = bc.getService(bc.getServiceReference(UserAdmin.class));
-               if (callbackHandler == null) {// anonymous
-                       // authorization = userAdmin.getAuthorization(null);
-                       // sharedState.put(CmsAuthUtils.SHARED_STATE_AUTHORIZATION,
-                       // authorization);
-                       return true;
-               }
-
                final String username;
                final char[] password;
                if (sharedState.containsKey(CmsAuthUtils.SHARED_STATE_NAME)
@@ -89,10 +77,6 @@ public class UserAdminLoginModule implements LoginModule {
                        username = (String) sharedState.get(CmsAuthUtils.SHARED_STATE_NAME);
                        password = (char[]) sharedState.get(CmsAuthUtils.SHARED_STATE_PWD);
                        // // TODO locale?
-                       // // NB: raw user name is used
-                       // AuthenticatingUser authenticatingUser = new
-                       // AuthenticatingUser(username, password);
-                       // authorization = userAdmin.getAuthorization(authenticatingUser);
                } else {
                        // ask for username and password
                        NameCallback nameCallback = new NameCallback("User");
@@ -124,13 +108,29 @@ public class UserAdminLoginModule implements LoginModule {
                                throw new CredentialNotFoundException("No credentials provided");
                }
 
-               // User user = userAdmin.getUser(null, username);
                User user = searchForUser(userAdmin, username);
                if (user == null)
                        return true;// expect Kerberos
-               // throw new FailedLoginException("Invalid credentials");
-               if (!user.hasCredential(null, password))
-                       throw new FailedLoginException("Invalid credentials");
+               
+               // try bind first
+               try {
+                       AuthenticatingUser authenticatingUser = new AuthenticatingUser(user.getName(), password);
+                       bindAuthorization = userAdmin.getAuthorization(authenticatingUser);
+                       // TODO check tokens as well
+                       if (bindAuthorization != null) {
+                               authenticatedUser = user;
+                               return true;
+                       }
+               } catch (Exception e) {
+                       // silent
+                       if(log.isTraceEnabled())
+                               log.trace("Bind failed", e);
+               }
+               
+               // works only if a connection password is provided
+               if (!user.hasCredential(null, password)) {
+                       return false;
+               }
                authenticatedUser = user;
                return true;
        }
@@ -141,7 +141,9 @@ public class UserAdminLoginModule implements LoginModule {
                Authorization authorization;
                if (callbackHandler == null) {// anonymous
                        authorization = userAdmin.getAuthorization(null);
-               } else {
+               } else if (bindAuthorization != null) {// bind
+                       authorization = bindAuthorization;
+               } else {// Kerberos
                        User authenticatingUser;
                        Set<KerberosPrincipal> kerberosPrincipals = subject.getPrincipals(KerberosPrincipal.class);
                        if (kerberosPrincipals.isEmpty()) {
@@ -199,26 +201,29 @@ public class UserAdminLoginModule implements LoginModule {
        protected User searchForUser(UserAdmin userAdmin, String providedUsername) {
                try {
                        // TODO check value null or empty
-                       List<User> collectedUsers = new ArrayList<User>();
+                       Set<User> collectedUsers = new HashSet<>();
                        // try dn
                        User user = null;
-                       try {
-                               user = (User) userAdmin.getRole(providedUsername);
-                               if (user != null)
-                                       collectedUsers.add(user);
-                       } catch (Exception e) {
-                               // silent
-                       }
                        // try all indexes
                        for (String attr : indexedUserProperties) {
                                user = userAdmin.getUser(attr, providedUsername);
                                if (user != null)
                                        collectedUsers.add(user);
                        }
-                       if (collectedUsers.size() == 1)
-                               return collectedUsers.get(0);
-                       else if (collectedUsers.size() > 1)
+                       if (collectedUsers.size() == 1) {
+                               user = collectedUsers.iterator().next();
+                               return user;
+                       } else if (collectedUsers.size() > 1) {
                                log.warn(collectedUsers.size() + " users for provided username" + providedUsername);
+                       }
+                       // try DN as a last resort
+                       try {
+                               user = (User) userAdmin.getRole(providedUsername);
+                               if (user != null)
+                                       return user;
+                       } catch (Exception e) {
+                               // silent
+                       }
                        return null;
                } catch (Exception e) {
                        if (log.isTraceEnabled())