X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;ds=sidebyside;f=org.argeo.cms%2Fsrc%2Forg%2Fargeo%2Fcms%2Fauth%2FCurrentUser.java;h=ef56adc33a318773941ac56a69d3fec202e6e862;hb=faf5a48ce8b1d78fb812e0a525f8e20e84d690ad;hp=33a226737bd5c8ac52c6ea3febfacd5b55340f0a;hpb=a24df5e9ef0900033b0e431a819432101bdb1fc4;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 33a226737..ef56adc33 100644
--- a/org.argeo.cms/src/org/argeo/cms/auth/CurrentUser.java
+++ b/org.argeo.cms/src/org/argeo/cms/auth/CurrentUser.java
@@ -23,14 +23,14 @@ import java.security.PrivilegedExceptionAction;
 import java.security.acl.Group;
 import java.util.HashSet;
 import java.util.Set;
+import java.util.UUID;
 
 import javax.security.auth.Subject;
 import javax.security.auth.x500.X500Principal;
 
 import org.argeo.cms.CmsException;
-import org.argeo.eclipse.ui.specific.UiContext;
+import org.argeo.cms.internal.auth.CmsSessionImpl;
 import org.argeo.node.NodeConstants;
-import org.argeo.node.security.NodeAuthenticated;
 import org.osgi.service.useradmin.Authorization;
 
 /**
@@ -38,6 +38,9 @@ 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
 	 */
@@ -65,15 +68,6 @@ public final class CurrentUser {
 		return isAnonymous(currentSubject());
 	}
 
-	/**
-	 * Whether a user is currently authenticated. @deprecate User !isAnonymous()
-	 * instead.
-	 */
-	@Deprecated
-	public static boolean isRegistered() {
-		return !isAnonymous();
-	}
-
 	/** Roles of the currently logged-in user */
 	public final static Set<String> roles() {
 		return roles(currentSubject());
@@ -91,7 +85,7 @@ public final class CurrentUser {
 	}
 
 	/** Executes as the current user */
-	public final static <T> T doAs(PrivilegedExceptionAction<T> action) throws PrivilegedActionException {
+	public final static <T> T tryAs(PrivilegedExceptionAction<T> action) throws PrivilegedActionException {
 		return Subject.doAs(currentSubject(), action);
 	}
 
@@ -128,33 +122,60 @@ public final class CurrentUser {
 		String username = getUsername(subject);
 		return username == null || username.equalsIgnoreCase(NodeConstants.ROLE_ANONYMOUS);
 	}
+
+	public CmsSession getCmsSession() {
+		Subject subject = currentSubject();
+		CmsSessionId cmsSessionId = subject.getPrivateCredentials(CmsSessionId.class).iterator().next();
+		return CmsSessionImpl.getByUuid(cmsSessionId.getUuid());
+	}
+
 	/*
 	 * HELPERS
 	 */
-
 	private static Subject currentSubject() {
-		NodeAuthenticated cmsView = getNodeAuthenticated();
-		if (cmsView != null)
-			return cmsView.getLoginContext().getSubject();
-		Subject subject = Subject.getSubject(AccessController.getContext());
+		// CmsAuthenticated cmsView = getNodeAuthenticated();
+		// if (cmsView != null)
+		// return cmsView.getSubject();
+		Subject subject = getAccessControllerSubject();
 		if (subject != null)
 			return subject;
 		throw new CmsException("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 NodeAuthenticated getNodeAuthenticated() {
-		return UiContext.getData(NodeAuthenticated.KEY);
-	}
+	// private static CmsAuthenticated getNodeAuthenticated() {
+	// return UiContext.getData(CmsAuthenticated.KEY);
+	// }
 
 	private static Authorization getAuthorization(Subject subject) {
 		return subject.getPrivateCredentials(Authorization.class).iterator().next();
 	}
 
+	public static boolean logoutCmsSession(Subject subject) {
+		UUID nodeSessionId;
+		if (subject.getPrivateCredentials(CmsSessionId.class).size() == 1)
+			nodeSessionId = subject.getPrivateCredentials(CmsSessionId.class).iterator().next().getUuid();
+		else
+			return false;
+		CmsSessionImpl cmsSession = CmsSessionImpl.getByUuid(nodeSessionId.toString());
+		cmsSession.close();
+//		if (log.isDebugEnabled())
+//			log.debug("Logged out CMS session " + cmsSession.getUuid());
+		return true;
+	}
+
 	private CurrentUser() {
 	}
 }