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

Align proxies with defaults from Tomcat 10.1.40

Browse Source 
See gh-45128
This commit is contained in:
Phillip Webb
2025-04-10 10:57:23 -07:00
parent 1046c4628b
commit 973f9615af
2 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1047,7 +1047,10 @@ public class ServerProperties {
+ "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.16/12
+ "172\\.3[0-1]{1}\\.\\d{1,3}\\.\\d{1,3}|" // 172.16/12
+ "0:0:0:0:0:0:0:1|::1";
+ "0:0:0:0:0:0:0:1|" // 0:0:0:0:0:0:0:1
+ "::1|" // ::1
+ "fe[89ab]\\p{XDigit}:.*|" //
+ "f[cd]\\p{XDigit}{2}+:.*";
/**
* Header that holds the incoming protocol, usually named "X-Forwarded-Proto".

5
spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/embedded/TomcatWebServerFactoryCustomizerTests.java
View File

@@ -386,7 +386,10 @@ class TomcatWebServerFactoryCustomizerTests {
+ "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.16/12
+ "172\\.3[0-1]{1}\\.\\d{1,3}\\.\\d{1,3}|" // 172.16/12
+ "0:0:0:0:0:0:0:1|::1";
+ "0:0:0:0:0:0:0:1|" // 0:0:0:0:0:0:0:1
+ "::1|" // ::1
+ "fe[89ab]\\p{XDigit}:.*|" //
+ "f[cd]\\p{XDigit}{2}+:.*";
assertThat(remoteIpValve.getInternalProxies()).isEqualTo(expectedInternalProxies);
}