Fix AntPathMatcher rule for combining with extensions

rstoyanchev · rstoyanchev · commit 33e723b4a870 · 2013-03-01T16:30:02.000-05:00
Before this fix AntPathMatcher had a special rule for combining
patterns with wildcards and extensions as follows:

"/*.*"  + "/*.html" =&gt; "/*.html"

This change ensures this rule never applies if the first pattern
contains URI variables.

Issue: SPR-10062
diff --git a/spring-core/src/main/java/org/springframework/util/AntPathMatcher.java b/spring-core/src/main/java/org/springframework/util/AntPathMatcher.java
@@ -317,7 +317,9 @@ else if (!StringUtils.hasText(pattern1)) {
 		else if (!StringUtils.hasText(pattern2)) {
 			return pattern1;
 		}
-		else if (!pattern1.equals(pattern2) && !pattern1.contains("{") && match(pattern1, pattern2)) {
+
+		boolean pattern1ContainsUriVar = pattern1.indexOf('{') != -1;
+		if (!pattern1.equals(pattern2) && !pattern1ContainsUriVar && match(pattern1, pattern2)) {
 			// /* + /hotel -> /hotel ; "/*.*" + "/*.html" -> /*.html
 			// However /user + /user -> /usr/user ; /{foo} + /bar -> /{foo}/bar
 			return pattern2;
@@ -344,7 +346,7 @@ else if (pattern1.endsWith("/**")) {
 		}
 		else {
 			int dotPos1 = pattern1.indexOf('.');
-			if (dotPos1 == -1) {
+			if (dotPos1 == -1 || pattern1ContainsUriVar) {
 				// simply concatenate the two patterns
 				if (pattern1.endsWith("/") || pattern2.startsWith("/")) {
 					return pattern1 + pattern2;
diff --git a/spring-core/src/test/java/org/springframework/util/AntPathMatcherTests.java b/spring-core/src/test/java/org/springframework/util/AntPathMatcherTests.java
@@ -412,6 +412,7 @@ public void combine() {
 		assertEquals("/*.html", pathMatcher.combine("/*.*", "/*.html"));
 		assertEquals("/{foo}/bar", pathMatcher.combine("/{foo}", "/bar"));	// SPR-8858
 		assertEquals("/user/user", pathMatcher.combine("/user", "/user"));	// SPR-7970
+		assertEquals("/{foo:.*[^0-9].*}/edit/", pathMatcher.combine("/{foo:.*[^0-9].*}", "/edit/")); // SPR-10062
 	}
 
 	@Test

Original file line number	Diff line number	Diff line change
`@@ -412,6 +412,7 @@ public void combine() {`
`412`	`412`	`assertEquals("/.html", pathMatcher.combine("/.", "/.html"));`
`413`	`413`	`assertEquals("/{foo}/bar", pathMatcher.combine("/{foo}", "/bar")); // SPR-8858`
`414`	`414`	`assertEquals("/user/user", pathMatcher.combine("/user", "/user")); // SPR-7970`
	`415`	`+ assertEquals("/{foo:.[^0-9].}/edit/", pathMatcher.combine("/{foo:.[^0-9].}", "/edit/")); // SPR-10062`
`415`	`416`	`}`
`416`	`417`
`417`	`418`	`@Test`