Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
dk131072
spring-framework
提交
7e9857a6
S
spring-framework
项目概览
dk131072
/
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,发现更多精彩内容 >>
提交
7e9857a6
编写于
11月 21, 2018
作者:
R
Rossen Stoyanchev
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
ForwardedHeaderTransformer handles encoding correctly
Issue: SPR-17525
上级
0134c9d6
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
26 addition
and
1 deletion
+26
-1
spring-web/src/main/java/org/springframework/web/server/adapter/ForwardedHeaderTransformer.java
...mework/web/server/adapter/ForwardedHeaderTransformer.java
+8
-1
spring-web/src/test/java/org/springframework/web/server/adapter/ForwardedHeaderTransformerTests.java
...k/web/server/adapter/ForwardedHeaderTransformerTests.java
+18
-0
未找到文件。
spring-web/src/main/java/org/springframework/web/server/adapter/ForwardedHeaderTransformer.java
浏览文件 @
7e9857a6
...
...
@@ -22,6 +22,7 @@ import java.util.Locale;
import
java.util.Set
;
import
java.util.function.Function
;
import
org.springframework.context.ApplicationContext
;
import
org.springframework.http.HttpHeaders
;
import
org.springframework.http.server.reactive.ServerHttpRequest
;
import
org.springframework.lang.Nullable
;
...
...
@@ -36,6 +37,12 @@ import org.springframework.web.util.UriComponentsBuilder;
* <p>Alternatively if {@link #setRemoveOnly removeOnly} is set to "true",
* then "Forwarded" and "X-Forwarded-*" headers are only removed, and not used.
*
* <p>An instance of this class is typically declared as a bean with the name
* "forwardedHeaderTransformer" and detected by
* {@link WebHttpHandlerBuilder#applicationContext(ApplicationContext)}, or it
* can also be registered directly via
* {@link WebHttpHandlerBuilder#forwardedHeaderTransformer(ForwardedHeaderTransformer)}.
*
* @author Rossen Stoyanchev
* @since 5.1
* @see <a href="https://tools.ietf.org/html/rfc7239">https://tools.ietf.org/html/rfc7239</a>
...
...
@@ -85,7 +92,7 @@ public class ForwardedHeaderTransformer implements Function<ServerHttpRequest, S
if
(
hasForwardedHeaders
(
request
))
{
ServerHttpRequest
.
Builder
builder
=
request
.
mutate
();
if
(!
this
.
removeOnly
)
{
URI
uri
=
UriComponentsBuilder
.
fromHttpRequest
(
request
).
build
().
toUri
();
URI
uri
=
UriComponentsBuilder
.
fromHttpRequest
(
request
).
build
(
true
).
toUri
();
builder
.
uri
(
uri
);
String
prefix
=
getForwardedPrefix
(
request
);
if
(
prefix
!=
null
)
{
...
...
spring-web/src/test/java/org/springframework/web/server/adapter/ForwardedHeaderTransformerTests.java
浏览文件 @
7e9857a6
...
...
@@ -21,6 +21,7 @@ import java.net.URI;
import
org.junit.Test
;
import
org.springframework.http.HttpHeaders
;
import
org.springframework.http.HttpMethod
;
import
org.springframework.http.server.reactive.ServerHttpRequest
;
import
org.springframework.mock.http.server.reactive.test.MockServerHttpRequest
;
...
...
@@ -100,6 +101,23 @@ public class ForwardedHeaderTransformerTests {
assertForwardedHeadersRemoved
(
request
);
}
@Test
// SPR-17525
public
void
shouldNotDoubleEncode
()
throws
Exception
{
HttpHeaders
headers
=
new
HttpHeaders
();
headers
.
add
(
"Forwarded"
,
"host=84.198.58.199;proto=https"
);
ServerHttpRequest
request
=
MockServerHttpRequest
.
method
(
HttpMethod
.
GET
,
new
URI
(
"http://example.com/a%20b?q=a%2Bb"
))
.
headers
(
headers
)
.
build
();
request
=
this
.
requestMutator
.
apply
(
request
);
assertEquals
(
new
URI
(
"https://84.198.58.199/a%20b?q=a%2Bb"
),
request
.
getURI
());
assertForwardedHeadersRemoved
(
request
);
}
private
MockServerHttpRequest
getRequest
(
HttpHeaders
headers
)
{
return
MockServerHttpRequest
.
get
(
BASE_URL
).
headers
(
headers
).
build
();
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录