Apache/archiva-redback-core
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'pr/10'

Browse Source 
[MRM-1923] merge pr
This commit is contained in:
olivier lamy 2016-09-13 10:55:00 +10:00
commit 11b2cdbae0
1 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
redback-authentication/redback-authentication-providers/redback-authentication-ldap/src/main/java/org/apache/archiva/redback/authentication/ldap/LdapBindAuthenticator.java
View File

@ -122,18 +122,25 @@ public AuthenticationResult authenticate( AuthenticationDataSource s )
results = context.search( mapper.getUserBaseDn(), filter, ctls );
log.debug( "Found user '{}': {}", source.getUsername(), results.hasMoreElements() );
boolean moreElements = results.hasMoreElements();
if ( results.hasMoreElements() )
log.debug( "Found user '{}': {}", source.getUsername(), moreElements );
if ( moreElements )
{
SearchResult result = results.nextElement();
try {
SearchResult result = results.nextElement();
userDn = result.getNameInNamespace();
userDn = result.getNameInNamespace();
log.debug( "Adding userDn {} for user {} to the cache..", userDn, source.getUsername() );
log.debug("Adding userDn {} for user {} to the cache..", userDn, source.getUsername());
// REDBACK-289/MRM-1488 cache the ldap user's userDn to lessen calls to ldap server
ldapCacheService.addLdapUserDn( source.getUsername(), userDn );
// REDBACK-289/MRM-1488 cache the ldap user's userDn to lessen calls to ldap server
ldapCacheService.addLdapUserDn(source.getUsername(), userDn);
} catch (Exception e) {
log.error("Error occured on LDAP result retrieval: {}, {}", userDn, e.getMessage());
return new AuthenticationResult( false, source.getUsername(), e);
}
}
else
{