Use undecoded pathWithinApplication in WebFlux

Introduce pathWithinApplication() in ServerHttpRequest and use it for
request mapping purposes instead of LookupPath.

In turn this means that for request mapping purposes:
1) the path is not decoded
2) suffix pattern matching is not supported

Issue: SPR-15640

Author: rstoyanchev

spring-web/src/main/java/org/springframework/http/server/reactive/ContextPathCompositeHandler.java

@@ -4,11 +4,10 @@
 import java.util.LinkedHashMap;
 import java.util.Map;
 
+import reactor.core.publisher.Mono;
+
 import org.springframework.http.HttpStatus;
 import org.springframework.util.Assert;
-import org.springframework.util.StringUtils;
-
-import reactor.core.publisher.Mono;
 
 /**
  * {@code HttpHandler} delegating requests to one of several {@code HttpHandler}'s
@@ -49,7 +48,8 @@ private static void assertValidContextPath(String contextPath) {
 
 	@Override
 	public Mono<Void> handle(ServerHttpRequest request, ServerHttpResponse response) {
-		String path = getPathWithinApplication(request);
+		// Remove underlying context path first (e.g. Servlet container)
+		String path = request.getPathWithinApplication();
 		return this.handlerMap.entrySet().stream()
 				.filter(entry -> path.startsWith(entry.getKey()))
 				.findFirst()
@@ -65,18 +65,4 @@ public Mono<Void> handle(ServerHttpRequest request, ServerHttpResponse response)
 				});
 	}
 
-	/**
-	 * Get the path within the "native" context path of the underlying server,
-	 * for example when running on a Servlet container.
-	 */
-	private String getPathWithinApplication(ServerHttpRequest request) {
-		String path = request.getURI().getRawPath();
-		String contextPath = request.getContextPath();
-		if (!StringUtils.hasText(contextPath)) {
-			return path;
-		}
-		int length = contextPath.length();
-		return (path.length() > length ? path.substring(length) : "");
-	}
-
 }

spring-web/src/main/java/org/springframework/http/server/reactive/ServerHttpRequest.java

@@ -24,6 +24,7 @@
 import org.springframework.http.ReactiveHttpInputMessage;
 import org.springframework.lang.Nullable;
 import org.springframework.util.MultiValueMap;
+import org.springframework.util.StringUtils;
 
 /**
  * Represents a reactive server-side HTTP request
@@ -35,16 +36,36 @@
 public interface ServerHttpRequest extends HttpRequest, ReactiveHttpInputMessage {
 
 	/**
-	 * Returns the portion of the URL path that represents the context path for the
-	 * current {@link HttpHandler}. The context path is always at the beginning of
-	 * the request path. It starts with "/" but but does not end with "/".
-	 * <p>This method may return an empty string if no context path is configured.
+	 * Returns the portion of the URL path that represents the application.
+	 * The context path is always at the beginning of the path and starts but
+	 * does not end with "/". It is shared for URLs of the same application.
+	 * <p>The context path may come from the underlying runtime API such as
+	 * when deploying as a WAR to a Servlet container or it may also be assigned
+	 * through the use of {@link ContextPathCompositeHandler} or both.
+	 * <p>The context path is not decoded.
 	 * @return the context path (not decoded) or an empty string
 	 */
 	default String getContextPath() {
 		return "";
 	}
 
+	/**
+	 * Returns the portion of the URL path after the {@link #getContextPath()
+	 * contextPath}. The returned path is not decoded.
+	 * @return the path under the contextPath
+	 */
+	default String getPathWithinApplication() {
+		String path = getURI().getRawPath();
+		String contextPath = getContextPath();
+		if (StringUtils.hasText(contextPath)) {
+			int length = contextPath.length();
+			return (path.length() > length ? path.substring(length) : "");
+		}
+		else {
+			return path;
+		}
+	}
+
 	/**
 	 * Return a read-only map with parsed and decoded query parameter values.
 	 */

