From 85461d41b2f92db680a6195f79c7291ef11fa46c Mon Sep 17 00:00:00 2001
From: Spencer Gibb <spencer@gibb.us>
Date: Wed, 21 Mar 2018 11:47:08 -0400
Subject: [PATCH] Checks path for encoding as well as query.

fixes gh-233
---
 .../filter/RouteToRequestUrlFilter.java       |  4 ++--
 .../factory/HystrixGatewayFilterFactory.java  |  4 ++--
 .../support/ServerWebExchangeUtils.java       |  9 ++++----
 .../filter/RouteToRequestUrlFilterTests.java  | 22 +++++++++++++++++++
 ...estParameterGatewayFilterFactoryTests.java |  4 ++--
 5 files changed, 32 insertions(+), 11 deletions(-)

diff --git a/spring-cloud-gateway-core/src/main/java/org/springframework/cloud/gateway/filter/RouteToRequestUrlFilter.java b/spring-cloud-gateway-core/src/main/java/org/springframework/cloud/gateway/filter/RouteToRequestUrlFilter.java
index 361131aff..fd8795174 100644
--- a/spring-cloud-gateway-core/src/main/java/org/springframework/cloud/gateway/filter/RouteToRequestUrlFilter.java
+++ b/spring-cloud-gateway-core/src/main/java/org/springframework/cloud/gateway/filter/RouteToRequestUrlFilter.java
@@ -30,7 +30,7 @@ import org.springframework.web.util.UriComponentsBuilder;
 import static org.springframework.cloud.gateway.support.ServerWebExchangeUtils.GATEWAY_REQUEST_URL_ATTR;
 import static org.springframework.cloud.gateway.support.ServerWebExchangeUtils.GATEWAY_ROUTE_ATTR;
 import static org.springframework.cloud.gateway.support.ServerWebExchangeUtils.GATEWAY_SCHEME_PREFIX_ATTR;
-import static org.springframework.cloud.gateway.support.ServerWebExchangeUtils.containsEncodedQuery;
+import static org.springframework.cloud.gateway.support.ServerWebExchangeUtils.containsEncodedParts;
 
 import reactor.core.publisher.Mono;
 
@@ -58,7 +58,7 @@ public class RouteToRequestUrlFilter implements GlobalFilter, Ordered {
 		}
 		log.trace("RouteToRequestUrlFilter start");
 		URI uri = exchange.getRequest().getURI();
