X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=org.argeo.enterprise%2Fsrc%2Forg%2Fargeo%2Fosgi%2Fuseradmin%2FAbstractUserDirectory.java;h=957a1c953990767effa6ee122db4a01a8fcb59e2;hb=2111a76162534100967eb0e7733632e80d9ddc5f;hp=081d9e1faa76888705c314355c6a86c4e03b0f47;hpb=d2057396fab26e7b94e9d479d8429e0ed2487067;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 081d9e1fa..957a1c953 100644
--- a/org.argeo.enterprise/src/org/argeo/osgi/useradmin/AbstractUserDirectory.java
+++ b/org.argeo.enterprise/src/org/argeo/osgi/useradmin/AbstractUserDirectory.java
@@ -1,6 +1,7 @@
 package org.argeo.osgi.useradmin;
 
 import static org.argeo.naming.LdapAttrs.objectClass;
+import static org.argeo.naming.LdapObjs.extensibleObject;
 import static org.argeo.naming.LdapObjs.inetOrgPerson;
 import static org.argeo.naming.LdapObjs.organizationalPerson;
 import static org.argeo.naming.LdapObjs.person;
@@ -18,6 +19,7 @@ import java.util.Iterator;
 import java.util.List;
 
 import javax.naming.InvalidNameException;
+import javax.naming.NameNotFoundException;
 import javax.naming.NamingEnumeration;
 import javax.naming.directory.Attribute;
 import javax.naming.directory.Attributes;
@@ -32,6 +34,7 @@ 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;
@@ -67,22 +70,27 @@ public abstract class AbstractUserDirectory implements UserAdmin, UserDirectory
 	private TransactionManager transactionManager;
 	private WcXaResource xaResource = new WcXaResource(this);
 
-	public AbstractUserDirectory(Dictionary<String, ?> props) {
+	public AbstractUserDirectory(URI uriArg, Dictionary<String, ?> props) {
 		properties = new Hashtable<String, Object>();
 		for (Enumeration<String> keys = props.keys(); keys.hasMoreElements();) {
 			String key = keys.nextElement();
 			properties.put(key, props.get(key));
 		}
 
-		String uriStr = UserAdminConf.uri.getValue(properties);
-		if (uriStr == null)
-			uri = null;
-		else
-			try {
-				uri = new URI(uriStr);
-			} catch (URISyntaxException e) {
-				throw new UserDirectoryException("Badly formatted URI " + uriStr, e);
-			}
+		if (uriArg != null) {
+			uri = uriArg;
+			// uri from properties is ignored
+		} else {
+			String uriStr = UserAdminConf.uri.getValue(properties);
+			if (uriStr == null)
+				uri = null;
+			else
+				try {
+					uri = new URI(uriStr);
+				} catch (URISyntaxException e) {
+					throw new UserDirectoryException("Badly formatted URI " + uriStr, e);
+				}
+		}
 
 		userObjectClass = UserAdminConf.userObjectClass.getValue(properties);
 		userBase = UserAdminConf.userBase.getValue(properties);
@@ -108,7 +116,7 @@ public abstract class AbstractUserDirectory implements UserAdmin, UserDirectory
 
 	protected abstract Boolean daoHasRole(LdapName dn);
 
-	protected abstract DirectoryUser daoGetRole(LdapName key);
+	protected abstract DirectoryUser daoGetRole(LdapName key) throws NameNotFoundException;
 
 	protected abstract List<DirectoryUser> doGetRoles(Filter f);
 
@@ -165,7 +173,7 @@ public abstract class AbstractUserDirectory implements UserAdmin, UserDirectory
 	private void collectRoles(DirectoryUser user, List<Role> allRoles) {
 		Attributes attrs = user.getAttributes();
 		// TODO centralize attribute name
-		Attribute memberOf = attrs.get("memberOf");
+		Attribute memberOf = attrs.get(LdapAttrs.memberOf.name());
 		if (memberOf != null) {
 			try {
 				NamingEnumeration<?> values = memberOf.getAll();
@@ -204,7 +212,12 @@ public abstract class AbstractUserDirectory implements UserAdmin, UserDirectory
 
 	protected DirectoryUser doGetRole(LdapName dn) {
 		UserDirectoryWorkingCopy wc = getWorkingCopy();
-		DirectoryUser user = daoGetRole(dn);
+		DirectoryUser user;
+		try {
+			user = daoGetRole(dn);
+		} catch (NameNotFoundException e) {
+			user = null;
+		}
 		if (wc != null) {
 			if (user == null && wc.getNewUsers().containsKey(dn))
 				user = wc.getNewUsers().get(dn);
@@ -308,12 +321,13 @@ public abstract class AbstractUserDirectory implements UserAdmin, UserDirectory
 		if (wc.getDeletedUsers().containsKey(dn)) {
 			wc.getDeletedUsers().remove(dn);
 			wc.getModifiedUsers().put(dn, attrs);
+			return getRole(name);
 		} else {
 			wc.getModifiedUsers().put(dn, attrs);
 			DirectoryUser newRole = newRole(dn, type, attrs);
 			wc.getNewUsers().put(dn, newRole);
+			return newRole;
 		}
-		return getRole(name);
 	}
 
 	protected DirectoryUser newRole(LdapName dn, int type, Attributes attrs) {
@@ -329,6 +343,7 @@ public abstract class AbstractUserDirectory implements UserAdmin, UserDirectory
 				objClass.add(person.name());
 			}
 			objClass.add(top.name());
+			objClass.add(extensibleObject.name());
 			attrs.put(objClass);
 			newRole = new LdifUser(this, dn, attrs);
 		} else if (type == Role.GROUP) {
@@ -410,6 +425,8 @@ public abstract class AbstractUserDirectory implements UserAdmin, UserDirectory
 	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")) {
 			File file = new File(uri);
 			if (file.exists())