Add DN to indexed attributes

[lgpl/argeo-commons.git] / org.argeo.cms / src / org / argeo / cms / auth / CurrentUser.java

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 3fef3033d6e04a32215cf4116baefa504577b81e..ef56adc33a318773941ac56a69d3fec202e6e862 100644 (file)
--- 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
         */
@@ -82,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);
        }
 
@@ -119,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() {
        }
 }