X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;ds=sidebyside;f=org.argeo.cms%2Fsrc%2Forg%2Fargeo%2Fcms%2Fauth%2FCurrentUser.java;h=13b54a549a83eac180c3116f017eb204bc0856dc;hb=4e8d82137c2dce7145175eacbd225a52227b6f73;hp=b43bf98b5f707744591b26006535ca784d8252b7;hpb=279880f110272df643cee670aa976ae5ab9ec396;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 b43bf98b5..13b54a549 100644
--- a/org.argeo.cms/src/org/argeo/cms/auth/CurrentUser.java
+++ b/org.argeo.cms/src/org/argeo/cms/auth/CurrentUser.java
@@ -1,16 +1,14 @@
 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.util.HashSet;
+import java.util.Iterator;
 import java.util.Locale;
 import java.util.Set;
 import java.util.UUID;
-import java.util.concurrent.Callable;
-import java.util.concurrent.CompletionException;
 
 import javax.security.auth.Subject;
 import javax.security.auth.x500.X500Principal;
@@ -21,6 +19,7 @@ import org.argeo.api.cms.CmsSessionId;
 import org.argeo.cms.internal.auth.CmsSessionImpl;
 import org.argeo.cms.internal.auth.ImpliedByPrincipal;
 import org.argeo.cms.internal.runtime.CmsContextImpl;
+import org.argeo.util.CurrentSubject;
 import org.osgi.service.useradmin.Authorization;
 
 /**
@@ -70,6 +69,11 @@ public final class CurrentUser {
 		return roles.contains(role);
 	}
 
+	/** Implies this {@link SystemRole} in this context. */
+	public final static boolean implies(SystemRole role, String context) {
+		return role.implied(currentSubject(), context);
+	}
+
 	/** Executes as the current user */
 	public final static <T> T doAs(PrivilegedAction<T> action) {
 		return Subject.doAs(currentSubject(), action);
@@ -125,7 +129,12 @@ public final class CurrentUser {
 
 	public static CmsSession getCmsSession() {
 		Subject subject = currentSubject();
-		CmsSessionId cmsSessionId = subject.getPrivateCredentials(CmsSessionId.class).iterator().next();
+		Iterator<CmsSessionId> it = subject.getPrivateCredentials(CmsSessionId.class).iterator();
+		if (!it.hasNext())
+			throw new IllegalStateException("No CMS session id available for " + subject);
+		CmsSessionId cmsSessionId = it.next();
+		if (it.hasNext())
+			throw new IllegalStateException("More than one CMS session id available for " + subject);
 		return CmsContextImpl.getCmsContext().getCmsSessionByUuid(cmsSessionId.getUuid());
 	}
 
@@ -133,14 +142,7 @@ public final class CurrentUser {
 	 * HELPERS
 	 */
 	private static Subject currentSubject() {
-		Subject subject = getAccessControllerSubject();
-		if (subject != null)
-			return subject;
-		throw new IllegalStateException("Cannot find related subject");
-	}
-
-	private static Subject getAccessControllerSubject() {
-		return Subject.getSubject(AccessController.getContext());
+		return CurrentSubject.current();
 	}
 
 	private static Authorization getAuthorization(Subject subject) {
@@ -164,29 +166,7 @@ public final class CurrentUser {
 		return true;
 	}
 
-	/*
-	 * PREPARE EVOLUTION OF JAVA APIs INTRODUCED IN JDK 18
-	 * The following static methods will be added to Subject 
-	 */
-	public Subject current() {
-		return currentSubject();
-	}
-
-	public static <T> T callAs(Subject subject, Callable<T> action) {
-		try {
-			return Subject.doAs(subject, new PrivilegedExceptionAction<T>() {
-
-				@Override
-				public T run() throws Exception {
-					return action.call();
-				}
-
-			});
-		} catch (PrivilegedActionException e) {
-			throw new CompletionException("Failed to execute action for " + subject, e.getCause());
-		}
-	}
-
+	/** singleton */
 	private CurrentUser() {
 	}
 }