Improve tokens management

[lgpl/argeo-commons.git] / org.argeo.enterprise / src / org / argeo / osgi / useradmin / AbstractUserDirectory.java

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 6d33edb35b64db959c0ffc7ca47c47af33d12e9f..385ea740e64f6df46227630e2cd053aed50b7302 100644 (file)
--- a/org.argeo.enterprise/src/org/argeo/osgi/useradmin/AbstractUserDirectory.java
+++ b/org.argeo.enterprise/src/org/argeo/osgi/useradmin/AbstractUserDirectory.java
@@ -54,6 +54,7 @@ public abstract class AbstractUserDirectory implements UserAdmin, UserDirectory
        private final String userObjectClass, userBase, groupObjectClass, groupBase;
 
        private final boolean readOnly;
+       private final boolean disabled;
        private final URI uri;
 
        private UserAdmin externalRoles;
@@ -108,6 +109,11 @@ public abstract class AbstractUserDirectory implements UserAdmin, UserDirectory
                        properties.put(UserAdminConf.readOnly.name(), Boolean.toString(readOnly));
                } else
                        readOnly = new Boolean(readOnlyStr);
+               String disabledStr = UserAdminConf.disabled.getValue(properties);
+               if (disabledStr != null)
+                       disabled = new Boolean(disabledStr);
+               else
+                       disabled = false;
        }
 
        /** Returns the groups this user is a direct member of. */
@@ -226,7 +232,6 @@ public abstract class AbstractUserDirectory implements UserAdmin, UserDirectory
                return user;
        }
 
-       @SuppressWarnings("unchecked")
        @Override
        public Role[] getRoles(String filter) throws InvalidSyntaxException {
                UserDirectoryWorkingCopy wc = getWorkingCopy();
@@ -419,15 +424,17 @@ public abstract class AbstractUserDirectory implements UserAdmin, UserDirectory
                        return true;
                if (uri.getScheme() == null)
                        return false;// assume relative file to be writable
-               if (uri.getScheme().equals("file")) {
+               if (uri.getScheme().equals(UserAdminConf.SCHEME_FILE)) {
                        File file = new File(uri);
                        if (file.exists())
                                return !file.canWrite();
                        else
                                return !file.getParentFile().canWrite();
-               } else if (uri.getScheme().equals("ldap")) {
+               } else if (uri.getScheme().equals(UserAdminConf.SCHEME_LDAP)) {
                        if (uri.getAuthority() != null)// assume writable if authenticated
                                return false;
+               } else if (uri.getScheme().equals(UserAdminConf.SCHEME_OS)) {
+                       return true;
                }
                return true;// read only by default
        }
@@ -436,6 +443,10 @@ public abstract class AbstractUserDirectory implements UserAdmin, UserDirectory
                return readOnly;
        }
 
+       public boolean isDisabled() {
+               return disabled;
+       }
+
        protected UserAdmin getExternalRoles() {
                return externalRoles;
        }