Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
带水的鱼儿
spring-framework
提交
0b1d14cd
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,发现更多精彩内容 >>
提交
0b1d14cd
编写于
7月 16, 2021
作者:
R
Rossen Stoyanchev
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Follow-up fix, checking also "ws" and port 80 case
See gh-27097
上级
ca262eaa
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
24 addition
and
2 deletion
+24
-2
spring-web/src/main/java/org/springframework/web/util/UriComponentsBuilder.java
...va/org/springframework/web/util/UriComponentsBuilder.java
+2
-1
spring-web/src/test/java/org/springframework/web/util/UriComponentsBuilderTests.java
...g/springframework/web/util/UriComponentsBuilderTests.java
+22
-1
未找到文件。
spring-web/src/main/java/org/springframework/web/util/UriComponentsBuilder.java
浏览文件 @
0b1d14cd
...
...
@@ -881,7 +881,8 @@ public class UriComponentsBuilder implements UriBuilder, Cloneable {
"with the removeOnly=true. Request headers: "
+
headers
);
}
if
(
this
.
scheme
!=
null
&&
((
this
.
scheme
.
equals
(
"http"
)
&&
"80"
.
equals
(
this
.
port
))
||
if
(
this
.
scheme
!=
null
&&
(((
this
.
scheme
.
equals
(
"http"
)
||
this
.
scheme
.
equals
(
"ws"
))
&&
"80"
.
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/util/UriComponentsBuilderTests.java
浏览文件 @
0b1d14cd
...
...
@@ -378,7 +378,7 @@ class UriComponentsBuilderTests {
@ParameterizedTest
// gh-17368, gh-27097
@ValueSource
(
strings
=
{
"https"
,
"wss"
})
void
fromHttpRequestResetsPort
BeforeSettingIt
(
String
protocol
)
{
void
fromHttpRequestResetsPort
443
(
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
();
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录