diff --git a/core/src/main/java/org/acegisecurity/providers/ldap/authenticator/BindAuthenticator2.java b/core/src/main/java/org/acegisecurity/providers/ldap/authenticator/BindAuthenticator2.java new file mode 100644 index 0000000000..73a2114323 --- /dev/null +++ b/core/src/main/java/org/acegisecurity/providers/ldap/authenticator/BindAuthenticator2.java @@ -0,0 +1,39 @@ +package org.acegisecurity.providers.ldap.authenticator; + +import org.acegisecurity.ldap.InitialDirContextFactory; +import org.acegisecurity.userdetails.ldap.LdapUserDetails; + +import java.util.logging.Logger; +import java.util.logging.Level; + +/** + * {@link BindAuthenticator} with improved diagnostics. + * + * @author Kohsuke Kawaguchi + */ +public class BindAuthenticator2 extends BindAuthenticator { + /** + * If we ever had a successful authentication, + */ + private boolean hadSuccessfulAuthentication; + + public BindAuthenticator2(InitialDirContextFactory initialDirContextFactory) { + super(initialDirContextFactory); + } + + @Override + public LdapUserDetails authenticate(String username, String password) { + LdapUserDetails user = super.authenticate(username, password); + hadSuccessfulAuthentication = true; + return user; + } + + @Override + void handleBindException(String userDn, String username, Throwable cause) { + LOGGER.log(hadSuccessfulAuthentication? Level.FINE : Level.WARNING, + "Failed to bind to LDAP: userDn"+userDn+" username="+username,cause); + super.handleBindException(userDn, username, cause); + } + + private static final Logger LOGGER = Logger.getLogger(BindAuthenticator2.class.getName()); +} diff --git a/war/resources/WEB-INF/security/LDAPBindSecurityRealm.groovy b/war/resources/WEB-INF/security/LDAPBindSecurityRealm.groovy index 031edcec62..94c61c858d 100644 --- a/war/resources/WEB-INF/security/LDAPBindSecurityRealm.groovy +++ b/war/resources/WEB-INF/security/LDAPBindSecurityRealm.groovy @@ -1,7 +1,7 @@ import org.acegisecurity.providers.ProviderManager import org.acegisecurity.providers.anonymous.AnonymousAuthenticationProvider import org.acegisecurity.providers.ldap.LdapAuthenticationProvider -import org.acegisecurity.providers.ldap.authenticator.BindAuthenticator +import org.acegisecurity.providers.ldap.authenticator.BindAuthenticator2 import org.acegisecurity.providers.ldap.populator.DefaultLdapAuthoritiesPopulator import org.acegisecurity.ldap.DefaultInitialDirContextFactory import org.acegisecurity.ldap.search.FilterBasedLdapUserSearch @@ -26,7 +26,7 @@ ldapUserSearch(FilterBasedLdapUserSearch, instance.userSearchBase, instance.user searchSubtree=true } -bindAuthenticator(BindAuthenticator,initialDirContextFactory) { +bindAuthenticator(BindAuthenticator2,initialDirContextFactory) { // this is when you the user name can be translated into DN. // userDnPatterns = [ // "uid={0},ou=people"