Improve user directory

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 1d91a21ca4802e861671bc9ec0afd3c75ee89b36..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
@@ -117,8 +117,10 @@ public class UserAdminLoginModule implements LoginModule {
                        AuthenticatingUser authenticatingUser = new AuthenticatingUser(user.getName(), password);
                        bindAuthorization = userAdmin.getAuthorization(authenticatingUser);
                        // TODO check tokens as well
-                       if (bindAuthorization != null)
+                       if (bindAuthorization != null) {
+                               authenticatedUser = user;
                                return true;
+                       }
                } catch (Exception e) {
                        // silent
                        if(log.isTraceEnabled())

diff --git a/org.argeo.enterprise/src/org/argeo/osgi/useradmin/AbstractUserDirectory.java b/org.argeo.enterprise/src/org/argeo/osgi/useradmin/AbstractUserDirectory.java
index d6135f8e8f4360572beee6530d8ef34acb1bc2e4..d3c7d6246af6ef509a24c2ecc1d82940947d52d7 100644 (file)
--- a/org.argeo.enterprise/src/org/argeo/osgi/useradmin/AbstractUserDirectory.java
+++ b/org.argeo.enterprise/src/org/argeo/osgi/useradmin/AbstractUserDirectory.java
@@ -414,15 +414,6 @@ public abstract class AbstractUserDirectory implements UserAdmin, UserDirectory
                return uri;
        }
 
-       // protected List<String> getIndexedUserProperties() {
-       // return indexedUserProperties;
-       // }
-       //
-       // protected void setIndexedUserProperties(List<String>
-       // indexedUserProperties) {
-       // this.indexedUserProperties = indexedUserProperties;
-       // }
-
        private static boolean readOnlyDefault(URI uri) {
                if (uri == null)
                        return true;
@@ -434,8 +425,11 @@ public abstract class AbstractUserDirectory implements UserAdmin, UserDirectory
                                return !file.canWrite();
                        else
                                return !file.getParentFile().canWrite();
+               } else if (uri.getScheme().equals("ldap")) {
+                       if (uri.getAuthority() != null)// assume writable if authenticated
+                               return false;
                }
-               return true;
+               return true;// read only by default
        }
 
        public boolean isReadOnly() {