Commit 4c360a11 authored by Alinga Yeung's avatar Alinga Yeung
Browse files

Story ac2 rework. Changed getMember() to getX500User().

parent 6b3f7fda

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

+4 −4
Original line number Diff line number Diff line
@@ -472,7 +472,7 @@ public class LdapGroupDAO<T extends Principal> extends LdapDAO 
            User<X500Principal> owner;

            try

            {

                owner = userPersist.getMember(groupOwner);

                owner = userPersist.getX500User(groupOwner);

            }

            catch (UserNotFoundException e)

            {
@@ -504,7 +504,7 @@ public class LdapGroupDAO<T extends Principal> extends LdapDAO 
                            User<X500Principal> user;

                            try

                            {

                                user = userPersist.getMember(memberDN);

                                user = userPersist.getX500User(memberDN);

                            }

                            catch (UserNotFoundException e)

                            {
@@ -972,7 +972,7 @@ public class LdapGroupDAO<T extends Principal> extends LdapDAO 
        }



        Group group = new Group(searchResult.getAttributeValue("cn"),

                                userPersist.getMember(

                                userPersist.getX500User(

                                        new DN(searchResult.getAttributeValue(

                                                "owner"))));

        group.description = searchResult.getAttributeValue("description");
@@ -1076,7 +1076,7 @@ public class LdapGroupDAO<T extends Principal> extends LdapDAO 
        try

        {

            User<X500Principal> subjectUser = 

                    userPersist.getMember(getSubjectDN());

                    userPersist.getX500User(getSubjectDN());

            if (subjectUser.equals(owner))

            {

                return true;

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

+1 −1
Original line number Diff line number Diff line
@@ -831,7 +831,7 @@ public class LdapUserDAO<T extends Principal> extends LdapDAO 
     * @throws UserNotFoundException

     * @throws LDAPException

     */

    User<X500Principal> getMember(DN userDN)

    User<X500Principal> getX500User(DN userDN)

            throws UserNotFoundException, LDAPException

    {

        Filter filter =

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

+2 −2
Original line number Diff line number Diff line
@@ -311,7 +311,7 @@ public class LdapUserDAOTest extends AbstractLdapDAOTest 
            {

                try

                {

                    User<X500Principal> actual = getUserDAO().getMember(new DN(testUserDN));

                    User<X500Principal> actual = getUserDAO().getX500User(new DN(testUserDN));

                    check(testUser, actual);

                    return null;

                }
@@ -334,7 +334,7 @@ public class LdapUserDAOTest extends AbstractLdapDAOTest 
            {

                try

                {

                    User<X500Principal> actual = getUserDAO().getMember(new DN(testUserDN));

                    User<X500Principal> actual = getUserDAO().getX500User(new DN(testUserDN));

                    check(testUser, actual);

                    return null;

                }