Change ActiveDirectoryLdapAuthenticationProvider to use LdapClient
#18627
+37
−19
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
therepanic
commented
Feb 1, 2026
| LdapClient ldapClient = LdapClient.builder() | ||
| .contextSource(contextSource) | ||
| .defaultSearchControls(() -> searchControls) | ||
| .ignorePartialResultException(true) |
Contributor
Author
There was a problem hiding this comment.
SpringSecurityLdapTemplate#searchForSingleEntryInternal behavior also ignores partial result exceptions.
therepanic
commented
Feb 1, 2026
Comment on lines
318
to
+338
| } | ||
| catch (org.springframework.ldap.NamingException ex) { | ||
| throw badCredentials(ex); | ||
| } |
Contributor
Author
There was a problem hiding this comment.
This is what you should do, otherwise the tests will fail.
therepanic
commented
Feb 1, 2026
Comment on lines
-100
to
+101
| given(this.ctx.search(any(Name.class), eq(customSearchFilter), any(Object[].class), any(SearchControls.class))) | ||
| given(this.ctx.search(any(Name.class), any(String.class), any(SearchControls.class))) |
Contributor
Author
There was a problem hiding this comment.
I'm not entirely sure whether this is a breaking change or not. Because when switching to LdapClient, we don't accept any(Object[].class) as the fourth argument, so we don't need to mock it.
spring-projects-issues
added
the
status: waiting-for-triage
Contributor
Author
|
I don't quite understand whether this is breaking Change or not, please take a look at #18627 (comment) |
Replaces SpringSecurityLdapTemplate with LdapClient for user search operations. Closes: spring-projectsgh-17291 Signed-off-by: Andrey Litvitski <[email protected]>
Member
|
FYI I rebased based off origin/main |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Replaces
SpringSecurityLdapTemplatewithLdapClientfor user search operations.Closes: gh-17291