-		boolean encoded = containsEncodedQuery(uri);
+		boolean encoded = containsEncodedParts(uri);
 		URI routeUri = route.getUri();
 
 		if (hasAnotherScheme(routeUri)) {
diff --git a/spring-cloud-gateway-core/src/main/java/org/springframework/cloud/gateway/filter/factory/HystrixGatewayFilterFactory.java b/spring-cloud-gateway-core/src/main/java/org/springframework/cloud/gateway/filter/factory/HystrixGatewayFilterFactory.java
index bbbd97b6e..c5be7b7f2 100644
--- a/spring-cloud-gateway-core/src/main/java/org/springframework/cloud/gateway/filter/factory/HystrixGatewayFilterFactory.java
+++ b/spring-cloud-gateway-core/src/main/java/org/springframework/cloud/gateway/filter/factory/HystrixGatewayFilterFactory.java
@@ -38,7 +38,7 @@ import com.netflix.hystrix.exception.HystrixRuntimeException;
 
 import static com.netflix.hystrix.exception.HystrixRuntimeException.FailureType.TIMEOUT;
 import static org.springframework.cloud.gateway.support.ServerWebExchangeUtils.GATEWAY_REQUEST_URL_ATTR;
-import static org.springframework.cloud.gateway.support.ServerWebExchangeUtils.containsEncodedQuery;
+import static org.springframework.cloud.gateway.support.ServerWebExchangeUtils.containsEncodedParts;
 import static org.springframework.cloud.gateway.support.ServerWebExchangeUtils.setResponseStatus;
 
 import reactor.core.publisher.Mono;
@@ -123,7 +123,7 @@ public class HystrixGatewayFilterFactory extends AbstractGatewayFilterFactory<Hy
 			//TODO: copied from RouteToRequestUrlFilter
 			URI uri = exchange.getRequest().getURI();
 			//TODO: assume always?
-			boolean encoded = containsEncodedQuery(uri);
+			boolean encoded = containsEncodedParts(uri);
 			URI requestUrl = UriComponentsBuilder.fromUri(uri)
 					.host(null)
 					.port(null)
diff --git a/spring-cloud-gateway-core/src/main/java/org/springframework/cloud/gateway/support/ServerWebExchangeUtils.java b/spring-cloud-gateway-core/src/main/java/org/springframework/cloud/gateway/support/ServerWebExchangeUtils.java
index 3db248a80..4f8d2e183 100644
--- a/spring-cloud-gateway-core/src/main/java/org/springframework/cloud/gateway/support/ServerWebExchangeUtils.java
+++ b/spring-cloud-gateway-core/src/main/java/org/springframework/cloud/gateway/support/ServerWebExchangeUtils.java
@@ -68,11 +68,10 @@ public class ServerWebExchangeUtils {
 		return response;
 	}
 
-	public static boolean containsEncodedQuery(URI uri) {
-		if (uri.getRawQuery() == null) {
-			return false;
-		}
-		return uri.getRawQuery().contains("%");
+	public static boolean containsEncodedParts(URI uri) {
+		boolean encoded = (uri.getRawQuery() != null && uri.getRawQuery().contains("%"))
+				|| (uri.getPath() != null && uri.getRawPath().contains("%"));
+		return encoded;
 	}
 
 	public static HttpStatus parse(String statusString) {
diff --git a/spring-cloud-gateway-core/src/test/java/org/springframework/cloud/gateway/filter/RouteToRequestUrlFilterTests.java b/spring-cloud-gateway-core/src/test/java/org/springframework/cloud/gateway/filter/RouteToRequestUrlFilterTests.java
index a0afe8761..2a26d596b 100644
--- a/spring-cloud-gateway-core/src/test/java/org/springframework/cloud/gateway/filter/RouteToRequestUrlFilterTests.java
+++ b/spring-cloud-gateway-core/src/test/java/org/springframework/cloud/gateway/filter/RouteToRequestUrlFilterTests.java
@@ -102,6 +102,28 @@ public class RouteToRequestUrlFilterTests {
 		assertThat(uri.getRawQuery()).isEqualTo("a=b&c=d%5B%5D");
 	}
 
+	@Test
+	public void encodedUrl() {
+		URI url = UriComponentsBuilder.fromUriString("http://localhost/abc def/get").buildAndExpand().encode().toUri();
+
+		// prove that it is encoded
+		assertThat(url.getRawPath()).isEqualTo("/abc%20def/get");
+
+		assertThat(url).hasPath("/abc def/get");
+
+		MockServerHttpRequest request = MockServerHttpRequest
+				.method(HttpMethod.GET, url)
+				.build();
+
+		ServerWebExchange webExchange = testFilter(request, "http://myhost");
+		URI uri = webExchange.getRequiredAttribute(GATEWAY_REQUEST_URL_ATTR);
+		assertThat(uri).hasScheme("http").hasHost("myhost")
+				.hasPath("/abc def/get");
+
+		// prove that it is not double encoded
+		assertThat(uri.getRawPath()).isEqualTo("/abc%20def/get");
+	}
+
 	@Test
 	public void unencodedParameters() {
 		URI url = URI.create("http://localhost/get?a=b&c=d[]");
diff --git a/spring-cloud-gateway-core/src/test/java/org/springframework/cloud/gateway/filter/factory/AddRequestParameterGatewayFilterFactoryTests.java b/spring-cloud-gateway-core/src/test/java/org/springframework/cloud/gateway/filter/factory/AddRequestParameterGatewayFilterFactoryTests.java
index e3e704866..732cffd5c 100644
--- a/spring-cloud-gateway-core/src/test/java/org/springframework/cloud/gateway/filter/factory/AddRequestParameterGatewayFilterFactoryTests.java
+++ b/spring-cloud-gateway-core/src/test/java/org/springframework/cloud/gateway/filter/factory/AddRequestParameterGatewayFilterFactoryTests.java
@@ -40,7 +40,7 @@ import org.springframework.web.util.UriComponentsBuilder;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.springframework.boot.test.context.SpringBootTest.WebEnvironment.RANDOM_PORT;
-import static org.springframework.cloud.gateway.support.ServerWebExchangeUtils.containsEncodedQuery;
+import static org.springframework.cloud.gateway.support.ServerWebExchangeUtils.containsEncodedParts;
 import static org.springframework.cloud.gateway.test.TestUtils.getMap;
 
 @RunWith(SpringRunner.class)
@@ -81,7 +81,7 @@ public class AddRequestParameterGatewayFilterFactoryTests extends BaseWebClientT
 			query = "";
 		}
 		URI uri = UriComponentsBuilder.fromUriString(this.baseUri+"/get" + query).build(true).toUri();
-		boolean checkForEncodedValue = containsEncodedQuery(uri);
+		boolean checkForEncodedValue = containsEncodedParts(uri);
 		testClient.get()
 				.uri(uri)
 				.header("Host", host)