From f786feb5e1183177e97935f7be2603b94597c4b3 Mon Sep 17 00:00:00 2001
From: Andy Clement <aclement@pivotal.io>
Date: Tue, 10 Jan 2017 17:24:47 -0800
Subject: [PATCH] Ensure correct recognition for start of match-the-rest path
 elements

Without this change the /{*foobar} and /** path elements were
not correctly enforcing that the first character they encounter
must be a separator. This problem was introduced when adjusting
the generated path element chains for these constructs. Originally
the generated chain included a SeparatorPathElement but in order for
these to match 'nothing' (i.e. /foo matches /foo/{*foobar}) the separator
path element was removed, so the separator enforcement needed moving
into the CaptureTheRestPathElement and WildcardTheRestPathElement.

Issue: SPR-14544
---
 .../web/util/patterns/CaptureTheRestPathElement.java   |  6 ++++++
 .../web/util/patterns/WildcardTheRestPathElement.java  |  5 +++++
 .../web/util/patterns/PathPatternMatcherTests.java     | 10 ++++++++++
 3 files changed, 21 insertions(+)

diff --git a/spring-web/src/main/java/org/springframework/web/util/patterns/CaptureTheRestPathElement.java b/spring-web/src/main/java/org/springframework/web/util/patterns/CaptureTheRestPathElement.java
index ff2076abb8..659b28e74f 100644
--- a/spring-web/src/main/java/org/springframework/web/util/patterns/CaptureTheRestPathElement.java
+++ b/spring-web/src/main/java/org/springframework/web/util/patterns/CaptureTheRestPathElement.java
@@ -45,6 +45,12 @@ class CaptureTheRestPathElement extends PathElement {
 		// No need to handle 'match start' checking as this captures everything
 		// anyway and cannot be followed by anything else
 		// assert next == null
+		
+		// If there is more data, it must start with the separator
+		if (candidateIndex<matchingContext.candidateLength &&
+			matchingContext.candidate[candidateIndex] != separator) {
+			return false;
+		}
 		while ((candidateIndex+1)<matchingContext.candidateLength &&
 				matchingContext.candidate[candidateIndex+1] == separator) {
 			candidateIndex++;
diff --git a/spring-web/src/main/java/org/springframework/web/util/patterns/WildcardTheRestPathElement.java b/spring-web/src/main/java/org/springframework/web/util/patterns/WildcardTheRestPathElement.java
index da5e8d35a9..5f5c1984df 100644
--- a/spring-web/src/main/java/org/springframework/web/util/patterns/WildcardTheRestPathElement.java
+++ b/spring-web/src/main/java/org/springframework/web/util/patterns/WildcardTheRestPathElement.java
@@ -34,6 +34,11 @@ class WildcardTheRestPathElement extends PathElement {
 
 	@Override
 	public boolean matches(int candidateIndex, MatchingContext matchingContext) {
+		// If there is more data, it must start with the separator
+		if (candidateIndex < matchingContext.candidateLength &&
+			matchingContext.candidate[candidateIndex] != separator) {
+			return false;
+		}
 		return true;
 	}
 
diff --git a/spring-web/src/test/java/org/springframework/web/util/patterns/PathPatternMatcherTests.java b/spring-web/src/test/java/org/springframework/web/util/patterns/PathPatternMatcherTests.java
index 80ed2c0a68..80fc06bf30 100644
--- a/spring-web/src/test/java/org/springframework/web/util/patterns/PathPatternMatcherTests.java
+++ b/spring-web/src/test/java/org/springframework/web/util/patterns/PathPatternMatcherTests.java
@@ -79,6 +79,11 @@ public class PathPatternMatcherTests {
 
 	@Test
 	public void captureTheRest() {
+		checkMatches("/resource/{*foobar}", "/resource");
+		checkNoMatch("/resource/{*foobar}", "/resourceX");
+		checkNoMatch("/resource/{*foobar}", "/resourceX/foobar");
+		checkMatches("/resource/{*foobar}", "/resource/foobar");
+		checkCapture("/resource/{*foobar}", "/resource/foobar", "foobar", "/foobar");
 		checkCapture("/customer/{*something}", "/customer/99", "something", "/99");
 		checkCapture("/customer/{*something}", "/customer/aa/bb/cc", "something",
 				"/aa/bb/cc");
@@ -124,6 +129,11 @@ public class PathPatternMatcherTests {
 		checkMatches("a/*","a/");
 		checkMatches("a/*","a/a");
 		checkNoMatch("a/*","a/a/");
+		
+		checkMatches("/resource/**", "/resource");
+		checkNoMatch("/resource/**", "/resourceX");
+		checkNoMatch("/resource/**", "/resourceX/foobar");
+		checkMatches("/resource/**", "/resource/foobar");
 	}
 
 	@Test