X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=org.argeo.cms%2Fsrc%2Forg%2Fargeo%2Fcms%2Fauth%2FCurrentUser.java;h=b43bf98b5f707744591b26006535ca784d8252b7;hb=279880f110272df643cee670aa976ae5ab9ec396;hp=11dbaa3f79002b5b73c451d96be9fe204d75c2f0;hpb=71196c25959b53964edf87aeb4387ed8b11b4868;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 11dbaa3f7..b43bf98b5 100644
--- a/org.argeo.cms/src/org/argeo/cms/auth/CurrentUser.java
+++ b/org.argeo.cms/src/org/argeo/cms/auth/CurrentUser.java
@@ -9,15 +9,18 @@ import java.util.HashSet;
 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;
 
-import org.argeo.api.NodeConstants;
-import org.argeo.cms.CmsException;
+import org.argeo.api.cms.CmsConstants;
+import org.argeo.api.cms.CmsSession;
+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.kernel.Activator;
+import org.argeo.cms.internal.runtime.CmsContextImpl;
 import org.osgi.service.useradmin.Authorization;
 
 /**
@@ -25,9 +28,6 @@ import org.osgi.service.useradmin.Authorization;
  * context.
  */
 public final class CurrentUser {
-	// private final static Log log = LogFactory.getLog(CurrentUser.class);
-	// private final static BundleContext bc =
-	// FrameworkUtil.getBundle(CurrentUser.class).getBundleContext();
 	/*
 	 * CURRENT USER API
 	 */
@@ -86,9 +86,9 @@ public final class CurrentUser {
 
 	public final static String getUsername(Subject subject) {
 		if (subject == null)
-			throw new CmsException("Subject cannot be null");
+			throw new IllegalArgumentException("Subject cannot be null");
 		if (subject.getPrincipals(X500Principal.class).size() != 1)
-			return NodeConstants.ROLE_ANONYMOUS;
+			return CmsConstants.ROLE_ANONYMOUS;
 		Principal principal = subject.getPrincipals(X500Principal.class).iterator().next();
 		return principal.getName();
 	}
@@ -109,7 +109,7 @@ public final class CurrentUser {
 	public final static Locale locale(Subject subject) {
 		Set<Locale> locales = subject.getPublicCredentials(Locale.class);
 		if (locales.isEmpty()) {
-			Locale defaultLocale = Activator.getNodeState().getDefaultLocale();
+			Locale defaultLocale = CmsContextImpl.getCmsContext().getDefaultLocale();
 			return defaultLocale;
 		} else
 			return locales.iterator().next();
@@ -120,45 +120,29 @@ public final class CurrentUser {
 		if (subject == null)
 			return true;
 		String username = getUsername(subject);
-		return username == null || username.equalsIgnoreCase(NodeConstants.ROLE_ANONYMOUS);
+		return username == null || username.equalsIgnoreCase(CmsConstants.ROLE_ANONYMOUS);
 	}
 
-	public CmsSession getCmsSession() {
+	public static CmsSession getCmsSession() {
 		Subject subject = currentSubject();
 		CmsSessionId cmsSessionId = subject.getPrivateCredentials(CmsSessionId.class).iterator().next();
-		return CmsSessionImpl.getByUuid(cmsSessionId.getUuid());
+		return CmsContextImpl.getCmsContext().getCmsSessionByUuid(cmsSessionId.getUuid());
 	}
 
 	/*
 	 * HELPERS
 	 */
 	private static Subject currentSubject() {
-		// CmsAuthenticated cmsView = getNodeAuthenticated();
-		// if (cmsView != null)
-		// return cmsView.getSubject();
 		Subject subject = getAccessControllerSubject();
 		if (subject != null)
 			return subject;
-		throw new CmsException("Cannot find related subject");
+		throw new IllegalStateException("Cannot find related subject");
 	}
 
 	private static Subject getAccessControllerSubject() {
 		return Subject.getSubject(AccessController.getContext());
 	}
 
-	// public static boolean isAuthenticated() {
-	// return getAccessControllerSubject() != null;
-	// }
-
-	/**
-	 * 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 CmsAuthenticated getNodeAuthenticated() {
-	// return UiContext.getData(CmsAuthenticated.KEY);
-	// }
-
 	private static Authorization getAuthorization(Subject subject) {
 		return subject.getPrivateCredentials(Authorization.class).iterator().next();
 	}
@@ -169,13 +153,40 @@ public final class CurrentUser {
 			nodeSessionId = subject.getPrivateCredentials(CmsSessionId.class).iterator().next().getUuid();
 		else
 			return false;
-		CmsSessionImpl cmsSession = CmsSessionImpl.getByUuid(nodeSessionId.toString());
-		cmsSession.close();
+		CmsSessionImpl cmsSession = CmsContextImpl.getCmsContext().getCmsSessionByUuid(nodeSessionId);
+
+		// FIXME logout all views
+		// TODO check why it is sometimes null
+		if (cmsSession != null)
+			cmsSession.close();
 		// if (log.isDebugEnabled())
 		// log.debug("Logged out CMS session " + cmsSession.getUuid());
 		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());
+		}
+	}
+
 	private CurrentUser() {
 	}
 }