Skip to content

AntPathPatternMatcher hardcoded "/" separator in variables matching and comparator #33085

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -462,7 +462,7 @@ protected AntPathStringMatcher getStringMatcher(String pattern) {
matcher = this.stringMatcherCache.get(pattern);
}
if (matcher == null) {
matcher = new AntPathStringMatcher(pattern, this.caseSensitive);
matcher = new AntPathStringMatcher(pattern, this.pathSeparator, this.caseSensitive);
if (cachePatterns == null && this.stringMatcherCache.size() >= CACHE_TURNOFF_THRESHOLD) {
// Try to adapt to the runtime situation that we're encountering:
// There are obviously too many different patterns coming in here...
@@ -646,8 +646,6 @@ public Comparator<String> getPatternComparator(String path) {
*/
protected static class AntPathStringMatcher {

private static final Pattern GLOB_PATTERN = Pattern.compile("\\?|\\*|\\{((?:\\{[^/]+?\\}|[^/{}]|\\\\[{}])+?)\\}");

private static final String DEFAULT_VARIABLE_PATTERN = "((?s).*)";

private final String rawPattern;
@@ -661,15 +659,11 @@ protected static class AntPathStringMatcher {

private final List<String> variableNames = new ArrayList<>();

public AntPathStringMatcher(String pattern) {
this(pattern, true);
}

public AntPathStringMatcher(String pattern, boolean caseSensitive) {
public AntPathStringMatcher(String pattern, String pathSeparator, boolean caseSensitive) {
this.rawPattern = pattern;
this.caseSensitive = caseSensitive;
StringBuilder patternBuilder = new StringBuilder();
Matcher matcher = GLOB_PATTERN.matcher(pattern);
Matcher matcher = getGlobPattern(pathSeparator).matcher(pattern);
int end = 0;
while (matcher.find()) {
patternBuilder.append(quote(pattern, end, matcher.start()));
@@ -710,6 +704,10 @@ else if (match.startsWith("{") && match.endsWith("}")) {
}
}

private static Pattern getGlobPattern(String pathSeparator) {
return Pattern.compile(String.format("\\?|\\*|\\{((?:\\{[^%s]+?\\}|[^%s{}]|\\\\[{}])+?)\\}", pathSeparator, pathSeparator));
}

private String quote(String s, int start, int end) {
if (start == end) {
return "";
Original file line number Diff line number Diff line change
@@ -41,6 +41,7 @@
class AntPathMatcherTests {

private final AntPathMatcher pathMatcher = new AntPathMatcher();
private final AntPathMatcher dotSeparatedPathMatcher = new AntPathMatcher(".");


@Test
@@ -357,6 +358,24 @@ void extractUriTemplateVariables() {
assertThat(result).isEqualTo(expected);
}

@Test // gh-26264
void extractUriTemplateVariablesFromDotSeparatedPath() {
Map<String, String> result = dotSeparatedPathMatcher.extractUriTemplateVariables("price.stock.{tickerSymbol}", "price.stock.aaa");
assertThat(result).isEqualTo(Collections.singletonMap("tickerSymbol", "aaa"));

result = dotSeparatedPathMatcher.extractUriTemplateVariables("price.stock.{ticker/symbol}", "price.stock.aaa");
assertThat(result).isEqualTo(Collections.singletonMap("ticker/symbol", "aaa"));

result = dotSeparatedPathMatcher.extractUriTemplateVariables("notification.**.{operation}", "notification.foo.update");
assertThat(result).isEqualTo(Collections.singletonMap("operation", "update"));

result = dotSeparatedPathMatcher.extractUriTemplateVariables("news.sports.feed/{type}", "news.sports.feed/xml");
assertThat(result).isEqualTo(Collections.singletonMap("type", "xml"));

result = dotSeparatedPathMatcher.extractUriTemplateVariables("news.sports.{operation}/*", "news.sports.feed/xml");
assertThat(result).isEqualTo(Collections.singletonMap("operation", "feed"));
}

@Test
void extractUriTemplateVariablesRegex() {
Map<String, String> result = pathMatcher