root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Throw exception using capturing patterns in AntPathMatcher 

Closes gh-27688
This commit is contained in:
Arjen Poutsma 2021-11-17 16:52:17 +01:00
parent 29572600dc
commit 5fbdd6dcfe
2 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
spring-core/src/main/java/org/springframework/util/AntPathMatcher.java
View File

@ -733,6 +733,10 @@ public class AntPathMatcher implements PathMatcher {
} }
for (int i = 1; i <= matcher.groupCount(); i++) { for (int i = 1; i <= matcher.groupCount(); i++) {
String name = this.variableNames.get(i - 1); String name = this.variableNames.get(i - 1);
if (name.startsWith("*")) {
throw new IllegalArgumentException("Capturing patterns (" + name + ") are not " +
"supported by the AntPathMatcher. Use the PathPatternParser instead.");
}
String value = matcher.group(i); String value = matcher.group(i);
uriTemplateVariables.put(name, value); uriTemplateVariables.put(name, value);
} }

14
spring-webmvc/src/test/java/org/springframework/web/servlet/handler/PathMatchingUrlHandlerMappingTests.java
View File

@ -155,13 +155,15 @@ public class PathMatchingUrlHandlerMappingTests {
chain = getHandler(mapping, wac, request); chain = getHandler(mapping, wac, request);
assertThat(chain.getHandler()).isSameAs(defaultBean); assertThat(chain.getHandler()).isSameAs(defaultBean);
request = new MockHttpServletRequest("GET", "/administrator/testing/longer/bla"); if (mapping.getPatternParser() != null) {
chain = getHandler(mapping, wac, request); request = new MockHttpServletRequest("GET", "/administrator/testing/longer/bla");
assertThat(chain.getHandler()).isSameAs(bean); chain = getHandler(mapping, wac, request);
assertThat(chain.getHandler()).isSameAs(bean);
request = new MockHttpServletRequest("GET", "/administrator/testing/longer/test.jsp"); request = new MockHttpServletRequest("GET", "/administrator/testing/longer/test.jsp");
chain = getHandler(mapping, wac, request); chain = getHandler(mapping, wac, request);
assertThat(chain.getHandler()).isSameAs(bean); assertThat(chain.getHandler()).isSameAs(bean);
}
request = new MockHttpServletRequest("GET", "/administrator/testing/longer2/notmatching/notmatching"); request = new MockHttpServletRequest("GET", "/administrator/testing/longer2/notmatching/notmatching");
chain = getHandler(mapping, wac, request); chain = getHandler(mapping, wac, request);