Improve and simplify OSGi Boot

[lgpl/argeo-commons.git] / org.argeo.security.core / src / org / argeo / osgi / useradmin / LdifGroup.java

diff --git a/org.argeo.security.core/src/org/argeo/osgi/useradmin/LdifGroup.java b/org.argeo.security.core/src/org/argeo/osgi/useradmin/LdifGroup.java
index fbc678c52c7589e9484967d3352d48f76a7368b7..bd129119b2592366a49fdba8582fa892d9795e0c 100644 (file)
--- a/org.argeo.security.core/src/org/argeo/osgi/useradmin/LdifGroup.java
+++ b/org.argeo.security.core/src/org/argeo/osgi/useradmin/LdifGroup.java
@@ -8,30 +8,32 @@ import javax.naming.directory.Attribute;
 import javax.naming.directory.Attributes;
 import javax.naming.ldap.LdapName;
 
-import org.osgi.service.useradmin.Group;
 import org.osgi.service.useradmin.Role;
 
-public class LdifGroup extends LdifUser implements Group {
-       // optimisation
-       List<Role> directMembers = null;
+/** Directory group implementation */
+class LdifGroup extends LdifUser implements DirectoryGroup {
+       private final String memberAttributeId;
 
-       private String memberAttrName = "member";
-
-       public LdifGroup(LdapName dn, Attributes attributes) {
-               super(dn, attributes);
+       LdifGroup(AbstractUserDirectory userAdmin, LdapName dn,
+                       Attributes attributes) {
+               super(userAdmin, dn, attributes);
+               memberAttributeId = userAdmin.getMemberAttributeId();
        }
 
        @Override
        public boolean addMember(Role role) {
-               Attribute member = getAttributes().get(memberAttrName);
+               getUserAdmin().checkEdit();
+               if (!isEditing())
+                       startEditing();
+
+               Attribute member = getAttributes().get(memberAttributeId);
                if (member != null) {
                        if (member.contains(role.getName()))
                                return false;
+                       else
+                               member.add(role.getName());
                } else
-                       getAttributes().put(memberAttrName, role.getName());
-               directMembers.add(role);
-               if (role instanceof LdifUser)
-                       ((LdifUser) role).directMemberOf.add(this);
+                       getAttributes().put(memberAttributeId, role.getName());
                return true;
        }
 
@@ -42,14 +44,15 @@ public class LdifGroup extends LdifUser implements Group {
 
        @Override
        public boolean removeMember(Role role) {
-               Attribute member = getAttributes().get(memberAttrName);
+               getUserAdmin().checkEdit();
+               if (!isEditing())
+                       startEditing();
+
+               Attribute member = getAttributes().get(memberAttributeId);
                if (member != null) {
                        if (!member.contains(role.getName()))
                                return false;
                        member.remove(role.getName());
-                       directMembers.remove(role);
-                       if (role instanceof LdifUser)
-                               ((LdifUser) role).directMemberOf.remove(this);
                        return true;
                } else
                        return false;
@@ -57,45 +60,25 @@ public class LdifGroup extends LdifUser implements Group {
 
        @Override
        public Role[] getMembers() {
-               if (directMembers != null)
-                       return directMembers.toArray(new Role[directMembers.size()]);
-               else
-                       throw new ArgeoUserAdminException("Members have not been loaded.");
-
-               // Attribute memberAttribute = getAttributes().get(memberAttrName);
-               // if (memberAttribute == null)
-               // return new Role[0];
-               // try {
-               // List<Role> roles = new ArrayList<Role>();
-               // NamingEnumeration values = memberAttribute.getAll();
-               // while (values.hasMore()) {
-               // LdapName dn = new LdapName(values.next().toString());
-               // roles.add(new LdifUser(dn, null));
-               // }
-               // return roles.toArray(new Role[roles.size()]);
-               // } catch (Exception e) {
-               // throw new ArgeoUserAdminException("Cannot get members", e);
-               // }
+               List<Role> directMembers = new ArrayList<Role>();
+               for (LdapName ldapName : getMemberNames()) {
+                       Role role = getUserAdmin().getRole(ldapName.toString());
+                       if (role == null) {
+                               if (getUserAdmin().getExternalRoles() != null)
+                                       role = getUserAdmin().getExternalRoles().getRole(
+                                                       ldapName.toString());
+                       }
+                       if (role == null)
+                               throw new UserDirectoryException("No role found for "
+                                               + ldapName);
+                       directMembers.add(role);
+               }
+               return directMembers.toArray(new Role[directMembers.size()]);
        }
 
-//     void loadMembers(LdifUserAdmin userAdmin) {
-//             directMembers = new ArrayList<Role>();
-//             for (LdapName ldapName : getMemberNames()) {
-//                     LdifUser role;
-//                     if (userAdmin.groups.containsKey(ldapName))
-//                             role = userAdmin.groups.get(ldapName);
-//                     else if (userAdmin.users.containsKey(ldapName))
-//                             role = userAdmin.users.get(ldapName);
-//                     else
-//                             throw new ArgeoUserAdminException("No role found for "
-//                                             + ldapName);
-//                     role.directMemberOf.add(this);
-//                     directMembers.add(role);
-//             }
-//     }
-
-       List<LdapName> getMemberNames() {
-               Attribute memberAttribute = getAttributes().get(memberAttrName);
+       @Override
+       public List<LdapName> getMemberNames() {
+               Attribute memberAttribute = getAttributes().get(memberAttributeId);
                if (memberAttribute == null)
                        return new ArrayList<LdapName>();
                try {
@@ -107,7 +90,7 @@ public class LdifGroup extends LdifUser implements Group {
                        }
                        return roles;
                } catch (Exception e) {
-                       throw new ArgeoUserAdminException("Cannot get members", e);
+                       throw new UserDirectoryException("Cannot get members", e);
                }
        }
 
@@ -120,10 +103,4 @@ public class LdifGroup extends LdifUser implements Group {
        public int getType() {
                return GROUP;
        }
-
-       public String getMemberAttrName() {
-               return memberAttrName;
-       }
-       
-       
 }