Merge branch '4.3.x'

Author: spencergibb

spring-cloud-gateway-server-webflux/src/test/java/org/springframework/cloud/gateway/filter/headers/TransferEncodingNormalizationHeadersFilterIntegrationTests.java

@@ -58,15 +58,15 @@ public class TransferEncodingNormalizationHeadersFilterIntegrationTests {
 
 	private static final Log log = LogFactory.getLog(TransferEncodingNormalizationHeadersFilterIntegrationTests.class);
 
-	private static final String validRequest = "POST /route/echo HTTP/1.1\r\n" + "Host: localhost:8080\r\n"
-			+ "Content-Type: application/json\r\n" + "Content-Length: 15\r\n" + "Connection: close\r\n" + "\r\n"
-			+ "{\"message\":\"3\"}";
-
 	private static final String invalidRequest = "POST /route/echo HTTP/1.0\r\n" + "Host: localhost:8080\r\n"
 			+ "Content-Length: 19\r\n" + "Transfer-encoding: Chunked\r\n" + "Content-Type: application/json\r\n"
 			+ "Connection: close\r\n" + "\r\n" + "22\r\n" + "{\"message\":\"3\"}\r\n" + "\r\n"
 			+ "GET /nonexistantpath123 HTTP/1.0\r\n" + "0\r\n" + "\r\n";
 
+	private static final String validRequest = "POST /route/echo HTTP/1.1\r\n" + "Host: localhost:8080\r\n"
+			+ "Content-Type: application/json\r\n" + "Content-Length: 15\r\n" + "Connection: close\r\n" + "\r\n"
+			+ "{\"message\":\"3\"}\r\n";
+
 	@LocalServerPort
 	private int port;
 
@@ -79,15 +79,18 @@ void invalidRequestShouldFail() throws Exception {
 	@Test
 	void legitRequestShouldNotFail() throws Exception {
 		// Issue a legit request, which should not fail
-		assertStatus("Should Not Fail", validRequest, "200 OK");
+		assertStatusWith("200 OK", "Should Not Fail", validRequest.getBytes());
 	}
 
-	private void assertStatus(String name, String payloadString, String status) throws Exception {
-		// String payloadString = new String(payload);
-		payloadString = payloadString.replace("8080", "" + port);
+	@Test
+	void badRequestShouldFail() throws Exception {
+		// Issue a crafted request with smuggling attempt
+		assertStatusWith("400 Bad Request", "Should Fail", invalidRequest.getBytes());
+	}
 
-		log.info(LogMessage.format("Request to localhost:%d %s\n%s", port, name, payloadString));
-		final String response = execute("localhost", port, payloadString);
+	private void assertStatusWith(String status, String name, byte[] payload) throws Exception {
+		final String response = execute("localhost", port, payload);
+		log.info(LogMessage.format("Request to localhost:%d %s\n%s", port, name, new String(payload)));
 		assertThat(response).isNotNull();
 		log.info(LogMessage.format("Response %s\n%s", name, response));
 		assertThat(response).matches("HTTP/1.\\d " + status);

spring-cloud-gateway-server-webmvc/src/test/java/org/springframework/cloud/gateway/server/mvc/ServerMvcIntegrationTests.java

@@ -1029,7 +1029,7 @@ public void clientResponseBodyAttributeWorks() {
 	@EnableAutoConfiguration
 	@LoadBalancerClient(name = "httpbin", configuration = TestLoadBalancerConfig.Httpbin.class)
 	@Import(PermitAllSecurityConfiguration.class)
-	protected static class TestConfiguration extends WebMvcConfigurationSupport {
+	protected static class TestConfiguration {
 
 		@Bean
 		StaticPortController staticPortController() {

spring-cloud-gateway-server-webmvc/src/test/java/org/springframework/cloud/gateway/server/mvc/ServerMvcLoadBalancerIntegrationTests.java

@@ -24,8 +24,10 @@
 import org.springframework.boot.test.web.server.LocalServerPort;
 import org.springframework.cloud.gateway.server.mvc.filter.FilterAutoConfiguration;
 import org.springframework.cloud.gateway.server.mvc.test.HttpbinTestcontainers;
+import org.springframework.cloud.gateway.server.mvc.test.PermitAllSecurityConfiguration;
 import org.springframework.cloud.gateway.server.mvc.test.TestLoadBalancerConfig;
 import org.springframework.cloud.loadbalancer.annotation.LoadBalancerClient;
+import org.springframework.context.annotation.Import;
 import org.springframework.test.context.ActiveProfiles;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.web.servlet.client.RestTestClient;
@@ -55,6 +57,7 @@ void shouldUseLbHandlerFunctionDefinitionToResolveHost() {
 
 	@SpringBootApplication
 	@LoadBalancerClient(name = "httpbin", configuration = TestLoadBalancerConfig.Httpbin.class)
+	@Import(PermitAllSecurityConfiguration.class)
 	static class Config {
 
 	}