Improve role management

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

diff --git a/org.argeo.cms/src/org/argeo/cms/internal/auth/ImpliedByPrincipal.java b/org.argeo.cms/src/org/argeo/cms/internal/auth/ImpliedByPrincipal.java
index 7472908cd565656d09692d23370d2c8a51f2629d..15c47293ec06cf8423aefcb60cd5c146b7e4c113 100644 (file)
--- a/org.argeo.cms/src/org/argeo/cms/internal/auth/ImpliedByPrincipal.java
+++ b/org.argeo.cms/src/org/argeo/cms/internal/auth/ImpliedByPrincipal.java
@@ -1,15 +1,11 @@
 package org.argeo.cms.internal.auth;
 
-import static org.argeo.api.acr.RuntimeNamespaceContext.getNamespaceContext;
-
 import java.security.Principal;
 import java.util.HashSet;
 import java.util.Set;
 
 import javax.xml.namespace.QName;
 
-import org.argeo.api.acr.ArgeoNamespace;
-import org.argeo.api.acr.NamespaceUtils;
 import org.argeo.cms.auth.RoleNameUtils;
 import org.osgi.service.useradmin.Authorization;
 
@@ -23,71 +19,25 @@ import org.osgi.service.useradmin.Authorization;
  */
 public final class ImpliedByPrincipal implements Principal {
        private final String name;
-       private Set<Principal> causes = new HashSet<Principal>();
-
-       private QName roleName;
-//     private int type = Role.ROLE;
+       private final QName roleName;
+       private final boolean systemRole;
+       private final String context;
 
-       private boolean systemRole = false;
-       private String context;
+       private Set<Principal> causes = new HashSet<Principal>();
 
        public ImpliedByPrincipal(String name, Principal userPrincipal) {
                this.name = name;
-               String cn = RoleNameUtils.getLastRdnValue(name);
-               roleName = NamespaceUtils.parsePrefixedName(getNamespaceContext(), cn);
-               if (roleName.getNamespaceURI().equals(ArgeoNamespace.ROLE_NAMESPACE_URI)) {
-                       systemRole = true;
-               }
+               roleName = RoleNameUtils.getLastRdnAsName(name);
+               systemRole = RoleNameUtils.isSystemRole(roleName);
                context = RoleNameUtils.getContext(name);
-//             try {
-//                     this.name = new LdapName(name);
-//             } catch (InvalidNameException e) {
-//                     throw new IllegalArgumentException("Badly formatted role name", e);
-//             }
                if (userPrincipal != null)
                        causes.add(userPrincipal);
        }
 
-//     public ImpliedByPrincipal(LdapName name, Principal userPrincipal) {
-//             this.name = name;
-//             if (userPrincipal != null)
-//                     causes.add(userPrincipal);
-//     }
-
        public String getName() {
                return name;
        }
 
-       /*
-        * USER ADMIN
-        */
-//     public boolean addMember(Principal user) {
-//             throw new UnsupportedOperationException();
-//     }
-//
-//     public boolean removeMember(Principal user) {
-//             throw new UnsupportedOperationException();
-//     }
-//
-//     public boolean isMember(Principal member) {
-//             return causes.contains(member);
-//     }
-//
-//     public Enumeration<? extends Principal> members() {
-//             return Collections.enumeration(causes);
-//     }
-//
-//
-//     /** Type of {@link Role}, if known. */
-//     public int getType() {
-//             return type;
-//     }
-//
-//     /** Not supported for the time being. */
-//     public Dictionary<String, Object> getProperties() {
-//             throw new UnsupportedOperationException();
-//     }
-
        /*
         * OBJECT
         */
@@ -111,8 +61,6 @@ public final class ImpliedByPrincipal implements Principal {
 
        @Override
        public boolean equals(Object obj) {
-               // if (this == obj)
-               // return true;
                if (obj instanceof ImpliedByPrincipal) {
                        ImpliedByPrincipal that = (ImpliedByPrincipal) obj;
                        // TODO check members too?
@@ -123,7 +71,6 @@ public final class ImpliedByPrincipal implements Principal {
 
        @Override
        public String toString() {
-               // return name.toString() + " implied by " + causes;
                return name.toString();
        }
 }