Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Align server.tomcat.internal-proxies default with RemoteIPValve's default

Browse Source 
Closes gh-13798
This commit is contained in:
Andy Wilkinson
2018-09-11 11:59:13 +01:00
parent 615eeee033
commit 0bd7c8afba
3 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/ServerProperties.java
View File

@@ -610,7 +610,8 @@ public class ServerProperties
+ "127\\.\\d{1,3}\\.\\d{1,3}\\.\\d{1,3}|" // 127/8
+ "172\\.1[6-9]{1}\\.\\d{1,3}\\.\\d{1,3}|" // 172.16/12
+ "172\\.2[0-9]{1}\\.\\d{1,3}\\.\\d{1,3}|"
+ "172\\.3[0-1]{1}\\.\\d{1,3}\\.\\d{1,3}";
+ "172\\.3[0-1]{1}\\.\\d{1,3}\\.\\d{1,3}|" //
+ "0:0:0:0:0:0:0:1|::1";
/**
* Header that holds the incoming protocol, usually named "X-Forwarded-Proto".

9
spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/ServerPropertiesTests.java
View File

@@ -579,7 +579,8 @@ public class ServerPropertiesTests {
+ "127\\.\\d{1,3}\\.\\d{1,3}\\.\\d{1,3}|" // 127/8
+ "172\\.1[6-9]{1}\\.\\d{1,3}\\.\\d{1,3}|" // 172.16/12
+ "172\\.2[0-9]{1}\\.\\d{1,3}\\.\\d{1,3}|"
+ "172\\.3[0-1]{1}\\.\\d{1,3}\\.\\d{1,3}";
+ "172\\.3[0-1]{1}\\.\\d{1,3}\\.\\d{1,3}|" //
+ "0:0:0:0:0:0:0:1|::1";
assertThat(remoteIpValve.getInternalProxies()).isEqualTo(expectedInternalProxies);
}
@@ -896,6 +897,12 @@ public class ServerPropertiesTests {
.isEqualTo(new AccessLogValve().getRequestAttributesEnabled());
}
@Test
public void tomcatInternalProxiesMatchesDefault() {
assertThat(this.properties.getTomcat().getInternalProxies())
.isEqualTo(new RemoteIpValve().getInternalProxies());
}
@Test
public void jettyMaxHttpPostSizeMatchesDefault() throws Exception {
JettyEmbeddedServletContainerFactory jettyFactory = new JettyEmbeddedServletContainerFactory(