Make user/anonymous semantics more consistent with Authorization

[lgpl/argeo-commons.git] / org.argeo.node.api / src / org / argeo / node / security / NodeSecurityUtils.java

diff --git a/org.argeo.node.api/src/org/argeo/node/security/NodeSecurityUtils.java b/org.argeo.node.api/src/org/argeo/node/security/NodeSecurityUtils.java
index 97618d5ecaa11d3cd48e911cdda635fb970d32ab..7c784b0dc39f6032840989e94e5f8670c5e57d4b 100644 (file)
--- a/org.argeo.node.api/src/org/argeo/node/security/NodeSecurityUtils.java
+++ b/org.argeo.node.api/src/org/argeo/node/security/NodeSecurityUtils.java
@@ -10,11 +10,13 @@ import javax.naming.ldap.LdapName;
 import org.argeo.node.NodeConstants;
 
 public class NodeSecurityUtils {
-       public final static LdapName ROLE_ADMIN_NAME, ROLE_ANONYMOUS_NAME, ROLE_USER_NAME, ROLE_USER_ADMIN_NAME;
+       public final static LdapName ROLE_ADMIN_NAME, ROLE_DATA_ADMIN_NAME, ROLE_ANONYMOUS_NAME, ROLE_USER_NAME,
+                       ROLE_USER_ADMIN_NAME;
        public final static List<LdapName> RESERVED_ROLES;
        static {
                try {
                        ROLE_ADMIN_NAME = new LdapName(NodeConstants.ROLE_ADMIN);
+                       ROLE_DATA_ADMIN_NAME = new LdapName(NodeConstants.ROLE_DATA_ADMIN);
                        ROLE_USER_NAME = new LdapName(NodeConstants.ROLE_USER);
                        ROLE_USER_ADMIN_NAME = new LdapName(NodeConstants.ROLE_USER_ADMIN);
                        ROLE_ANONYMOUS_NAME = new LdapName(NodeConstants.ROLE_ANONYMOUS);
@@ -31,8 +33,8 @@ public class NodeSecurityUtils {
        }
 
        public static void checkImpliedPrincipalName(LdapName roleName) throws IllegalArgumentException {
-               if (ROLE_USER_NAME.equals(roleName) || ROLE_ANONYMOUS_NAME.equals(roleName))
-                       throw new IllegalArgumentException(roleName + " cannot be listed as role");
+//             if (ROLE_USER_NAME.equals(roleName) || ROLE_ANONYMOUS_NAME.equals(roleName))
+//                     throw new IllegalArgumentException(roleName + " cannot be listed as role");
        }
 
 }