Cwikius-Spring/spring-security
1
0
Fork 0
mirror of synced 2026-05-22 21:33:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/6.5.x'

Browse Source
This commit is contained in:
Josh Cummings
2025-07-31 10:12:39 -06:00
parent 0956846905 f180a04b74
commit 6873685fd0
1 changed files with 5 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
web/src/main/java/org/springframework/security/web/servlet/util/matcher/PathPatternRequestMatcher.java
+5 -11
View File
@@ -55,7 +55,7 @@ public final class PathPatternRequestMatcher implements RequestMatcher {
private final PathPattern pattern;
private RequestMatcher method = AnyRequestMatcher.INSTANCE;
private final RequestMatcher method;
/**
* Creates a {@link PathPatternRequestMatcher} that uses the provided {@code pattern}.
@@ -64,8 +64,9 @@ public final class PathPatternRequestMatcher implements RequestMatcher {
* </p>
* @param pattern the pattern used to match
*/
private PathPatternRequestMatcher(PathPattern pattern) {
private PathPatternRequestMatcher(PathPattern pattern, RequestMatcher method) {
this.pattern = pattern;
this.method = method;
}
/**
@@ -142,10 +143,6 @@ public final class PathPatternRequestMatcher implements RequestMatcher {
return (info != null) ? MatchResult.match(info.getUriVariables()) : MatchResult.notMatch();
}
void setMethod(RequestMatcher method) {
this.method = method;
}
private PathContainer getPathContainer(HttpServletRequest request) {
RequestPath path;
if (ServletRequestPathUtils.hasParsedRequestPath(request)) {
@@ -320,11 +317,8 @@ public final class PathPatternRequestMatcher implements RequestMatcher {
Assert.notNull(path, "pattern cannot be null");
Assert.isTrue(path.startsWith("/"), "pattern must start with a /");
PathPattern pathPattern = this.parser.parse(this.basePath + path);
PathPatternRequestMatcher requestMatcher = new PathPatternRequestMatcher(pathPattern);
if (method != null) {
requestMatcher.setMethod(new HttpMethodRequestMatcher(method));
}
return requestMatcher;
return new PathPatternRequestMatcher(pathPattern,
(method != null) ? new HttpMethodRequestMatcher(method) : AnyRequestMatcher.INSTANCE);
}
}