mirror of
https://github.com/spring-projects/spring-boot.git
synced 2024-08-29 03:06:45 +08:00
Merge branch '1.5.x' into 2.0.x
This commit is contained in:
commit
2e86a6f479
@ -372,7 +372,7 @@ public class ServerProperties {
|
||||
private final Accesslog accesslog = new Accesslog();
|
||||
|
||||
/**
|
||||
* Regular expression matching trusted IP addresses.
|
||||
* Regular expression that matches proxies that are to be trusted.
|
||||
*/
|
||||
private String internalProxies = "10\\.\\d{1,3}\\.\\d{1,3}\\.\\d{1,3}|" // 10/8
|
||||
+ "192\\.168\\.\\d{1,3}\\.\\d{1,3}|" // 192.168/16
|
||||
@ -380,7 +380,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".
|
||||
|
@ -37,6 +37,7 @@ import org.apache.catalina.connector.Connector;
|
||||
import org.apache.catalina.core.StandardContext;
|
||||
import org.apache.catalina.core.StandardEngine;
|
||||
import org.apache.catalina.valves.AccessLogValve;
|
||||
import org.apache.catalina.valves.RemoteIpValve;
|
||||
import org.apache.coyote.AbstractProtocol;
|
||||
import org.eclipse.jetty.server.HttpChannel;
|
||||
import org.eclipse.jetty.server.Request;
|
||||
@ -267,6 +268,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 {
|
||||
JettyServletWebServerFactory jettyFactory = new JettyServletWebServerFactory(0);
|
||||
|
@ -167,7 +167,8 @@ public class TomcatWebServerFactoryCustomizerTests {
|
||||
+ "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);
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user