X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=org.argeo.enterprise%2Fsrc%2Forg%2Fargeo%2Fosgi%2Fuseradmin%2FAggregatingUserAdmin.java;h=f3e51804a78e12760f0ee3720f5ad76aa3e2a0e3;hb=c38430e4dc4d8104162d7306675bc2f087d45a54;hp=cc1dadb9bc9e0be189673a578a060fafee37a5e1;hpb=088c1b517a543e935d8ab65c3b2fd2d0269b551d;p=lgpl%2Fargeo-commons.git

diff --git a/org.argeo.enterprise/src/org/argeo/osgi/useradmin/AggregatingUserAdmin.java b/org.argeo.enterprise/src/org/argeo/osgi/useradmin/AggregatingUserAdmin.java
index cc1dadb9b..f3e51804a 100644
--- a/org.argeo.enterprise/src/org/argeo/osgi/useradmin/AggregatingUserAdmin.java
+++ b/org.argeo.enterprise/src/org/argeo/osgi/useradmin/AggregatingUserAdmin.java
@@ -2,10 +2,8 @@ package org.argeo.osgi.useradmin;
 
 import java.util.ArrayList;
 import java.util.Arrays;
-import java.util.Dictionary;
 import java.util.HashMap;
 import java.util.HashSet;
-import java.util.Hashtable;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
@@ -13,7 +11,6 @@ import java.util.Set;
 import javax.naming.InvalidNameException;
 import javax.naming.ldap.LdapName;
 
-import org.argeo.naming.LdapAttrs;
 import org.osgi.framework.InvalidSyntaxException;
 import org.osgi.service.useradmin.Authorization;
 import org.osgi.service.useradmin.Group;
@@ -27,14 +24,20 @@ import org.osgi.service.useradmin.UserAdmin;
  */
 public class AggregatingUserAdmin implements UserAdmin {
 	private final LdapName systemRolesBaseDn;
+	private final LdapName tokensBaseDn;
 
 	// DAOs
 	private AbstractUserDirectory systemRoles = null;
+	private AbstractUserDirectory tokens = null;
 	private Map<LdapName, AbstractUserDirectory> businessRoles = new HashMap<LdapName, AbstractUserDirectory>();
 
-	public AggregatingUserAdmin(String systemRolesBaseDn) {
+	public AggregatingUserAdmin(String systemRolesBaseDn, String tokensBaseDn) {
 		try {
 			this.systemRolesBaseDn = new LdapName(systemRolesBaseDn);
+			if (tokensBaseDn != null)
+				this.tokensBaseDn = new LdapName(tokensBaseDn);
+			else
+				this.tokensBaseDn = null;
 		} catch (InvalidNameException e) {
 			throw new UserDirectoryException("Cannot initialize " + AggregatingUserAdmin.class, e);
 		}
@@ -89,7 +92,7 @@ public class AggregatingUserAdmin implements UserAdmin {
 		String usernameToUse;
 		String displayNameToUse;
 		if (user instanceof Group) {
-			String ownerDn = (String) user.getProperties().get(LdapAttrs.owner.name());
+			String ownerDn = TokenUtils.userDn((Group) user);
 			if (ownerDn != null) {// tokens
 				UserAdmin ownerUserAdmin = findUserAdmin(ownerDn);
 				User ownerUser = (User) ownerUserAdmin.getRole(ownerDn);
@@ -107,7 +110,12 @@ public class AggregatingUserAdmin implements UserAdmin {
 		Set<String> sysRoles = new HashSet<String>();
 		for (String role : rawAuthorization.getRoles()) {
 			Authorization auth = systemRoles.getAuthorization((User) userAdmin.getRole(role));
-			sysRoles.addAll(Arrays.asList(auth.getRoles()));
+			systemRoles:for(String systemRole:auth.getRoles()) {
+				if(role.equals(systemRole))
+					continue systemRoles;
+				sysRoles.add(systemRole);
+			}
+//			sysRoles.addAll(Arrays.asList(auth.getRoles()));
 		}
 		addAbstractSystemRoles(rawAuthorization, sysRoles);
 		Authorization authorization = new AggregatingAuthorization(usernameToUse, displayNameToUse, sysRoles,
@@ -131,6 +139,9 @@ public class AggregatingUserAdmin implements UserAdmin {
 		if (isSystemRolesBaseDn(baseDn)) {
 			this.systemRoles = userDirectory;
 			systemRoles.setExternalRoles(this);
+		} else if (isTokensBaseDn(baseDn)) {
+			this.tokens = userDirectory;
+			tokens.setExternalRoles(this);
 		} else {
 			if (businessRoles.containsKey(baseDn))
 				throw new UserDirectoryException("There is already a user admin for " + baseDn);
@@ -156,13 +167,25 @@ public class AggregatingUserAdmin implements UserAdmin {
 	private UserAdmin findUserAdmin(LdapName name) {
 		if (name.startsWith(systemRolesBaseDn))
 			return systemRoles;
+		if (tokensBaseDn != null && name.startsWith(tokensBaseDn))
+			return tokens;
 		List<UserAdmin> res = new ArrayList<UserAdmin>(1);
 		for (LdapName baseDn : businessRoles.keySet()) {
+			AbstractUserDirectory ud = businessRoles.get(baseDn);
 			if (name.startsWith(baseDn)) {
-				AbstractUserDirectory ud = businessRoles.get(baseDn);
 				if (!ud.isDisabled())
 					res.add(ud);
 			}
+//			Object principal = ud.getProperties().get(Context.SECURITY_PRINCIPAL);
+//			if (principal != null) {
+//				try {
+//					LdapName principalLdapName = new LdapName(principal.toString());
+//					if (principalLdapName.equals(name))
+//						res.add(ud);
+//				} catch (InvalidNameException e) {
+//					// silent
+//				}
+//			}
 		}
 		if (res.size() == 0)
 			throw new UserDirectoryException("Cannot find user admin for " + name);
@@ -175,17 +198,21 @@ public class AggregatingUserAdmin implements UserAdmin {
 		return baseDn.equals(systemRolesBaseDn);
 	}
 
-	protected Dictionary<String, Object> currentState() {
-		Dictionary<String, Object> res = new Hashtable<String, Object>();
-		// res.put(NodeConstants.CN, NodeConstants.DEFAULT);
-		for (LdapName name : businessRoles.keySet()) {
-			AbstractUserDirectory userDirectory = businessRoles.get(name);
-			String uri = UserAdminConf.propertiesAsUri(userDirectory.getProperties()).toString();
-			res.put(uri, "");
-		}
-		return res;
+	protected boolean isTokensBaseDn(LdapName baseDn) {
+		return tokensBaseDn != null && baseDn.equals(tokensBaseDn);
 	}
 
+//	protected Dictionary<String, Object> currentState() {
+//		Dictionary<String, Object> res = new Hashtable<String, Object>();
+//		// res.put(NodeConstants.CN, NodeConstants.DEFAULT);
+//		for (LdapName name : businessRoles.keySet()) {
+//			AbstractUserDirectory userDirectory = businessRoles.get(name);
+//			String uri = UserAdminConf.propertiesAsUri(userDirectory.getProperties()).toString();
+//			res.put(uri, "");
+//		}
+//		return res;
+//	}
+
 	public void destroy() {
 		for (LdapName name : businessRoles.keySet()) {
 			AbstractUserDirectory userDirectory = businessRoles.get(name);