spring-web/src/main/java/org/springframework/web/cors/reactive/UrlBasedCorsConfigurationSource.java

@@ -25,7 +25,6 @@
 import org.springframework.util.PathMatcher;
 import org.springframework.web.cors.CorsConfiguration;
 import org.springframework.web.server.ServerWebExchange;
-import org.springframework.web.server.support.LookupPath;
 import org.springframework.web.util.pattern.ParsingPathMatcher;
 
 /**
@@ -81,7 +80,7 @@ public void registerCorsConfiguration(String path, CorsConfiguration config) {
 
 	@Override
 	public CorsConfiguration getCorsConfiguration(ServerWebExchange exchange) {
-		String lookupPath = LookupPath.getCurrent(exchange).getPath();
+		String lookupPath = exchange.getRequest().getPathWithinApplication();
 		for (Map.Entry<String, CorsConfiguration> entry : this.corsConfigurations.entrySet()) {
 			if (this.pathMatcher.match(entry.getKey(), lookupPath)) {
 				return entry.getValue();

spring-web/src/main/java/org/springframework/web/server/support/HttpRequestPathHelper.java

@@ -36,7 +36,7 @@
  */
 public class HttpRequestPathHelper {
 
-	private boolean urlDecode = true;
+	private boolean urlDecode = false;
 
 
 	// TODO: sanitize path, default/request encoding?, remove path params?
@@ -58,26 +58,6 @@ public boolean shouldUrlDecode() {
 	}
 
 
-	public LookupPath getLookupPathForRequest(ServerWebExchange exchange) {
-		String path = getPathWithinApplication(exchange.getRequest());
-		path = (shouldUrlDecode() ? decode(exchange, path) : path);
-		int begin = path.lastIndexOf('/') + 1;
-		int end = path.length();
-		int paramIndex = path.indexOf(';', begin);
-		int extIndex = path.lastIndexOf('.', paramIndex != -1 ? paramIndex : end);
-		return new LookupPath(path, extIndex, paramIndex);
-	}
-
-	private String getPathWithinApplication(ServerHttpRequest request) {
-		String contextPath = request.getContextPath();
-		String path = request.getURI().getRawPath();
-		if (!StringUtils.hasText(contextPath)) {
-			return path;
-		}
-		int contextLength = contextPath.length();
-		return (path.length() > contextLength ? path.substring(contextLength) : "");
-	}
-
 	private String decode(ServerWebExchange exchange, String path) {
 		// TODO: look up request encoding?
 		try {

spring-web/src/main/java/org/springframework/web/server/support/LookupPath.java

@@ -21,8 +21,6 @@
 import org.springframework.mock.http.server.reactive.test.MockServerHttpRequest;
 import org.springframework.web.cors.CorsConfiguration;
 import org.springframework.web.server.ServerWebExchange;
-import org.springframework.web.server.support.HttpRequestPathHelper;
-import org.springframework.web.server.support.LookupPath;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNull;
@@ -41,7 +39,6 @@ public class UrlBasedCorsConfigurationSourceTests {
 	@Test
 	public void empty() {
 		ServerWebExchange exchange = MockServerHttpRequest.get("/bar/test.html").toExchange();
-		LookupPath.getOrCreate(exchange, new HttpRequestPathHelper());
 		assertNull(this.configSource.getCorsConfiguration(exchange));
 	}
 
@@ -51,11 +48,9 @@ public void registerAndMatch() {
 		this.configSource.registerCorsConfiguration("/bar/**", config);
 
 		ServerWebExchange exchange = MockServerHttpRequest.get("/foo/test.html").toExchange();
-		LookupPath.getOrCreate(exchange, new HttpRequestPathHelper());
 		assertNull(this.configSource.getCorsConfiguration(exchange));
 
 		exchange = MockServerHttpRequest.get("/bar/test.html").toExchange();
-		LookupPath.getOrCreate(exchange, new HttpRequestPathHelper());
 		assertEquals(config, this.configSource.getCorsConfiguration(exchange));
 	}