Commit 371d72ad authored by Jeff Burke's avatar Jeff Burke
Browse files

s1840: remove nsaccountlock from getUsers search filter.

parent 9f710dfa

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

+16 −15
Original line number Diff line number Diff line
@@ -147,7 +147,6 @@ public class LdapUserDAO<T extends Principal> extends LdapDAO 
    protected static final String LDAP_INSTITUTE = "institute";

    protected static final String LDAP_UID = "uid";





    private String[] userAttribs = new String[]

            {

                    LDAP_FIRST_NAME, LDAP_LAST_NAME, LDAP_ADDRESS, LDAP_CITY,
@@ -422,7 +421,7 @@ public class LdapUserDAO<T extends Principal> extends LdapDAO 
        SearchResultEntry searchResult = null;

        try

        {

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

            Filter filter = Filter.createNOTFilter(Filter.createPresenceFilter(LDAP_NSACCOUNTLOCK));

            filter = Filter.createANDFilter(filter,

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

            logger.debug("search filter: " + filter);
@@ -493,7 +492,7 @@ public class LdapUserDAO<T extends Principal> extends LdapDAO 


        try

        {

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

            Filter filter = Filter.createNOTFilter(Filter.createPresenceFilter(LDAP_NSACCOUNTLOCK));

            filter = Filter.createANDFilter(filter,

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

            logger.debug("search filter: " + filter);
@@ -560,8 +559,7 @@ public class LdapUserDAO<T extends Principal> extends LdapDAO 


        try

        {

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

            filter = Filter.createANDFilter(filter, Filter.createPresenceFilter(LDAP_UID));

            Filter filter =  Filter.createPresenceFilter(LDAP_UID);

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



            final String[] attributes = new String[]
@@ -576,6 +574,8 @@ public class LdapUserDAO<T extends Principal> extends LdapDAO 


                LdapDAO.checkLdapResult(searchResult.getResultCode());

                for (SearchResultEntry next : searchResult.getSearchEntries())

                {

                    if (!next.hasAttribute(LDAP_NSACCOUNTLOCK))

                    {

                        final String firstName =

                            next.getAttributeValue(LDAP_FIRST_NAME).trim();
@@ -588,6 +588,7 @@ public class LdapUserDAO<T extends Principal> extends LdapDAO 
                        users.add(user);

                    }

                }

            }

            catch (LDAPSearchException e)

            {

                if (e.getResultCode() == ResultCode.NO_SUCH_OBJECT)
@@ -748,7 +749,7 @@ public class LdapUserDAO<T extends Principal> extends LdapDAO 
        {

            DN userDN = getUserDN(userID.getName(), usersDN);

            List<Modification> modifs = new ArrayList<Modification>();

            modifs.add(new Modification(ModificationType.ADD, "nsaccountlock", "true"));

            modifs.add(new Modification(ModificationType.ADD, LDAP_NSACCOUNTLOCK, "true"));



            ModifyRequest modifyRequest = new ModifyRequest(userDN, modifs);

            modifyRequest.addControl(