Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
爱吃血肠
spring-framework
提交
c7c3e558
S
spring-framework
项目概览
爱吃血肠
/
spring-framework
通知
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,体验更适合开发者的 AI 搜索 >>
提交
c7c3e558
编写于
5月 25, 2018
作者:
R
Rossen Stoyanchev
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
X-Forwarded-Ssl is listed in ForwardedHeaderFilter
Issue: SPR-16863
上级
d77797f4
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
32 addition
and
1 deletion
+32
-1
spring-web/src/main/java/org/springframework/web/filter/ForwardedHeaderFilter.java
...org/springframework/web/filter/ForwardedHeaderFilter.java
+1
-0
spring-web/src/main/java/org/springframework/web/filter/reactive/ForwardedHeaderFilter.java
...gframework/web/filter/reactive/ForwardedHeaderFilter.java
+1
-0
spring-web/src/test/java/org/springframework/web/filter/ForwardedHeaderFilterTests.java
...pringframework/web/filter/ForwardedHeaderFilterTests.java
+27
-0
spring-web/src/test/java/org/springframework/web/filter/reactive/ForwardedHeaderFilterTests.java
...ework/web/filter/reactive/ForwardedHeaderFilterTests.java
+3
-1
未找到文件。
spring-web/src/main/java/org/springframework/web/filter/ForwardedHeaderFilter.java
浏览文件 @
c7c3e558
...
...
@@ -73,6 +73,7 @@ public class ForwardedHeaderFilter extends OncePerRequestFilter {
FORWARDED_HEADER_NAMES
.
add
(
"X-Forwarded-Port"
);
FORWARDED_HEADER_NAMES
.
add
(
"X-Forwarded-Proto"
);
FORWARDED_HEADER_NAMES
.
add
(
"X-Forwarded-Prefix"
);
FORWARDED_HEADER_NAMES
.
add
(
"X-Forwarded-Ssl"
);
}
...
...
spring-web/src/main/java/org/springframework/web/filter/reactive/ForwardedHeaderFilter.java
浏览文件 @
c7c3e558
...
...
@@ -52,6 +52,7 @@ public class ForwardedHeaderFilter implements WebFilter {
FORWARDED_HEADER_NAMES
.
add
(
"X-Forwarded-Port"
);
FORWARDED_HEADER_NAMES
.
add
(
"X-Forwarded-Proto"
);
FORWARDED_HEADER_NAMES
.
add
(
"X-Forwarded-Prefix"
);
FORWARDED_HEADER_NAMES
.
add
(
"X-Forwarded-Ssl"
);
}
...
...
spring-web/src/test/java/org/springframework/web/filter/ForwardedHeaderFilterTests.java
浏览文件 @
c7c3e558
...
...
@@ -48,6 +48,7 @@ public class ForwardedHeaderFilterTests {
private
static
final
String
X_FORWARDED_HOST
=
"x-forwarded-host"
;
private
static
final
String
X_FORWARDED_PORT
=
"x-forwarded-port"
;
private
static
final
String
X_FORWARDED_PREFIX
=
"x-forwarded-prefix"
;
private
static
final
String
X_FORWARDED_SSL
=
"x-forwarded-ssl"
;
private
final
ForwardedHeaderFilter
filter
=
new
ForwardedHeaderFilter
();
...
...
@@ -221,6 +222,7 @@ public class ForwardedHeaderFilterTests {
testShouldFilter
(
X_FORWARDED_HOST
);
testShouldFilter
(
X_FORWARDED_PORT
);
testShouldFilter
(
X_FORWARDED_PROTO
);
testShouldFilter
(
X_FORWARDED_SSL
);
}
private
void
testShouldFilter
(
String
headerName
)
{
...
...
@@ -263,6 +265,7 @@ public class ForwardedHeaderFilterTests {
this
.
request
.
addHeader
(
X_FORWARDED_PROTO
,
"https"
);
this
.
request
.
addHeader
(
X_FORWARDED_HOST
,
"84.198.58.199"
);
this
.
request
.
addHeader
(
X_FORWARDED_PORT
,
"443"
);
this
.
request
.
addHeader
(
X_FORWARDED_SSL
,
"on"
);
this
.
request
.
addHeader
(
"foo"
,
"bar"
);
this
.
filter
.
setRemoveOnly
(
true
);
...
...
@@ -278,6 +281,30 @@ public class ForwardedHeaderFilterTests {
assertNull
(
actual
.
getHeader
(
X_FORWARDED_PROTO
));
assertNull
(
actual
.
getHeader
(
X_FORWARDED_HOST
));
assertNull
(
actual
.
getHeader
(
X_FORWARDED_PORT
));
assertNull
(
actual
.
getHeader
(
X_FORWARDED_SSL
));
assertEquals
(
"bar"
,
actual
.
getHeader
(
"foo"
));
}
@Test
public
void
forwardedRequestWithSsl
()
throws
Exception
{
this
.
request
.
setRequestURI
(
"/mvc-showcase"
);
this
.
request
.
addHeader
(
X_FORWARDED_SSL
,
"on"
);
this
.
request
.
addHeader
(
X_FORWARDED_HOST
,
"84.198.58.199"
);
this
.
request
.
addHeader
(
X_FORWARDED_PORT
,
"443"
);
this
.
request
.
addHeader
(
"foo"
,
"bar"
);
this
.
filter
.
doFilter
(
this
.
request
,
new
MockHttpServletResponse
(),
this
.
filterChain
);
HttpServletRequest
actual
=
(
HttpServletRequest
)
this
.
filterChain
.
getRequest
();
assertEquals
(
"https://84.198.58.199/mvc-showcase"
,
actual
.
getRequestURL
().
toString
());
assertEquals
(
"https"
,
actual
.
getScheme
());
assertEquals
(
"84.198.58.199"
,
actual
.
getServerName
());
assertEquals
(
443
,
actual
.
getServerPort
());
assertTrue
(
actual
.
isSecure
());
assertNull
(
actual
.
getHeader
(
X_FORWARDED_SSL
));
assertNull
(
actual
.
getHeader
(
X_FORWARDED_HOST
));
assertNull
(
actual
.
getHeader
(
X_FORWARDED_PORT
));
assertEquals
(
"bar"
,
actual
.
getHeader
(
"foo"
));
}
...
...
spring-web/src/test/java/org/springframework/web/filter/reactive/ForwardedHeaderFilterTests.java
浏览文件 @
c7c3e558
...
...
@@ -51,7 +51,8 @@ public class ForwardedHeaderFilterTests {
.
header
(
"X-Forwarded-Host"
,
"example.com"
)
.
header
(
"X-Forwarded-Port"
,
"8080"
)
.
header
(
"X-Forwarded-Proto"
,
"http"
)
.
header
(
"X-Forwarded-Prefix"
,
"prefix"
));
.
header
(
"X-Forwarded-Prefix"
,
"prefix"
)
.
header
(
"X-Forwarded-Ssl"
,
"on"
));
this
.
filter
.
setRemoveOnly
(
true
);
this
.
filter
.
filter
(
exchange
,
this
.
filterChain
).
block
(
Duration
.
ZERO
);
...
...
@@ -63,6 +64,7 @@ public class ForwardedHeaderFilterTests {
assertFalse
(
result
.
containsKey
(
"X-Forwarded-Port"
));
assertFalse
(
result
.
containsKey
(
"X-Forwarded-Proto"
));
assertFalse
(
result
.
containsKey
(
"X-Forwarded-Prefix"
));
assertFalse
(
result
.
containsKey
(
"X-Forwarded-Ssl"
));
}
@Test
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录