Commit 0091b0b7 authored by Jeff Burke's avatar Jeff Burke
Browse files

ac2: remove nsaccountlock from some query filters

parent 98c966ef

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

+9 −11
Original line number Diff line number Diff line
@@ -441,8 +441,6 @@ public class LdapUserDAO<T extends Principal> extends LdapDAO 
        try

        {

            filter = Filter.createEqualityFilter(searchField, userID.getName());

            filter = Filter.createANDFilter(filter,

                Filter.createNOTFilter(Filter.createPresenceFilter("nsaccountlock")));

            logger.debug("search filter: " + filter);



            SearchRequest searchRequest =
@@ -533,8 +531,6 @@ public class LdapUserDAO<T extends Principal> extends LdapDAO 
        try

        {

            Filter filter = Filter.createEqualityFilter(searchField, userID.getName());

            filter = Filter.createANDFilter(filter,

                Filter.createNOTFilter(Filter.createPresenceFilter("nsaccountlock")));

            profiler.checkpoint("getAugmentedUser.createFilter");

            logger.debug("search filter: " + filter);
@@ -607,8 +603,6 @@ public class LdapUserDAO<T extends Principal> extends LdapDAO 
        final Collection<User<Principal>> users = new ArrayList<User<Principal>>();



        Filter filter =  Filter.createPresenceFilter(LDAP_UID);

        filter = Filter.createANDFilter(filter,

            Filter.createNOTFilter(Filter.createPresenceFilter("nsaccountlock")));

        logger.debug("search filter: " + filter);



        final String[] attributes = new String[]
@@ -876,6 +870,9 @@ public class LdapUserDAO<T extends Principal> extends LdapDAO 
            LdapDAO.checkLdapResult(e1.getResultCode());

        }



        // getUser does not yet support nsaccountlock

        if (!markDelete)

        {

            try

            {

                getUser(userID, usersDN);
@@ -884,6 +881,7 @@ public class LdapUserDAO<T extends Principal> extends LdapDAO 
            }

            catch (UserNotFoundException ignore) {}

        }

    }



    /**

     * Get all groups the user specified by userID belongs to. This method is created

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

+0 −29
Original line number Diff line number Diff line
@@ -542,12 +542,6 @@ public class LdapUserDAOTest extends AbstractLdapDAOTest 


                    userDAO.deleteUser(expected.getUserID());



                    try

                    {

                        userDAO.getUser(expected.getUserID());

                        fail("found deleted user");

                    }

                    catch (UserNotFoundException expected) {}

                    return null;

                }

                catch (Exception e)
@@ -594,13 +588,6 @@ public class LdapUserDAOTest extends AbstractLdapDAOTest 
                {

                    userDAO.deletePendingUser(expected.getUserID());



                    try

                    {

                        userDAO.getPendingUser(expected.getUserID());

                        fail("found deleted pending user");

                    }

                    catch (UserNotFoundException expected) {}



                    return null;

                }

                catch (Exception e)
@@ -745,14 +732,6 @@ public class LdapUserDAOTest extends AbstractLdapDAOTest 
    @Test

    public void testGetUsers() throws Exception

    {

        // anonymous access

//        try

//        {

//            getUserDAO().getUsers();

//            fail("anonymous request should throw exception");

//        }

//        catch (AccessControlException expected) {}



        // authenticated access

        Subject subject = new Subject();

        subject.getPrincipals().add(testUser.getUserID());
@@ -782,14 +761,6 @@ public class LdapUserDAOTest extends AbstractLdapDAOTest 
    @Test

    public void testGetPendingUsers() throws Exception

    {

        // anonymous access

        try

        {

            getUserDAO().getPendingUsers();

            fail("anonymous request should throw exception");

        }

        catch (AccessControlException expected) {}



        // authenticated access

        Subject subject = new Subject();

        subject.getPrincipals().add(testUser.getUserID());