Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
带水的鱼儿
spring-framework
提交
e1f51cbc
S
spring-framework
项目概览
带水的鱼儿
/
spring-framework
与 Fork 源项目一致
从无法访问的项目Fork
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
S
spring-framework
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
e1f51cbc
编写于
7月 13, 2021
作者:
R
Rossen Stoyanchev
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Check both https and wss in forwarded header checks
Closes gh-27097
上级
6ec7cffc
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
18 addition
and
12 deletion
+18
-12
spring-web/src/main/java/org/springframework/web/filter/ForwardedHeaderFilter.java
...org/springframework/web/filter/ForwardedHeaderFilter.java
+2
-2
spring-web/src/main/java/org/springframework/web/util/UriComponentsBuilder.java
...va/org/springframework/web/util/UriComponentsBuilder.java
+1
-1
spring-web/src/test/java/org/springframework/web/filter/ForwardedHeaderFilterTests.java
...pringframework/web/filter/ForwardedHeaderFilterTests.java
+8
-5
spring-web/src/test/java/org/springframework/web/util/UriComponentsBuilderTests.java
...g/springframework/web/util/UriComponentsBuilderTests.java
+7
-4
未找到文件。
spring-web/src/main/java/org/springframework/web/filter/ForwardedHeaderFilter.java
浏览文件 @
e1f51cbc
/*
* Copyright 2002-202
0
the original author or authors.
* Copyright 2002-202
1
the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
...
...
@@ -239,7 +239,7 @@ public class ForwardedHeaderFilter extends OncePerRequestFilter {
int
port
=
uriComponents
.
getPort
();
this
.
scheme
=
uriComponents
.
getScheme
();
this
.
secure
=
"https"
.
equals
(
this
.
scheme
);
this
.
secure
=
"https"
.
equals
(
this
.
scheme
)
||
"wss"
.
equals
(
this
.
scheme
)
;
this
.
host
=
uriComponents
.
getHost
();
this
.
port
=
(
port
==
-
1
?
(
this
.
secure
?
443
:
80
)
:
port
);
...
...
spring-web/src/main/java/org/springframework/web/util/UriComponentsBuilder.java
浏览文件 @
e1f51cbc
...
...
@@ -882,7 +882,7 @@ public class UriComponentsBuilder implements UriBuilder, Cloneable {
}
if
(
this
.
scheme
!=
null
&&
((
this
.
scheme
.
equals
(
"http"
)
&&
"80"
.
equals
(
this
.
port
))
||
(
this
.
scheme
.
equals
(
"https"
)
&&
"443"
.
equals
(
this
.
port
))))
{
(
(
this
.
scheme
.
equals
(
"https"
)
||
this
.
scheme
.
equals
(
"wss"
)
)
&&
"443"
.
equals
(
this
.
port
))))
{
port
(
null
);
}
...
...
spring-web/src/test/java/org/springframework/web/filter/ForwardedHeaderFilterTests.java
浏览文件 @
e1f51cbc
...
...
@@ -30,6 +30,8 @@ import javax.servlet.http.HttpServletResponse;
import
org.junit.jupiter.api.BeforeEach
;
import
org.junit.jupiter.api.Nested
;
import
org.junit.jupiter.api.Test
;
import
org.junit.jupiter.params.ParameterizedTest
;
import
org.junit.jupiter.params.provider.ValueSource
;
import
org.springframework.web.testfixture.servlet.MockFilterChain
;
import
org.springframework.web.testfixture.servlet.MockHttpServletRequest
;
...
...
@@ -102,10 +104,11 @@ public class ForwardedHeaderFilterTests {
assertThat
(
this
.
filter
.
shouldNotFilter
(
new
MockHttpServletRequest
())).
isTrue
();
}
@Test
public
void
forwardedRequest
()
throws
Exception
{
@ParameterizedTest
@ValueSource
(
strings
=
{
"https"
,
"wss"
})
public
void
forwardedRequest
(
String
protocol
)
throws
Exception
{
this
.
request
.
setRequestURI
(
"/mvc-showcase"
);
this
.
request
.
addHeader
(
X_FORWARDED_PROTO
,
"https"
);
this
.
request
.
addHeader
(
X_FORWARDED_PROTO
,
protocol
);
this
.
request
.
addHeader
(
X_FORWARDED_HOST
,
"84.198.58.199"
);
this
.
request
.
addHeader
(
X_FORWARDED_PORT
,
"443"
);
this
.
request
.
addHeader
(
"foo"
,
"bar"
);
...
...
@@ -115,8 +118,8 @@ public class ForwardedHeaderFilterTests {
HttpServletRequest
actual
=
(
HttpServletRequest
)
this
.
filterChain
.
getRequest
();
assertThat
(
actual
).
isNotNull
();
assertThat
(
actual
.
getRequestURL
().
toString
()).
isEqualTo
(
"https
://84.198.58.199/mvc-showcase"
);
assertThat
(
actual
.
getScheme
()).
isEqualTo
(
"https"
);
assertThat
(
actual
.
getRequestURL
().
toString
()).
isEqualTo
(
protocol
+
"
://84.198.58.199/mvc-showcase"
);
assertThat
(
actual
.
getScheme
()).
isEqualTo
(
protocol
);
assertThat
(
actual
.
getServerName
()).
isEqualTo
(
"84.198.58.199"
);
assertThat
(
actual
.
getServerPort
()).
isEqualTo
(
443
);
assertThat
(
actual
.
isSecure
()).
isTrue
();
...
...
spring-web/src/test/java/org/springframework/web/util/UriComponentsBuilderTests.java
浏览文件 @
e1f51cbc
...
...
@@ -28,6 +28,8 @@ import java.util.Optional;
import
java.util.function.BiConsumer
;
import
org.junit.jupiter.api.Test
;
import
org.junit.jupiter.params.ParameterizedTest
;
import
org.junit.jupiter.params.provider.ValueSource
;
import
org.springframework.http.HttpHeaders
;
import
org.springframework.http.HttpRequest
;
...
...
@@ -374,10 +376,11 @@ class UriComponentsBuilderTests {
assertThat
(
result
.
getQuery
()).
isEqualTo
(
"a=1"
);
}
@Test
// SPR-12771
void
fromHttpRequestResetsPortBeforeSettingIt
()
{
@ParameterizedTest
// gh-17368, gh-27097
@ValueSource
(
strings
=
{
"https"
,
"wss"
})
void
fromHttpRequestResetsPortBeforeSettingIt
(
String
protocol
)
{
MockHttpServletRequest
request
=
new
MockHttpServletRequest
();
request
.
addHeader
(
"X-Forwarded-Proto"
,
"https"
);
request
.
addHeader
(
"X-Forwarded-Proto"
,
protocol
);
request
.
addHeader
(
"X-Forwarded-Host"
,
"84.198.58.199"
);
request
.
addHeader
(
"X-Forwarded-Port"
,
443
);
request
.
setScheme
(
"http"
);
...
...
@@ -388,7 +391,7 @@ class UriComponentsBuilderTests {
HttpRequest
httpRequest
=
new
ServletServerHttpRequest
(
request
);
UriComponents
result
=
UriComponentsBuilder
.
fromHttpRequest
(
httpRequest
).
build
();
assertThat
(
result
.
getScheme
()).
isEqualTo
(
"https"
);
assertThat
(
result
.
getScheme
()).
isEqualTo
(
protocol
);
assertThat
(
result
.
getHost
()).
isEqualTo
(
"84.198.58.199"
);
assertThat
(
result
.
getPort
()).
isEqualTo
(-
1
);
assertThat
(
result
.
getPath
()).
isEqualTo
(
"/rest/mobile/users/1"
);
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录