Introduce node file system provider

[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 2d606f2a8c4885bf767fc982892741941a0de1e5..a23822b21fe48c7db3f43a090c059fdccfb4400a 100644 (file)
--- a/org.argeo.cms/src/org/argeo/cms/auth/CurrentUser.java
+++ b/org.argeo.cms/src/org/argeo/cms/auth/CurrentUser.java
@@ -26,11 +26,13 @@ import javax.security.auth.x500.X500Principal;
 
 import org.argeo.cms.CmsException;
 import org.argeo.eclipse.ui.specific.UiContext;
-import org.argeo.node.NodeAuthenticated;
+import org.argeo.node.NodeConstants;
+import org.argeo.node.security.NodeAuthenticated;
 import org.osgi.service.useradmin.Authorization;
 
 /** Static utilities */
 public final class CurrentUser {
+
        /**
         * @return the authenticated username or null if not authenticated /
         *         anonymous
@@ -47,20 +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(AuthConstants.ROLE_ANONYMOUS);
-       }
-
-       private static Subject currentSubject() {
-               NodeAuthenticated cmsView = getNodeAuthenticated();
-               if (cmsView != null)
-                       return cmsView.getSubject();
-               Subject subject = Subject.getSubject(AccessController.getContext());
-               if (subject != null)
-                       return subject;
-               throw new CmsException("Cannot find related subject");
+                               || username.equalsIgnoreCase(NodeConstants.ROLE_ANONYMOUS);
        }
 
        /**
@@ -72,8 +70,10 @@ public final class CurrentUser {
        }
 
        public final static String getUsername(Subject subject) {
+               if (subject == null)
+                       throw new CmsException("Subject cannot be null");
                if (subject.getPrincipals(X500Principal.class).size() != 1)
-                       return null;
+                       return NodeConstants.ROLE_ANONYMOUS;
                Principal principal = subject.getPrincipals(X500Principal.class)
                                .iterator().next();
                return principal.getName();
@@ -92,11 +92,25 @@ public final class CurrentUser {
                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>();
-               X500Principal userPrincipal = subject
-                               .getPrincipals(X500Principal.class).iterator().next();
-               roles.add(userPrincipal.getName());
+               roles.add(getUsername(subject));
                for (Principal group : subject.getPrincipals(Group.class)) {
                        roles.add(group.getName());
                }