Throw exception using capturing patterns in AntPathMatcher

Closes gh-27688
spring-projects · Nov 17, 2021 · 5fbdd6d · 5fbdd6d
1 parent 2957260
commit 5fbdd6d
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 7 deletions.
diff --git a/spring-core/src/main/java/org/springframework/util/AntPathMatcher.java b/spring-core/src/main/java/org/springframework/util/AntPathMatcher.java
@@ -733,6 +733,10 @@ else if (this.pattern != null) {
 						}
 						for (int i = 1; i <= matcher.groupCount(); i++) {
 							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);
 							uriTemplateVariables.put(name, value);
 						}

diff --git a/...test/java/org/springframework/web/servlet/handler/PathMatchingUrlHandlerMappingTests.java b/...test/java/org/springframework/web/servlet/handler/PathMatchingUrlHandlerMappingTests.java
@@ -155,13 +155,15 @@ void actualPathMatching(SimpleUrlHandlerMapping mapping, WebApplicationContext w
 		chain = getHandler(mapping, wac, request);
 		assertThat(chain.getHandler()).isSameAs(defaultBean);
 
-		request = new MockHttpServletRequest("GET", "/administrator/testing/longer/bla");
-		chain = getHandler(mapping, wac, request);
-		assertThat(chain.getHandler()).isSameAs(bean);
-
-		request = new MockHttpServletRequest("GET", "/administrator/testing/longer/test.jsp");
-		chain = getHandler(mapping, wac, request);
-		assertThat(chain.getHandler()).isSameAs(bean);
+		if (mapping.getPatternParser() != null) {
+			request = new MockHttpServletRequest("GET", "/administrator/testing/longer/bla");
+			chain = getHandler(mapping, wac, request);
+			assertThat(chain.getHandler()).isSameAs(bean);
+
+			request = new MockHttpServletRequest("GET", "/administrator/testing/longer/test.jsp");
+			chain = getHandler(mapping, wac, request);
+			assertThat(chain.getHandler()).isSameAs(bean);
+		}
 
 		request = new MockHttpServletRequest("GET", "/administrator/testing/longer2/notmatching/notmatching");
 		chain = getHandler(mapping, wac, request);