X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=org.argeo.enterprise%2Fsrc%2Forg%2Fargeo%2Fosgi%2Fuseradmin%2FAbstractUserDirectory.java;h=6d33edb35b64db959c0ffc7ca47c47af33d12e9f;hb=5f9c452b6e14d827280eafaa9f9f9bc789b02fa1;hp=d6135f8e8f4360572beee6530d8ef34acb1bc2e4;hpb=a5459b7f0a4ce0463b950efd5c776368fe169256;p=lgpl%2Fargeo-commons.git 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 d6135f8e8..6d33edb35 100644 --- a/org.argeo.enterprise/src/org/argeo/osgi/useradmin/AbstractUserDirectory.java +++ b/org.argeo.enterprise/src/org/argeo/osgi/useradmin/AbstractUserDirectory.java @@ -181,8 +181,8 @@ public abstract class AbstractUserDirectory implements UserAdmin, UserDirectory LdapName groupDn = new LdapName(value.toString()); DirectoryUser group = doGetRole(groupDn); allRoles.add(group); - if (log.isDebugEnabled()) - log.debug("Add memberOf " + groupDn); + if (log.isTraceEnabled()) + log.trace("Add memberOf " + groupDn); } } catch (Exception e) { throw new UserDirectoryException("Cannot get memberOf groups for " + user, e); @@ -192,8 +192,8 @@ public abstract class AbstractUserDirectory implements UserAdmin, UserDirectory // TODO check for loops DirectoryUser group = doGetRole(groupDn); allRoles.add(group); - if (log.isDebugEnabled()) - log.debug("Add direct group " + groupDn); + if (log.isTraceEnabled()) + log.trace("Add direct group " + groupDn); collectRoles(group, allRoles); } } @@ -414,15 +414,6 @@ public abstract class AbstractUserDirectory implements UserAdmin, UserDirectory return uri; } - // protected List getIndexedUserProperties() { - // return indexedUserProperties; - // } - // - // protected void setIndexedUserProperties(List - // 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() {