Commit ba4efbce authored by Adrian Damian's avatar Adrian Damian
Browse files

Fixed duplicate users in the list

parent 83144b0c

projects/cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/ldap/LdapGroupDAO.java

+3 −2
Original line number Diff line number Diff line
@@ -603,7 +603,8 @@ public class LdapGroupDAO<T extends Principal> extends LdapDAO 
            mods.add(new Modification(ModificationType.REPLACE, "description", group.description));

        }



        List<String> newMembers = new ArrayList<String>();

        

        Set<String> newMembers = new HashSet<String>();

        for (User<?> member : group.getUserMembers())

        {

            DN memberDN = userPersist.getUserDN(member);
@@ -618,7 +619,7 @@ public class LdapGroupDAO<T extends Principal> extends LdapDAO 
            DN grDN = getGroupDN(gr.getID());

            newMembers.add(grDN.toNormalizedString());

        }

        List<String> newAdmins = new ArrayList<String>();

        Set<String> newAdmins = new HashSet<String>();

        for (User<?> member : group.getUserAdmins())

        {

            DN memberDN = userPersist.getUserDN(member);

projects/cadcAccessControl-Server/test/src/ca/nrc/cadc/ac/server/ldap/LdapGroupDAOTest.java

+31 −5
Original line number Diff line number Diff line
@@ -68,6 +68,7 @@ 
package ca.nrc.cadc.ac.server.ldap;



import static org.junit.Assert.assertEquals;

import static org.junit.Assert.assertNotNull;

import static org.junit.Assert.assertTrue;

import static org.junit.Assert.fail;
@@ -90,17 +91,20 @@ import ca.nrc.cadc.ac.GroupNotFoundException; 
import ca.nrc.cadc.ac.GroupProperty;

import ca.nrc.cadc.ac.Role;

import ca.nrc.cadc.ac.User;

import ca.nrc.cadc.ac.UserNotFoundException;

import ca.nrc.cadc.util.Log4jInit;

import static org.junit.Assert.assertNotNull;

import ca.nrc.cadc.auth.HttpPrincipal;



public class LdapGroupDAOTest extends AbstractLdapDAOTest

{

    private static final Logger log = Logger.getLogger(LdapGroupDAOTest.class);

    

    static String daoTestDN1 = "cn=cadcdaotest1,ou=cadc,o=hia,c=ca";

    static String daoTestDN2 = "cn=cadcdaotest2,ou=cadc,o=hia,c=ca";

    static String daoTestDN3 = "cn=cadcdaotest3,ou=cadc,o=hia,c=ca";

    static String daoTestUid1 = "cadcdaotest1";

    static String daoTestUid2 = "cadcdaotest2";

    static String daoTestUid3 = "cadcdaotest3";

    

    static String daoTestDN1 = "cn=" + daoTestUid1 + ",ou=cadc,o=hia,c=ca";

    static String daoTestDN2 = "cn=" + daoTestUid2 + ",ou=cadc,o=hia,c=ca";

    static String daoTestDN3 = "cn=" + daoTestUid3 + ",ou=cadc,o=hia,c=ca";

    static String unknownDN = "cn=foo,ou=cadc,o=hia,c=ca";

    

    static X500Principal daoTestPrincipal1;
@@ -193,6 +197,18 @@ public class LdapGroupDAOTest extends AbstractLdapDAOTest 
                    actualGroup = getGroupDAO().modifyGroup(expectGroup);

                    assertGroupsEqual(expectGroup, actualGroup);

                    

                    // test adding the same user but with two different

                    // Principals. The duplicate should be ignored

                    // the the returned result should contain only

                    // one entry (the dn one)

                    User<HttpPrincipal> duplicateIdentity = 

                            new User<HttpPrincipal>(new HttpPrincipal(daoTestUid2));

                    expectGroup.getUserMembers().add(daoTestUser2);

                    expectGroup.getUserMembers().add(duplicateIdentity);

                    actualGroup = getGroupDAO().modifyGroup(expectGroup);

                    expectGroup.getUserMembers().remove(duplicateIdentity);

                    assertGroupsEqual(expectGroup, actualGroup);



                    expectGroup.getUserMembers().remove(daoTestUser2);

                    actualGroup = getGroupDAO().modifyGroup(expectGroup);

                    assertGroupsEqual(expectGroup, actualGroup);
@@ -222,6 +238,16 @@ public class LdapGroupDAOTest extends AbstractLdapDAOTest 
                    actualGroup = getGroupDAO().modifyGroup(expectGroup);

                    assertGroupsEqual(expectGroup, actualGroup);



                    // test adding the same user admin but with two different

                    // Principals. The duplicate should be ignored

                    // the the returned result should contain only

                    // one entry (the dn one)

                    expectGroup.getUserAdmins().add(daoTestUser2);

                    expectGroup.getUserAdmins().add(duplicateIdentity);

                    actualGroup = getGroupDAO().modifyGroup(expectGroup);

                    expectGroup.getUserAdmins().remove(duplicateIdentity);

                    assertGroupsEqual(expectGroup, actualGroup);

                    

                    // delete the group

                    getGroupDAO().deleteGroup(expectGroup.getID());

                    try