X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=org.argeo.enterprise%2Fsrc%2Forg%2Fargeo%2Fosgi%2Fuseradmin%2FAbstractUserDirectory.java;h=56f2f5c170bdc67719c2dcde9c28935065fa1a47;hb=77935b7e3c0cb16a295af7059ed48ed1b916de2d;hp=957a1c953990767effa6ee122db4a01a8fcb59e2;hpb=2111a76162534100967eb0e7733632e80d9ddc5f;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 957a1c953..56f2f5c17 100644
--- a/org.argeo.enterprise/src/org/argeo/osgi/useradmin/AbstractUserDirectory.java
+++ b/org.argeo.enterprise/src/org/argeo/osgi/useradmin/AbstractUserDirectory.java
@@ -34,7 +34,6 @@ import javax.transaction.TransactionManager;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.argeo.naming.LdapAttrs;
-import org.argeo.naming.LdapObjs;
 import org.osgi.framework.Filter;
 import org.osgi.framework.FrameworkUtil;
 import org.osgi.framework.InvalidSyntaxException;
@@ -182,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);
@@ -193,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);
 			}
 		}
@@ -297,6 +296,8 @@ public abstract class AbstractUserDirectory implements UserAdmin, UserDirectory
 			AbstractUserDirectory scopedUserAdmin = scope(user);
 			try {
 				DirectoryUser directoryUser = (DirectoryUser) scopedUserAdmin.getRole(user.getName());
+				if (directoryUser == null)
+					throw new UserDirectoryException("No scoped user found for " + user);
 				LdifAuthorization authorization = new LdifAuthorization(directoryUser,
 						scopedUserAdmin.getAllRoles(directoryUser));
 				return authorization;
@@ -413,28 +414,24 @@ 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;
 		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(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;
+		return true;// read only by default
 	}
 
 	public boolean isReadOnly() {