X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=org.argeo.security.ui.admin%2Fsrc%2Forg%2Fargeo%2Fsecurity%2Fui%2Fadmin%2Finternal%2FUiAdminUtils.java;h=cb1396c957537527c40d7b5db4f4f29082b6270e;hb=25e98954db6faeec4ba9950f651e81fbea595b0c;hp=062be2dfcc0fda08d2165f7ee712839bcc5fdc59;hpb=732542c8de267ed7d6cbb8c66b84cc90c8ad22d7;p=lgpl%2Fargeo-commons.git

diff --git a/org.argeo.security.ui.admin/src/org/argeo/security/ui/admin/internal/UiAdminUtils.java b/org.argeo.security.ui.admin/src/org/argeo/security/ui/admin/internal/UiAdminUtils.java
index 062be2dfc..cb1396c95 100644
--- a/org.argeo.security.ui.admin/src/org/argeo/security/ui/admin/internal/UiAdminUtils.java
+++ b/org.argeo.security.ui.admin/src/org/argeo/security/ui/admin/internal/UiAdminUtils.java
@@ -1,15 +1,21 @@
 package org.argeo.security.ui.admin.internal;
 
 import java.security.AccessController;
+import java.util.List;
+import java.util.Set;
 
 import javax.naming.InvalidNameException;
 import javax.naming.ldap.LdapName;
+import javax.naming.ldap.Rdn;
 import javax.security.auth.Subject;
 import javax.security.auth.x500.X500Principal;
 import javax.transaction.Status;
 import javax.transaction.UserTransaction;
 
 import org.argeo.ArgeoException;
+import org.argeo.cms.auth.AuthConstants;
+import org.argeo.cms.auth.CurrentUser;
+import org.argeo.osgi.useradmin.LdifName;
 import org.argeo.security.ui.admin.internal.providers.UserTransactionProvider;
 import org.eclipse.ui.IWorkbenchWindow;
 import org.eclipse.ui.PlatformUI;
@@ -27,9 +33,14 @@ public class UiAdminUtils {
 		return getUsername(getUser(userAdmin, dn));
 	}
 
+	/** Returns true if the current user is in the specified role */
+	public static boolean isUserInRole(String role) {
+		Set<String> roles = CurrentUser.roles();
+		return roles.contains(role);
+	}
+
 	public final static boolean isCurrentUser(User user) {
-		String userName = UiAdminUtils.getProperty(user,
-				UserAdminConstants.KEY_DN);
+		String userName = getProperty(user, LdifName.dn.name());
 		try {
 			LdapName selfUserName = UiAdminUtils.getLdapName();
 			LdapName userLdapName = new LdapName(userName);
@@ -57,17 +68,44 @@ public class UiAdminUtils {
 	}
 
 	public final static User getUser(UserAdmin userAdmin, LdapName dn) {
-		User user = userAdmin.getUser(UserAdminConstants.KEY_DN, dn.toString());
+		User user = userAdmin.getUser(LdifName.dn.name(), dn.toString());
 		return user;
 	}
 
 	public final static String getUsername(User user) {
-		String cn = getProperty(user, UserAdminConstants.KEY_CN);
+		String cn = getProperty(user, LdifName.dn.name());
 		if (isEmpty(cn))
-			cn = getProperty(user, UserAdminConstants.KEY_UID);
+			cn = getProperty(user, LdifName.uid.name());
 		return cn;
 	}
 
+	/** Simply retrieves a display name of the relevant domain */
+	public final static String getDomainName(User user) {
+		String dn = (String) user.getProperties().get(LdifName.dn.name());
+		if (dn.endsWith(AuthConstants.ROLES_BASEDN))
+			return "System roles";
+		try {
+			LdapName name;
+			name = new LdapName(dn);
+			List<Rdn> rdns = name.getRdns();
+			String dname = null;
+			int i = 0;
+			loop: while (i < rdns.size()) {
+				Rdn currrRdn = rdns.get(i);
+				if (!"dc".equals(currrRdn.getType()))
+					break loop;
+				else {
+					String currVal = (String) currrRdn.getValue();
+					dname = dname == null ? currVal : currVal + "." + dname;
+				}
+				i++;
+			}
+			return dname;
+		} catch (InvalidNameException e) {
+			throw new ArgeoException("Unable to get domain name for " + dn, e);
+		}
+	}
+
 	public final static String getProperty(Role role, String key) {
 		Object obj = role.getProperties().get(key);
 		if (obj != null)