You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@grails.apache.org by jd...@apache.org on 2026/10/16 17:02:06 UTC
(grails-core) 02/06: Combine patterns and extract template variables as AntPathMatcher documents
This is an automated email from the ASF dual-hosted git repository.
jdaugherty pushed a commit to branch 7.0.x
in repository https://gitbox.apache.org/repos/asf/grails-core.git
commit c471280c537a8d682fe6f1deeb38db810ea9933a
Author: James Daugherty <jd...@jdresources.net>
AuthorDate: Fri Oct 16 12:55:04 2026 -0400
Combine patterns and extract template variables as AntPathMatcher documents
combine() keyed its file-extension branch off any dot in the first pattern,
so "/report.html" + "/other.txt" returned "/report.html" and two wildcard
extensions such as "/*.html" + "/*.txt" never raised the documented
IllegalArgumentException. It now takes that branch only for a "*." pattern,
as Spring's AntPathMatcher does, concatenates everything else, treats ".*"
and a missing extension as "any", and rejects two specific extensions.
AntPathStringMatcher.matchStrings assumed one capturing group per template
variable and threw IndexOutOfBoundsException when a variable regex added a
group of its own. It now rejects that with Spring's IllegalArgumentException
advising non-capturing groups; matching without extraction is unchanged.
---
.../org/grails/io/support/AntPathMatcher.java | 36 ++++++++++++----------
.../grails/io/support/AntPathMatcherSpec.groovy | 29 ++++++++++++++++-
2 files changed, 47 insertions(+), 18 deletions(-)
diff --git a/grails-bootstrap/src/main/groovy/org/grails/io/support/AntPathMatcher.java b/grails-bootstrap/src/main/groovy/org/grails/io/support/AntPathMatcher.java
index 78dbf8d42f..5609ac9c6a 100644
--- a/grails-bootstrap/src/main/groovy/org/grails/io/support/AntPathMatcher.java
+++ b/grails-bootstrap/src/main/groovy/org/grails/io/support/AntPathMatcher.java
@@ -306,7 +306,8 @@ public class AntPathMatcher {
if (!hasText(pattern2)) {
return pattern1;
}
- if (!pattern1.contains("{") && match(pattern1, pattern2)) {
+ boolean pattern1ContainsUriVar = pattern1.indexOf('{') != -1;
+ if (!pattern1ContainsUriVar && match(pattern1, pattern2)) {
return pattern2;
}
if (pattern1.endsWith("/*")) {
@@ -325,31 +326,26 @@ public class AntPathMatcher {
// /hotels/** + booking -> /hotels/**/booking
return pattern1 + "/" + pattern2;
}
- int dotPos1 = pattern1.indexOf('.');
- if (dotPos1 == -1) {
+ int starDotPos1 = pattern1.indexOf("*.");
+ if (pattern1ContainsUriVar || starDotPos1 == -1 || pathSeparator.equals(".")) {
// simply concatenate the two patterns
if (pattern1.endsWith("/") || pattern2.startsWith("/")) {
return pattern1 + pattern2;
}
return pattern1 + "/" + pattern2;
}
- String fileName1 = pattern1.substring(0, dotPos1);
- String extension1 = pattern1.substring(dotPos1);
- String fileName2;
- String extension2;
+ String extension1 = pattern1.substring(starDotPos1 + 1);
int dotPos2 = pattern2.indexOf('.');
- if (dotPos2 != -1) {
- fileName2 = pattern2.substring(0, dotPos2);
- extension2 = pattern2.substring(dotPos2);
+ String fileName2 = dotPos2 == -1 ? pattern2 : pattern2.substring(0, dotPos2);
+ String extension2 = dotPos2 == -1 ? "" : pattern2.substring(dotPos2);
+ boolean extension1All = extension1.equals(".*") || extension1.isEmpty();
+ boolean extension2All = extension2.equals(".*") || extension2.isEmpty();
+ if (!extension1All && !extension2All) {
+ throw new IllegalArgumentException("Cannot combine patterns: " + pattern1 + " vs " + pattern2);
}
- else {
- fileName2 = pattern2;
- extension2 = "";
- }
- String fileName = fileName1.endsWith("*") ? fileName2 : fileName1;
- String extension = extension1.startsWith("*") ? extension2 : extension1;
+ String extension = extension1All ? extension2 : extension1;
- return fileName + extension;
+ return fileName2 + extension;
}
private boolean hasText(String txt) {
@@ -538,6 +534,12 @@ public class AntPathMatcher {
return false;
}
if (uriTemplateVariables != null) {
+ if (variableNames.size() != matcher.groupCount()) {
+ throw new IllegalArgumentException("The number of capturing groups in the pattern segment " +
+ pattern + " does not match the number of URI template variables it defines, " +
+ "which can occur if capturing groups are used in a URI template regex. " +
+ "Use non-capturing groups instead.");
+ }
for (int i = 1, count = matcher.groupCount(); i <= count; i++) {
String name = variableNames.get(i - 1);
String value = matcher.group(i);
diff --git a/grails-bootstrap/src/test/groovy/org/grails/io/support/AntPathMatcherSpec.groovy b/grails-bootstrap/src/test/groovy/org/grails/io/support/AntPathMatcherSpec.groovy
index 98c8919939..0f1da5a781 100644
--- a/grails-bootstrap/src/test/groovy/org/grails/io/support/AntPathMatcherSpec.groovy
+++ b/grails-bootstrap/src/test/groovy/org/grails/io/support/AntPathMatcherSpec.groovy
@@ -199,10 +199,28 @@ class AntPathMatcherSpec extends Specification {
'/{hotel}' | '/booking' | '/{hotel}/booking'
'/*.html' | '/hotels.html' | '/hotels.html'
'/*.html' | '/hotels' | '/hotels.html'
+ '/*.html' | '/hotels.*' | '/hotels.html'
+ '/*.*' | '/*.html' | '/*.html'
+ '/report.html' | '/other.txt' | '/report.html/other.txt'
'/users/{id:[}' | '/users/42' | '/users/{id:[}/users/42'
' ' | 'booking' | ' /booking'
}
+ @Unroll
+ void 'combine rejects #first and #second because both name a wildcard extension'() {
+ when:
+ matcher.combine(first, second)
+
+ then:
+ def error = thrown(IllegalArgumentException)
+ error.message == "Cannot combine patterns: $first vs $second"
+
+ where:
+ first | second
+ '/*.html' | '/*.txt'
+ '/*.html' | '/hotels.txt'
+ }
+
@Unroll
void 'recognize wildcard patterns without treating URI templates as wildcards'() {
expect:
@@ -271,10 +289,19 @@ class AntPathMatcherSpec extends Specification {
operation << ['match', 'matchStart', 'extractUriTemplateVariables']
}
- void 'capturing groups in a template regex still match'() {
+ void 'capturing groups in a template regex match but cannot be extracted as variables'() {
expect:
matcher.match('/users/{id:(ab|cd)}', '/users/ab')
!matcher.match('/users/{id:(ab|cd)}', '/users/ef')
+ matcher.extractUriTemplateVariables('/users/{id:(?:ab|cd)}', '/users/ab') == [id: 'ab']
+
+ when:
+ matcher.extractUriTemplateVariables('/users/{id:(ab|cd)}', '/users/ab')
+
+ then:
+ def error = thrown(IllegalArgumentException)
+ error.message.contains('does not match the number of URI template variables')
+ error.message.endsWith('Use non-capturing groups instead.')
}
@Unroll