X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=org.argeo.cms%2Fsrc%2Forg%2Fargeo%2Fcms%2Finternal%2Fauth%2FCmsUserManagerImpl.java;h=b7445633b4bc8511ce469571293e4b7e3676b53d;hb=138e686fbf65683c3c94a52f1cfbaf8e02362e19;hp=0bf9a211bd35ff5bc31de09f7e165cd0d34ed9e5;hpb=285c23f26c4d634cd139d393ebcb708187d5e960;p=lgpl%2Fargeo-commons.git

diff --git a/org.argeo.cms/src/org/argeo/cms/internal/auth/CmsUserManagerImpl.java b/org.argeo.cms/src/org/argeo/cms/internal/auth/CmsUserManagerImpl.java
index 0bf9a211b..b7445633b 100644
--- a/org.argeo.cms/src/org/argeo/cms/internal/auth/CmsUserManagerImpl.java
+++ b/org.argeo.cms/src/org/argeo/cms/internal/auth/CmsUserManagerImpl.java
@@ -14,6 +14,7 @@ import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.NavigableMap;
+import java.util.Objects;
 import java.util.Set;
 import java.util.TreeMap;
 import java.util.TreeSet;
@@ -94,7 +95,7 @@ public class CmsUserManagerImpl implements CmsUserManager {
 
 	// ALL USER: WARNING access to this will be later reduced
 
-	/** Retrieve a user given his dn */
+	/** Retrieve a user given his dn, or <code>null</code> if it doesn't exist. */
 	public User getUser(String dn) {
 		return (User) getUserAdmin().getRole(dn);
 	}
@@ -140,6 +141,22 @@ public class CmsUserManagerImpl implements CmsUserManager {
 		return users;
 	}
 
+//	@Override
+//	public Set<User> listAccounts(HierarchyUnit hierarchyUnit, boolean deep) {
+//		if(!hierarchyUnit.isFunctional())
+//			throw new IllegalArgumentException("Hierarchy unit "+hierarchyUnit.getBase()+" is not functional");
+//		UserDirectory directory = (UserDirectory)hierarchyUnit.getDirectory();
+//		Set<User> res = new HashSet<>();
+//		for(HierarchyUnit technicalHu:hierarchyUnit.getDirectHierarchyUnits(false)) {
+//			if(technicalHu.isFunctional())
+//				continue;
+//			for(Role role:directory.getHierarchyUnitRoles(technicalHu, null, false)) {
+//				if(role)
+//			}
+//		}
+//		return res;
+//	}
+
 	/** Recursively add users to list */
 	private void addUsers(Set<User> users, Group group, String filter) {
 		Role[] roles = group.getMembers();
@@ -166,7 +183,8 @@ public class CmsUserManagerImpl implements CmsUserManager {
 		List<User> users = new ArrayList<User>();
 		for (Role role : roles) {
 			if ((includeUsers && role.getType() == Role.USER || role.getType() == Role.GROUP) && !users.contains(role)
-					&& (includeSystemRoles || !role.getName().toLowerCase().endsWith(CmsConstants.ROLES_BASEDN))) {
+					&& (includeSystemRoles
+							|| !role.getName().toLowerCase().endsWith(CmsConstants.SYSTEM_ROLES_BASEDN))) {
 				if (match(role, filter))
 					users.add((User) role);
 			}
@@ -332,6 +350,47 @@ public class CmsUserManagerImpl implements CmsUserManager {
 		}
 	}
 
+	@Override
+	public void addObjectClasses(HierarchyUnit hierarchyUnit, Set<String> objectClasses,
+			Map<String, Object> additionalProperties) {
+		try {
+			userTransaction.begin();
+			LdapEntry.addObjectClasses(hierarchyUnit.getProperties(), objectClasses);
+			for (String key : additionalProperties.keySet()) {
+				hierarchyUnit.getProperties().put(key, additionalProperties.get(key));
+			}
+			userTransaction.commit();
+		} catch (Exception e1) {
+			try {
+				if (!userTransaction.isNoTransactionStatus())
+					userTransaction.rollback();
+			} catch (Exception e2) {
+				if (log.isTraceEnabled())
+					log.trace("Cannot rollback transaction", e2);
+			}
+			throw new RuntimeException("Cannot add object classes " + objectClasses + " to " + hierarchyUnit, e1);
+		}
+	}
+
+	@Override
+	public void edit(Runnable action) {
+		Objects.requireNonNull(action);
+		try {
+			userTransaction.begin();
+			action.run();
+			userTransaction.commit();
+		} catch (Exception e1) {
+			try {
+				if (!userTransaction.isNoTransactionStatus())
+					userTransaction.rollback();
+			} catch (Exception e2) {
+				if (log.isTraceEnabled())
+					log.trace("Cannot rollback transaction", e2);
+			}
+			throw new RuntimeException("Cannot edit", e1);
+		}
+	}
+
 	@Override
 	public void addMember(Group group, Role role) {
 		try {
@@ -368,7 +427,7 @@ public class CmsUserManagerImpl implements CmsUserManager {
 
 			if (onlyWritable && readOnly)
 				continue;
-			if (baseDn.equalsIgnoreCase(CmsConstants.ROLES_BASEDN))
+			if (baseDn.equalsIgnoreCase(CmsConstants.SYSTEM_ROLES_BASEDN))
 				continue;
 			if (baseDn.equalsIgnoreCase(CmsConstants.TOKENS_BASEDN))
 				continue;