X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=org.argeo.security.core%2Fsrc%2Forg%2Fargeo%2Fosgi%2Fuseradmin%2FLdifUserAdmin.java;h=a03a25f09e5ce58fc21208f9817608d75df54fdb;hb=268e023a9de5db2549431a4415e584ac68a4f98b;hp=9bf558b313b274a035d272a4db62d0f87db01381;hpb=e91af5c65a42b3ff98400caa552965cdb3f730e6;p=lgpl%2Fargeo-commons.git

diff --git a/org.argeo.security.core/src/org/argeo/osgi/useradmin/LdifUserAdmin.java b/org.argeo.security.core/src/org/argeo/osgi/useradmin/LdifUserAdmin.java
index 9bf558b31..a03a25f09 100644
--- a/org.argeo.security.core/src/org/argeo/osgi/useradmin/LdifUserAdmin.java
+++ b/org.argeo.security.core/src/org/argeo/osgi/useradmin/LdifUserAdmin.java
@@ -8,28 +8,26 @@ import java.io.OutputStream;
 import java.util.ArrayList;
 import java.util.Dictionary;
 import java.util.Hashtable;
-import java.util.LinkedHashMap;
 import java.util.List;
-import java.util.Map;
 import java.util.SortedMap;
 import java.util.TreeMap;
 
-import javax.naming.InvalidNameException;
 import javax.naming.NamingEnumeration;
 import javax.naming.directory.Attributes;
 import javax.naming.ldap.LdapName;
+import javax.transaction.TransactionManager;
 
 import org.apache.commons.io.IOUtils;
 import org.osgi.framework.Filter;
 import org.osgi.service.useradmin.Role;
-import org.osgi.service.useradmin.User;
 
-/** User admin implementation using LDIF file(s) as backend. */
+/**
+ * A user admin based on a LDIF files. Requires a {@link TransactionManager} and
+ * an open transaction for write access.
+ */
 public class LdifUserAdmin extends AbstractUserDirectory {
-	SortedMap<LdapName, DirectoryUser> users = new TreeMap<LdapName, DirectoryUser>();
-	SortedMap<LdapName, DirectoryGroup> groups = new TreeMap<LdapName, DirectoryGroup>();
-
-	private Map<String, Map<String, DirectoryUser>> userIndexes = new LinkedHashMap<String, Map<String, DirectoryUser>>();
+	private SortedMap<LdapName, DirectoryUser> users = new TreeMap<LdapName, DirectoryUser>();
+	private SortedMap<LdapName, DirectoryGroup> groups = new TreeMap<LdapName, DirectoryGroup>();
 
 	public LdifUserAdmin(String uri, String baseDn) {
 		this(fromUri(uri, baseDn));
@@ -48,8 +46,8 @@ public class LdifUserAdmin extends AbstractUserDirectory {
 
 	private static Dictionary<String, Object> fromUri(String uri, String baseDn) {
 		Hashtable<String, Object> res = new Hashtable<String, Object>();
-		res.put(LdapProperties.uri.getFullName(), uri);
-		res.put(LdapProperties.baseDn.getFullName(), baseDn);
+		res.put(UserAdminConf.uri.property(), uri);
+		res.put(UserAdminConf.baseDn.property(), baseDn);
 		return res;
 	}
 
@@ -111,30 +109,6 @@ public class LdifUserAdmin extends AbstractUserDirectory {
 					}
 				}
 			}
-
-			// optimise
-			// for (LdifGroup group : groups.values())
-			// loadMembers(group);
-
-			// indexes
-			for (String attr : getIndexedUserProperties())
-				userIndexes.put(attr, new TreeMap<String, DirectoryUser>());
-
-			for (DirectoryUser user : users.values()) {
-				Dictionary<String, Object> properties = user.getProperties();
-				for (String attr : getIndexedUserProperties()) {
-					Object value = properties.get(attr);
-					if (value != null) {
-						DirectoryUser otherUser = userIndexes.get(attr).put(
-								value.toString(), user);
-						if (otherUser != null)
-							throw new UserDirectoryException("User " + user
-									+ " and user " + otherUser
-									+ " both have property " + attr
-									+ " set to " + value);
-					}
-				}
-			}
 		} catch (Exception e) {
 			throw new UserDirectoryException(
 					"Cannot load user admin service from LDIF", e);
@@ -160,25 +134,7 @@ public class LdifUserAdmin extends AbstractUserDirectory {
 		return users.containsKey(dn) || groups.containsKey(dn);
 	}
 
-	// @Override
-	// public boolean removeRole(String name) {
-	// LdapName dn = toDn(name);
-	// LdifUser role = null;
-	// if (users.containsKey(dn))
-	// role = users.remove(dn);
-	// else if (groups.containsKey(dn))
-	// role = groups.remove(dn);
-	// else
-	// throw new UserDirectoryException("There is no role " + name);
-	// if (role == null)
-	// return false;
-	// for (LdifGroup group : getDirectGroups(role)) {
-	// group.getAttributes().get(getMemberAttributeId())
-	// .remove(dn.toString());
-	// }
-	// return true;
-	// }
-
+	@SuppressWarnings("unchecked")
 	protected List<DirectoryUser> doGetRoles(Filter f) {
 		ArrayList<DirectoryUser> res = new ArrayList<DirectoryUser>();
 		if (f == null) {
@@ -196,32 +152,13 @@ public class LdifUserAdmin extends AbstractUserDirectory {
 		return res;
 	}
 
-	protected void doGetUser(String key, String value,
-			List<DirectoryUser> collectedUsers) {
-		assert key != null;
-		DirectoryUser user = userIndexes.get(key).get(value);
-		if (user != null)
-			collectedUsers.add(user);
-	}
-
 	@Override
-	protected List<DirectoryGroup> getDirectGroups(User user) {
-		LdapName dn;
-		if (user instanceof LdifUser)
-			dn = ((LdifUser) user).getDn();
-		else
-			try {
-				dn = new LdapName(user.getName());
-			} catch (InvalidNameException e) {
-				throw new UserDirectoryException("Badly formatted user name "
-						+ user.getName(), e);
-			}
-
-		List<DirectoryGroup> directGroups = new ArrayList<DirectoryGroup>();
+	protected List<LdapName> getDirectGroups(LdapName dn) {
+		List<LdapName> directGroups = new ArrayList<LdapName>();
 		for (LdapName name : groups.keySet()) {
 			DirectoryGroup group = groups.get(name);
 			if (group.getMemberNames().contains(dn))
-				directGroups.add(group);
+				directGroups.add(group.getDn());
 		}
 		return directGroups;
 	}