Commit 4e2c695c authored by Jeff Burke's avatar Jeff Burke
Browse files

s1890: fix getAugmentedUser to properly handle a NumericPrincipal

parent bd8809d5

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

+11 −2
Original line number Original line Diff line number Diff line
@@ -678,7 +678,16 @@ public class LdapUserDAO extends LdapDAO 




        try

        try

        {

        {

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

            String name;

            if (userID instanceof NumericPrincipal)

            {

                name = String.valueOf(uuid2long(UUID.fromString(userID.getName())));

            }

            else

            {

                name = userID.getName();

            }

            Filter filter = Filter.createEqualityFilter(searchField, name);

            profiler.checkpoint("getAugmentedUser.createFilter");

            profiler.checkpoint("getAugmentedUser.createFilter");

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

            logger.debug("search filter: " + filter);
@@ -691,7 +700,7 @@ public class LdapUserDAO extends LdapDAO 




            if (searchResult == null)

            if (searchResult == null)

            {

            {

                String msg = "User not found " + userID.toString();

                String msg = "User not found " + name;

                logger.debug(msg);

                logger.debug(msg);

                throw new UserNotFoundException(msg);

                throw new UserNotFoundException(msg);

            }

            }