Reconsider AntPathRequestMatcher matching logic #9301
Merged
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
jzheaux
requested changes
Jan 5, 2021
| @@ -159,9 +160,12 @@ public boolean matches(HttpServletRequest request) { | |||
|
|
|||
| @Override | |||
| public MatchResult matcher(HttpServletRequest request) { | |||
| if (this.matcher == null || !matches(request)) { | |||
| if (!matches(request)) { | |||
There was a problem hiding this comment.
It seems like this.matcher == null should be the first check in order to avoid potential NPEs in matches(HttpServletRequest).
There was a problem hiding this comment.
The matcher will only be null if the pattern is MATCH_ALL, and we need to check the HttpMethod first.
There was a problem hiding this comment.
Good point. Is the null check necessary, then? It seems like it could be removed.
There was a problem hiding this comment.
The null check is necessary since matcher is used to extract variables, for the MATCH_ALL pattern there will be an empty Map of variables.
web/src/test/java/org/springframework/security/web/util/matcher/AntPathRequestMatcherTests.java
Show resolved
Hide resolved
jzheaux
approved these changes
Jan 19, 2021
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Closes gh-9285