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

Merge branch '2.1.x'

Browse Source
This commit is contained in:
Spencer Gibb
2019-09-11 12:07:18 -04:00
parent 6f5513052b 36ee685991
commit 7c8c9837cd
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
spring-cloud-gateway-core/src/main/java/org/springframework/cloud/gateway/support/ipresolver/XForwardedRemoteAddressResolver.java
View File

@@ -21,12 +21,12 @@ import java.util.Arrays;
import java.util.Collections;
import java.util.List;
import org.apache.logging.log4j.util.Strings;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.http.server.reactive.ServerHttpRequest;
import org.springframework.util.Assert;
import org.springframework.util.StringUtils;
import org.springframework.web.server.ServerWebExchange;
/**
@@ -129,7 +129,7 @@ public class XForwardedRemoteAddressResolver implements RemoteAddressResolver {
return Collections.emptyList();
}
List<String> values = Arrays.asList(xForwardedValues.get(0).split(", "));
if (values.size() == 1 && Strings.isBlank(values.get(0))) {
if (values.size() == 1 && !StringUtils.hasText(values.get(0))) {
return Collections.emptyList();
}
return values;

2
spring-cloud-gateway-core/src/test/java/org/springframework/cloud/gateway/filter/factory/RequestHeaderSizeGatewayFilterFactoryTest.java
View File

@@ -49,7 +49,7 @@ import static org.springframework.boot.test.context.SpringBootTest.WebEnvironmen
public class RequestHeaderSizeGatewayFilterFactoryTest extends BaseWebClientTests {
private static final String responseMesssage = "Request Header/s size is larger than "
+ "permissible limit. Request Header/s size is \\d*B where permissible limit is 46B";
+ "permissible limit. Request Header/s size is \\d*B where permissible limit is \\d*B";
@Test
public void setRequestSizeFilterWorks() {