Continue finalising security. Fix issues with login in web.

[lgpl/argeo-commons.git] / org.argeo.ext.jackrabbit / src / org / argeo / security / jackrabbit / ArgeoSecurityManager.java

diff --git a/org.argeo.ext.jackrabbit/src/org/argeo/security/jackrabbit/ArgeoSecurityManager.java b/org.argeo.ext.jackrabbit/src/org/argeo/security/jackrabbit/ArgeoSecurityManager.java
index 978be436b648623c1e6cf00199a226c26c96ace0..046829fe51b6d3d8db552a85e4c0b7ca6c75e1b1 100644 (file)
--- a/org.argeo.ext.jackrabbit/src/org/argeo/security/jackrabbit/ArgeoSecurityManager.java
+++ b/org.argeo.ext.jackrabbit/src/org/argeo/security/jackrabbit/ArgeoSecurityManager.java
@@ -29,6 +29,8 @@ import org.apache.jackrabbit.core.security.AMContext;
 import org.apache.jackrabbit.core.security.AccessManager;
 import org.apache.jackrabbit.core.security.SecurityConstants;
 import org.apache.jackrabbit.core.security.authorization.WorkspaceAccessManager;
+import org.argeo.node.NodeConstants;
+import org.argeo.node.security.AnonymousPrincipal;
 
 /** Integrates Spring Security and Jackrabbit Security users and roles. */
 public class ArgeoSecurityManager extends DefaultSecurityManager {
@@ -56,10 +58,15 @@ public class ArgeoSecurityManager extends DefaultSecurityManager {
        @Override
        public String getUserID(Subject subject, String workspaceName)
                        throws RepositoryException {
+               Set<AnonymousPrincipal> anonymousPrincipal = subject
+                               .getPrincipals(AnonymousPrincipal.class);
+               if(!anonymousPrincipal.isEmpty())
+                       return NodeConstants.ROLE_ANONYMOUS;
                Set<X500Principal> userPrincipal = subject
                                .getPrincipals(X500Principal.class);
                if (userPrincipal.isEmpty())
-                       return super.getUserID(subject, workspaceName);
+                       throw new IllegalStateException("Subject is neither anonymous nor logged-in");
+//                     return super.getUserID(subject, workspaceName);
                if (userPrincipal.size() > 1) {
                        StringBuilder buf = new StringBuilder();
                        for (X500Principal principal : userPrincipal)