Fix '**' parsing within a PathPattern segment

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-10-22 12:21:57 +02:00
parent d3c1e678c2
commit a5141b187a
2 changed files with 16 additions and 3 deletions
@@ -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;
}
@@ -85,9 +85,14 @@ class PathPatternParserTests {
@Test
void regexpSegmentIsNotWildcardSegment() {
// this is not double wildcard, it's / then **acb (an odd, unnecessary use of double *)
pathPattern = checkStructure("/**acb");
assertPathElements(pathPattern, SeparatorPathElement.class, RegexPathElement.class);
pathPattern = checkStructure("/a**bc");
assertPathElements(pathPattern, SeparatorPathElement.class, RegexPathElement.class);
pathPattern = checkStructure("/abc**");
assertPathElements(pathPattern, SeparatorPathElement.class, RegexPathElement.class);
}
@Test