SpringCloud/spring-cloud-gateway
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Avoid direct URL construction.

Browse Source 
Fixes gh-2783
This commit is contained in:
spencergibb
2022-11-16 10:37:00 -05:00
parent 50922f7dd8
commit be8e3fb2c5
2 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
spring-cloud-gateway-server/src/main/java/org/springframework/cloud/gateway/filter/factory/RequestHeaderToRequestUriGatewayFilterFactory.java
View File

@@ -18,8 +18,6 @@ package org.springframework.cloud.gateway.filter.factory;
import java.net.MalformedURLException;
import java.net.URI;
import java.net.URISyntaxException;
import java.net.URL;
import java.util.Arrays;
import java.util.List;
import java.util.Optional;
@@ -71,9 +69,11 @@ public class RequestHeaderToRequestUriGatewayFilterFactory
String requestUrl = exchange.getRequest().getHeaders().getFirst(config.getName());
return Optional.ofNullable(requestUrl).map(url -> {
try {
return new URL(url).toURI();
URI uri = URI.create(url);
uri.toURL(); // validate url
return uri;
}
catch (MalformedURLException | URISyntaxException e) {
catch (IllegalArgumentException | MalformedURLException e) {
log.info("Request url is invalid : url={}, error={}", requestUrl, e.getMessage());
return null;
}

3
spring-cloud-gateway-server/src/test/java/org/springframework/cloud/gateway/filter/factory/RequestHeaderToRequestUriGatewayFilterFactoryIntegrationTests.java
View File

@@ -20,7 +20,6 @@ import java.net.URI;
import java.util.Optional;
import com.fasterxml.jackson.databind.JsonNode;
import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
import org.springframework.boot.SpringBootConfiguration;
@@ -48,7 +47,6 @@ public class RequestHeaderToRequestUriGatewayFilterFactoryIntegrationTests exten
int port;
@Test
@Disabled
public void changeUriWorkWithProperties() {
testClient.get().uri("/").header("Host", "www.changeuri.org")
.header("X-CF-Forwarded-Url", "http://localhost:" + port + "/actuator/health").exchange()
@@ -56,7 +54,6 @@ public class RequestHeaderToRequestUriGatewayFilterFactoryIntegrationTests exten
}
@Test
@Disabled
public void changeUriWorkWithDsl() {
testClient.get().uri("/").header("Host", "www.changeuri.org")
.header("X-Next-Url", "http://localhost:" + port + "/actuator/health").exchange()