root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Enable RemoteIpValve by default 

Fixes gh-3782
This commit is contained in:
Dave Syer 2015-09-28 13:58:29 +01:00
parent c8ec2cb70b
commit 2e3658fd91
2 changed files with 16 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -484,9 +484,9 @@ public class ServerProperties implements EmbeddedServletContainerCustomizer, Ord
/** /**
* Header that holds the incoming protocol, usually named "X-Forwarded-Proto". * Header that holds the incoming protocol, usually named "X-Forwarded-Proto".
* Configured as a RemoteIpValve only if remoteIpHeader is also set. * Configures a RemoteIpValve only if remoteIpHeader is also set.
*/ */
private String protocolHeader; private String protocolHeader = "x-forwarded-proto";
/** /**
* Value of the protocol header that indicates that the incoming request uses SSL. * Value of the protocol header that indicates that the incoming request uses SSL.
@ -499,8 +499,8 @@ public class ServerProperties implements EmbeddedServletContainerCustomizer, Ord
private String portHeader = "x-forwarded-port"; private String portHeader = "x-forwarded-port";
/** /**
* Name of the http header from which the remote ip is extracted. Configured as a * Name of the http header from which the remote ip is extracted. Configures a
* RemoteIpValve only if remoteIpHeader is also set. * RemoteIpValve only if protocolHeader is also set.
*/ */
private String remoteIpHeader = "x-forwarded-for"; private String remoteIpHeader = "x-forwarded-for";

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

@ -16,6 +16,17 @@
package org.springframework.boot.autoconfigure.web; package org.springframework.boot.autoconfigure.web;
import static org.hamcrest.Matchers.equalTo;
import static org.hamcrest.Matchers.instanceOf;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertThat;
import static org.mockito.BDDMockito.given;
import static org.mockito.Mockito.atLeastOnce;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.never;
import static org.mockito.Mockito.verify;
import java.net.InetAddress; import java.net.InetAddress;
import java.nio.charset.Charset; import java.nio.charset.Charset;
import java.util.Collections; import java.util.Collections;
@ -41,17 +52,6 @@ import org.springframework.boot.context.embedded.ConfigurableEmbeddedServletCont
import org.springframework.boot.context.embedded.ServletContextInitializer; import org.springframework.boot.context.embedded.ServletContextInitializer;
import org.springframework.boot.context.embedded.tomcat.TomcatEmbeddedServletContainerFactory; import org.springframework.boot.context.embedded.tomcat.TomcatEmbeddedServletContainerFactory;
import static org.hamcrest.Matchers.equalTo;
import static org.hamcrest.Matchers.instanceOf;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertThat;
import static org.mockito.BDDMockito.given;
import static org.mockito.Mockito.atLeastOnce;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.never;
import static org.mockito.Mockito.verify;
/** /**
* Tests for {@link ServerProperties}. * Tests for {@link ServerProperties}.
* *
@ -261,12 +261,7 @@ public class ServerPropertiesTests {
@Test @Test
public void defaultTomcatRemoteIpValve() throws Exception { public void defaultTomcatRemoteIpValve() throws Exception {
Map<String, String> map = new HashMap<String, String>(); // Since 1.3.0 no need to explicitly set header names
// Since 1.1.7 you need to specify at least the protocol and ip properties
map.put("server.tomcat.protocol_header", "x-forwarded-proto");
map.put("server.tomcat.remote_ip_header", "x-forwarded-for");
bindProperties(map);
TomcatEmbeddedServletContainerFactory container = new TomcatEmbeddedServletContainerFactory(); TomcatEmbeddedServletContainerFactory container = new TomcatEmbeddedServletContainerFactory();
this.properties.customize(container); this.properties.customize(container);