Implement an ability to set a custom LdapAuthenticationProvider withi…

…n AbstractLdapAuthenticationManagerFactory. Resolves spring-projects#11448

config/src/main/java/org/springframework/security/config/ldap/AbstractLdapAuthenticationManagerFactory.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2022 the original author or authors.
+ * Copyright 2002-2023 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -25,6 +25,7 @@
 import org.springframework.security.core.userdetails.UserDetails;
 import org.springframework.security.ldap.authentication.AbstractLdapAuthenticator;
 import org.springframework.security.ldap.authentication.LdapAuthenticationProvider;
+import org.springframework.security.ldap.authentication.ad.ActiveDirectoryLdapAuthenticationProvider;
 import org.springframework.security.ldap.search.FilterBasedLdapUserSearch;
 import org.springframework.security.ldap.userdetails.LdapAuthoritiesPopulator;
 import org.springframework.security.ldap.userdetails.UserDetailsContextMapper;
@@ -33,6 +34,7 @@
  * Creates an {@link AuthenticationManager} that can perform LDAP authentication.
  *
  * @author Eleftheria Stein
+ * @author Roman Zabaluev
  * @since 5.7
  */
 public abstract class AbstractLdapAuthenticationManagerFactory<T extends AbstractLdapAuthenticator> {
@@ -45,6 +47,8 @@ public abstract class AbstractLdapAuthenticationManagerFactory<T extends Abstrac
 
 	private String[] userDnPatterns;
 
+	private LdapAuthenticationProvider customAuthenticationProvider;
+
 	private LdapAuthoritiesPopulator ldapAuthoritiesPopulator;
 
 	private GrantedAuthoritiesMapper authoritiesMapper;
@@ -72,6 +76,16 @@ protected final BaseLdapPathContextSource getContextSource() {
 		return this.contextSource;
 	}
 
+	/**
+	 * Set a custom {@link LdapAuthenticationProvider} which will be used
+	 * for creation of {@link LdapAuthenticationProvider} rather than constructed automatically.
+	 * Useful for custom implementations, like {@link ActiveDirectoryLdapAuthenticationProvider}
+	 * @param provider A custom {@link LdapAuthenticationProvider} implementation
+	 */
+	public void customAuthenticationProvider(final LdapAuthenticationProvider provider) {
+		this.customAuthenticationProvider = provider;
+	}
+
 	/**
 	 * Sets the {@link LdapAuthoritiesPopulator} used to obtain a list of granted
 	 * authorities for an LDAP user.
@@ -145,11 +159,14 @@ public final AuthenticationManager createAuthenticationManager() {
 	private LdapAuthenticationProvider getProvider() {
 		AbstractLdapAuthenticator authenticator = getAuthenticator();
 		LdapAuthenticationProvider provider;
-		if (this.ldapAuthoritiesPopulator != null) {
-			provider = new LdapAuthenticationProvider(authenticator, this.ldapAuthoritiesPopulator);
+
+		if (this.customAuthenticationProvider != null) {
+			provider = this.customAuthenticationProvider;
 		}
 		else {
-			provider = new LdapAuthenticationProvider(authenticator);
+			provider = (this.ldapAuthoritiesPopulator != null)
+			? new LdapAuthenticationProvider(authenticator, this.ldapAuthoritiesPopulator)
+			: new LdapAuthenticationProvider(authenticator);
 		}
 		if (this.authoritiesMapper != null) {
 			provider.setAuthoritiesMapper(this.authoritiesMapper);