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

Follow-up fix, checking also "ws" and port 80 case

Browse Source 
See gh-27097
This commit is contained in:
Rossen Stoyanchev
2021-07-16 09:34:12 +01:00
parent ca262eaa1c
commit 0b1d14cdd9
2 changed files with 24 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
spring-web/src/test/java/org/springframework/web/util/UriComponentsBuilderTests.java
View File

@@ -378,7 +378,7 @@ class UriComponentsBuilderTests {
@ParameterizedTest // gh-17368, gh-27097
@ValueSource(strings = {"https", "wss"})
void fromHttpRequestResetsPortBeforeSettingIt(String protocol) {
void fromHttpRequestResetsPort443(String protocol) {
MockHttpServletRequest request = new MockHttpServletRequest();
request.addHeader("X-Forwarded-Proto", protocol);
request.addHeader("X-Forwarded-Host", "84.198.58.199");
@@ -397,6 +397,27 @@ class UriComponentsBuilderTests {
assertThat(result.getPath()).isEqualTo("/rest/mobile/users/1");
}
@ParameterizedTest // gh-27097
@ValueSource(strings = {"http", "ws"})
void fromHttpRequestResetsPort80(String protocol) {
MockHttpServletRequest request = new MockHttpServletRequest();
request.addHeader("X-Forwarded-Proto", protocol);
request.addHeader("X-Forwarded-Host", "84.198.58.199");
request.addHeader("X-Forwarded-Port", 80);
request.setScheme("http");
request.setServerName("example.com");
request.setServerPort(80);
request.setRequestURI("/path");
HttpRequest httpRequest = new ServletServerHttpRequest(request);
UriComponents result = UriComponentsBuilder.fromHttpRequest(httpRequest).build();
assertThat(result.getScheme()).isEqualTo(protocol);
assertThat(result.getHost()).isEqualTo("84.198.58.199");
assertThat(result.getPort()).isEqualTo(-1);
assertThat(result.getPath()).isEqualTo("/path");
}
@Test // SPR-14761
void fromHttpRequestWithForwardedIPv4Host() {
MockHttpServletRequest request = new MockHttpServletRequest();