Commit 6ce93e33 authored by Brian Major's avatar Brian Major
Browse files

ac2 - Added profiling to LDAPUserDAO.getAugmentedUser()

parent da63d846

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

+8 −0
Original line number Diff line number Diff line
@@ -97,6 +97,8 @@ import ca.nrc.cadc.auth.AuthenticationUtil; 
import ca.nrc.cadc.auth.HttpPrincipal;

import ca.nrc.cadc.auth.NumericPrincipal;

import ca.nrc.cadc.net.TransientException;

import ca.nrc.cadc.profiler.Profiler;



import com.unboundid.ldap.sdk.AddRequest;

import com.unboundid.ldap.sdk.Attribute;

import com.unboundid.ldap.sdk.BindRequest;
@@ -126,6 +128,8 @@ public class LdapUserDAO<T extends Principal> extends LdapDAO 
{

    private static final Logger logger = Logger.getLogger(LdapUserDAO.class);



    private Profiler profiler = new Profiler(LdapUserDAO.class);



    // Map of identity type to LDAP attribute

    private final Map<Class<?>, String> userLdapAttrib = new HashMap<Class<?>, String>();
@@ -544,12 +548,15 @@ public class LdapUserDAO<T extends Principal> extends LdapDAO 
        try

        {

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

            profiler.checkpoint("getAugmentedUser.createFilter");

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



            SearchRequest searchRequest = new SearchRequest(

                config.getUsersDN(), SearchScope.ONE, filter, identityAttribs);

            profiler.checkpoint("getAugmentedUser.createSearchRequest");



            SearchResultEntry searchResult = getConnection().searchForEntry(searchRequest);

            profiler.checkpoint("getAugmentedUser.searchForEntry");



            if (searchResult == null)

            {
@@ -567,6 +574,7 @@ public class LdapUserDAO<T extends Principal> extends LdapDAO 
                searchResult.getAttributeValue(LDAP_DISTINGUISHED_NAME)));

            user.getIdentities().add(new DNPrincipal(

                searchResult.getAttributeValue(LDAP_ENTRYDN)));

            profiler.checkpoint("getAugmentedUser.mapIdentities");

            return user;

        }

        catch (LDAPException e)