X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=org.argeo.cms%2Fsrc%2Forg%2Fargeo%2Fcms%2Fauth%2FCurrentUser.java;h=a23822b21fe48c7db3f43a090c059fdccfb4400a;hb=e57324e3c9fb9b9a05e7bea6574b54e789c65c4e;hp=68848f7df7bc7b658efbd1b14fcb17f215f5a4ba;hpb=7e333073d07b780efe681306a1842a750cbea83c;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 68848f7df..a23822b21 100644
--- a/org.argeo.cms/src/org/argeo/cms/auth/CurrentUser.java
+++ b/org.argeo.cms/src/org/argeo/cms/auth/CurrentUser.java
@@ -32,6 +32,7 @@ import org.osgi.service.useradmin.Authorization;
 
 /** Static utilities */
 public final class CurrentUser {
+
 	/**
 	 * @return the authenticated username or null if not authenticated /
 	 *         anonymous
@@ -48,21 +49,16 @@ public final class CurrentUser {
 		return isAnonymous(currentSubject());
 	}
 
+	public static boolean isRegistered() {
+		return !isAnonymous();
+	}
+
 	public static boolean isAnonymous(Subject subject) {
 		if (subject == null)
 			return true;
 		String username = getUsername(subject);
-		return username == null || username.equalsIgnoreCase(NodeConstants.ROLE_ANONYMOUS);
-	}
-
-	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");
+		return username == null
+				|| username.equalsIgnoreCase(NodeConstants.ROLE_ANONYMOUS);
 	}
 
 	/**
@@ -78,7 +74,8 @@ public final class CurrentUser {
 			throw new CmsException("Subject cannot be null");
 		if (subject.getPrincipals(X500Principal.class).size() != 1)
 			return NodeConstants.ROLE_ANONYMOUS;
-		Principal principal = subject.getPrincipals(X500Principal.class).iterator().next();
+		Principal principal = subject.getPrincipals(X500Principal.class)
+				.iterator().next();
 		return principal.getName();
 	}
 
@@ -87,13 +84,30 @@ public final class CurrentUser {
 	}
 
 	private static Authorization getAuthorization(Subject subject) {
-		return subject.getPrivateCredentials(Authorization.class).iterator().next();
+		return subject.getPrivateCredentials(Authorization.class).iterator()
+				.next();
 	}
 
 	public final static Set<String> roles() {
 		return roles(currentSubject());
 	}
 
+	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");
+	}
+
+	/** 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);
+	}
+
 	public final static Set<String> roles(Subject subject) {
 		Set<String> roles = new HashSet<String>();
 		roles.add(getUsername(subject));