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=136c41540957913db11dc7666be5deea1d489163;hb=cd2948994931fcb43283ffb30c1058d5860dec68;hp=3872f8dfd86f90aa5bcaba63ed66affe40fe8d08;hpb=eec0cd2b46a2186b4df1b1a59962c81ae2a9bcb7;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 3872f8dfd..136c41540 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,8 +1,9 @@
 package org.argeo.security.ui.admin.internal;
 
 import java.security.AccessController;
-import java.security.Principal;
 
+import javax.naming.InvalidNameException;
+import javax.naming.ldap.LdapName;
 import javax.security.auth.Subject;
 import javax.security.auth.x500.X500Principal;
 import javax.transaction.Status;
@@ -14,15 +15,49 @@ import org.eclipse.ui.PlatformUI;
 import org.eclipse.ui.services.ISourceProviderService;
 import org.osgi.service.useradmin.Role;
 import org.osgi.service.useradmin.User;
+import org.osgi.service.useradmin.UserAdmin;
 
 /** First effort to centralize back end methods used by the user admin UI */
 public class UiAdminUtils {
-	public final static String getUsername() {
+
+	/** returns the local name of the current connected user */
+	public final static String getUsername(UserAdmin userAdmin) {
+		LdapName dn = getLdapName();
+		return getUsername(getUser(userAdmin, dn));
+	}
+
+	public final static boolean isCurrentUser(User user) {
+		String userName = UiAdminUtils.getProperty(user,
+				UserAdminConstants.KEY_DN);
+		try {
+			LdapName selfUserName = UiAdminUtils.getLdapName();
+			LdapName userLdapName = new LdapName(userName);
+			if (userLdapName.equals(selfUserName))
+				return true;
+			else
+				return false;
+		} catch (InvalidNameException e) {
+			throw new ArgeoException("User " + user + " has an unvalid dn: "
+					+ userName, e);
+		}
+	}
+
+	public final static LdapName getLdapName() {
 		Subject subject = Subject.getSubject(AccessController.getContext());
-		Principal principal = subject.getPrincipals(X500Principal.class)
-				.iterator().next();
-		return principal.getName();
+		String name = subject.getPrincipals(X500Principal.class).iterator()
+				.next().toString();
+		LdapName dn;
+		try {
+			dn = new LdapName(name);
+		} catch (InvalidNameException e) {
+			throw new ArgeoException("Invalid user dn " + name, e);
+		}
+		return dn;
+	}
 
+	public final static User getUser(UserAdmin userAdmin, LdapName dn) {
+		User user = userAdmin.getUser(UserAdminConstants.KEY_DN, dn.toString());
+		return user;
 	}
 
 	public final static String getUsername(User user) {
@@ -85,7 +120,6 @@ public class UiAdminUtils {
 					.getService(ISourceProviderService.class);
 			UserTransactionProvider esp = (UserTransactionProvider) sourceProviderService
 					.getSourceProvider(UserTransactionProvider.TRANSACTION_STATE);
-			esp.setUserTransaction(userTransaction);
 			esp.fireTransactionStateChange();
 		} catch (Exception e) {
 			throw new ArgeoException("Unable to begin transaction", e);