Polish ActiveDirectoryLdapAuthenticationProvider#setAuthoritiesPopulator

Issue gh-4490
spring-projects · Feb 9, 2024 · 4aed679 · 4aed679
1 parent 98f0a21
commit 4aed679
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/...gframework/security/ldap/authentication/ad/ActiveDirectoryLdapAuthenticationProvider.java b/...gframework/security/ldap/authentication/ad/ActiveDirectoryLdapAuthenticationProvider.java
@@ -143,7 +143,6 @@ public ActiveDirectoryLdapAuthenticationProvider(String domain, String url, Stri
 		this.domain = StringUtils.hasText(domain) ? domain.toLowerCase() : null;
 		this.url = url;
 		this.rootDn = StringUtils.hasText(rootDn) ? rootDn.toLowerCase() : null;
-		this.setAuthoritiesPopulator(this.authoritiesPopulator);
 	}
 
 	/**
@@ -155,7 +154,6 @@ public ActiveDirectoryLdapAuthenticationProvider(String domain, String url) {
 		this.domain = StringUtils.hasText(domain) ? domain.toLowerCase() : null;
 		this.url = url;
 		this.rootDn = (this.domain != null) ? rootDnFromDomain(this.domain) : null;
-		this.setAuthoritiesPopulator(this.authoritiesPopulator);
 	}
 
 	@Override
@@ -179,6 +177,10 @@ protected DirContextOperations doAuthentication(UsernamePasswordAuthenticationTo
 		}
 	}
 
+	/**
+	 * Creates the user authority list from the values of the {@code memberOf} attribute
+	 * obtained from the user's Active Directory entry.
+	 */
 	@Override
 	protected Collection<? extends GrantedAuthority> loadUserAuthorities(DirContextOperations userData, String username,
 			String password) {
@@ -389,7 +391,7 @@ public void setContextEnvironmentProperties(Map<String, Object> environment) {
 	 * @since 6.3
 	 */
 	public void setAuthoritiesPopulator(LdapAuthoritiesPopulator authoritiesPopulator) {
-		Assert.notNull(authoritiesPopulator, "An LdapAuthoritiesPopulator must be supplied");
+		Assert.notNull(authoritiesPopulator, "authoritiesPopulator must not be null");
 		this.authoritiesPopulator = authoritiesPopulator;
 	}
 

diff --git a/...framework/security/ldap/authentication/ad/DefaultActiveDirectoryAuthoritiesPopulator.java b/...framework/security/ldap/authentication/ad/DefaultActiveDirectoryAuthoritiesPopulator.java
@@ -38,6 +38,7 @@
  *
  * @author Luke Taylor
  * @author Roman Zabaluev
+ * @since 6.3
  */
 public final class DefaultActiveDirectoryAuthoritiesPopulator implements LdapAuthoritiesPopulator {