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 845094820c84e897df2844ce31e83ed8e20d7eac..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,20 +8,33 @@ 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;
 
-       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) {
-               throw new UnsupportedOperationException();
+               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(memberAttributeId, role.getName());
+               return true;
        }
 
        @Override
@@ -31,62 +44,53 @@ public class LdifGroup extends LdifUser implements Group {
 
        @Override
        public boolean removeMember(Role role) {
-               throw new UnsupportedOperationException();
+               getUserAdmin().checkEdit();
+               if (!isEditing())
+                       startEditing();
+
+               Attribute member = getAttributes().get(memberAttributeId);
+               if (member != null) {
+                       if (!member.contains(role.getName()))
+                               return false;
+                       member.remove(role.getName());
+                       return true;
+               } else
+                       return false;
        }
 
        @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("member");
-               // 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);
-               // }
-       }
-
-       void loadMembers(LdifUserAdmin userAdmin) {
-               directMembers = new ArrayList<Role>();
+               List<Role> 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 roel found for "
+                       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);
-                       role.directMemberOf.add(this);
                        directMembers.add(role);
                }
+               return directMembers.toArray(new Role[directMembers.size()]);
        }
 
-       List<LdapName> getMemberNames() {
-               Attribute memberAttribute = getAttributes().get("member");
+       @Override
+       public List<LdapName> getMemberNames() {
+               Attribute memberAttribute = getAttributes().get(memberAttributeId);
                if (memberAttribute == null)
                        return new ArrayList<LdapName>();
                try {
                        List<LdapName> roles = new ArrayList<LdapName>();
-                       NamingEnumeration values = memberAttribute.getAll();
+                       NamingEnumeration<?> values = memberAttribute.getAll();
                        while (values.hasMore()) {
                                LdapName dn = new LdapName(values.next().toString());
                                roles.add(dn);
                        }
                        return roles;
                } catch (Exception e) {
-                       throw new ArgeoUserAdminException("Cannot get members", e);
+                       throw new UserDirectoryException("Cannot get members", e);
                }
        }