admin/spring-projects-spring-framework
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-framework synced 2026-06-08 17:33:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix '**' parsing within a PathPattern segment

Browse Source 
Prior to this commit, a regexp path segment ending with a double wilcard
(like "/path**") would be incorrectly parsed as a double wildcard
segment ("/**").

This commit fixes the incorrect parsing.

See gh-35679
This commit is contained in:
Brian Clozel
2025-08-18 10:44:15 +02:00
parent d3c1e678c2
commit a5141b187a
2 changed files with 16 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
spring-web/src/main/java/org/springframework/web/util/pattern/InternalPathPatternParser.java
+10 -2
View File
@@ -236,14 +236,22 @@ class InternalPathPatternParser {
}
private boolean isDoubleWildcard(char separator) {
// next char is present
if ((this.pos + 1) >= this.pathPatternLength) {
return false;
}
// current char and next char are '*'
if (this.pathPatternData[this.pos] != '*' || this.pathPatternData[this.pos + 1] != '*') {
return false;
}
if ((this.pos + 2) < this.pathPatternLength) {
return this.pathPatternData[this.pos + 2] == separator;
// previous char is a separator, if any
if ((this.pos - 1 >= 0) && (this.pathPatternData[this.pos - 1] != separator)) {
return false;
}
// next char is a separator, if any
if (((this.pos + 2) < this.pathPatternLength) &&
this.pathPatternData[this.pos + 2] != separator) {
return false;
}
return true;
}