X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=org.argeo.cms%2Fsrc%2Forg%2Fargeo%2Fcms%2Fauth%2FCurrentUser.java;h=5b4ab174e59be0d57a2ce986e78d94fc643c7b7f;hb=a9731453273884138ca48036fe6fe49da729c49b;hp=11126014f2aba49e9a85a6ddf16f9242da8792a1;hpb=86db10fcb2299ebf71d5599a80dc54444b26f893;p=lgpl%2Fargeo-commons.git

diff --git a/org.argeo.cms/src/org/argeo/cms/auth/CurrentUser.java b/org.argeo.cms/src/org/argeo/cms/auth/CurrentUser.java
index 11126014f..5b4ab174e 100644
--- a/org.argeo.cms/src/org/argeo/cms/auth/CurrentUser.java
+++ b/org.argeo.cms/src/org/argeo/cms/auth/CurrentUser.java
@@ -17,6 +17,9 @@ package org.argeo.cms.auth;
 
 import java.security.AccessController;
 import java.security.Principal;
+import java.security.PrivilegedAction;
+import java.security.PrivilegedActionException;
+import java.security.PrivilegedExceptionAction;
 import java.security.acl.Group;
 import java.util.HashSet;
 import java.util.Set;
@@ -25,13 +28,23 @@ import javax.security.auth.Subject;
 import javax.security.auth.x500.X500Principal;
 
 import org.argeo.cms.CmsException;
-import org.argeo.cms.CmsView;
-import org.argeo.cms.util.CmsUtils;
+import org.argeo.eclipse.ui.specific.UiContext;
+import org.argeo.node.NodeConstants;
+import org.argeo.node.security.NodeAuthenticated;
 import org.osgi.service.useradmin.Authorization;
 
-/** Static utilities */
+/**
+ * Programmatic access to the currently authenticated user, within a CMS
+ * context.
+ */
 public final class CurrentUser {
+	/*
+	 * CURRENT USER API
+	 */
+
 	/**
+	 * Technical username of the currently authenticated user.
+	 * 
 	 * @return the authenticated username or null if not authenticated /
 	 *         anonymous
 	 */
@@ -39,67 +52,100 @@ public final class CurrentUser {
 		return getUsername(currentSubject());
 	}
 
+	/**
+	 * Human readable name of the currently authenticated user (typically first
+	 * name and last name).
+	 */
 	public static String getDisplayName() {
 		return getDisplayName(currentSubject());
 	}
 
+	/** Whether a user is currently authenticated. */
 	public static boolean isAnonymous() {
 		return isAnonymous(currentSubject());
 	}
 
-	public static boolean isAnonymous(Subject subject) {
-		return getUsername(subject).equalsIgnoreCase(
-				AuthConstants.ROLE_ANONYMOUS);
+	/** Roles of the currently logged-in user */
+	public final static Set<String> roles() {
+		return roles(currentSubject());
 	}
 
-	private static Subject currentSubject() {
-		Subject subject = Subject.getSubject(AccessController.getContext());
-		if (subject != null)
-			return subject;
-		if (subject == null) {
-			CmsView cmsView = CmsUtils.getCmsView();
-			if (cmsView != null)
-				return cmsView.getSubject();
-		}
-		throw new CmsException("Cannot find related subject");
+	/** Returns true if the current user is in the specified role */
+	public static boolean isInRole(String role) {
+		Set<String> roles = roles();
+		return roles.contains(role);
+	}
+
+	/** Executes as the current user */
+	public final static <T> T doAs(PrivilegedAction<T> action) {
+		return Subject.doAs(currentSubject(), action);
+	}
+
+	/** Executes as the current user */
+	public final static <T> T tryAs(PrivilegedExceptionAction<T> action) throws PrivilegedActionException {
+		return Subject.doAs(currentSubject(), action);
 	}
 
+	/*
+	 * WRAPPERS
+	 */
+
 	public final static String getUsername(Subject subject) {
-		// Subject subject = Subject.getSubject(AccessController.getContext());
-		// if (subject == null)
-		// return null;
+		if (subject == null)
+			throw new CmsException("Subject cannot be null");
 		if (subject.getPrincipals(X500Principal.class).size() != 1)
-			return null;
-		Principal principal = subject.getPrincipals(X500Principal.class)
-				.iterator().next();
+			return NodeConstants.ROLE_ANONYMOUS;
+		Principal principal = subject.getPrincipals(X500Principal.class).iterator().next();
 		return principal.getName();
-
 	}
 
 	public final static String getDisplayName(Subject subject) {
 		return getAuthorization(subject).toString();
 	}
 
-	private static Authorization getAuthorization(Subject subject) {
-		return subject.getPrivateCredentials(Authorization.class).iterator()
-				.next();
-	}
-
-	public final static Set<String> roles() {
-		return roles(currentSubject());
-	}
-
 	public final static Set<String> roles(Subject subject) {
 		Set<String> roles = new HashSet<String>();
-		X500Principal userPrincipal = subject
-				.getPrincipals(X500Principal.class).iterator().next();
-		roles.add(userPrincipal.getName());
+		roles.add(getUsername(subject));
 		for (Principal group : subject.getPrincipals(Group.class)) {
 			roles.add(group.getName());
 		}
 		return roles;
 	}
 
+	/** Whether this user is currently authenticated. */
+	public static boolean isAnonymous(Subject subject) {
+		if (subject == null)
+			return true;
+		String username = getUsername(subject);
+		return username == null || username.equalsIgnoreCase(NodeConstants.ROLE_ANONYMOUS);
+	}
+	/*
+	 * HELPERS
+	 */
+
+	private static Subject currentSubject() {
+		NodeAuthenticated cmsView = getNodeAuthenticated();
+		if (cmsView != null)
+			return cmsView.getLoginContext().getSubject();
+		Subject subject = Subject.getSubject(AccessController.getContext());
+		if (subject != null)
+			return subject;
+		throw new CmsException("Cannot find related subject");
+	}
+
+	/**
+	 * The node authenticated component (typically a CMS view) related to this
+	 * display, or null if none is available from this call. <b>Not API: Only
+	 * for low-level access.</b>
+	 */
+	private static NodeAuthenticated getNodeAuthenticated() {
+		return UiContext.getData(NodeAuthenticated.KEY);
+	}
+
+	private static Authorization getAuthorization(Subject subject) {
+		return subject.getPrivateCredentials(Authorization.class).iterator().next();
+	}
+
 	private CurrentUser() {
 	}
 }