Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
爱吃血肠
spring-framework
提交
5185953f
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 搜索 >>
提交
5185953f
编写于
1月 19, 2016
作者:
S
Sammy Chu
提交者:
Rossen Stoyanchev
1月 20, 2016
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Avoid double encoding URI in ServletServerHttpRequest
Issue: SPR-13876
上级
a5f4aa68
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
21 addition
and
13 deletion
+21
-13
spring-web/src/main/java/org/springframework/http/server/ServletServerHttpRequest.java
...springframework/http/server/ServletServerHttpRequest.java
+6
-3
spring-web/src/test/java/org/springframework/http/server/ServletServerHttpRequestTests.java
...gframework/http/server/ServletServerHttpRequestTests.java
+10
-7
spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/HttpEntityMethodProcessorMockTests.java
...method/annotation/HttpEntityMethodProcessorMockTests.java
+2
-1
spring-websocket/src/test/java/org/springframework/web/socket/sockjs/transport/handler/HttpSendingTransportHandlerTests.java
...s/transport/handler/HttpSendingTransportHandlerTests.java
+3
-2
未找到文件。
spring-web/src/main/java/org/springframework/http/server/ServletServerHttpRequest.java
浏览文件 @
5185953f
...
...
@@ -88,9 +88,12 @@ public class ServletServerHttpRequest implements ServerHttpRequest {
@Override
public
URI
getURI
()
{
try
{
return
new
URI
(
this
.
servletRequest
.
getScheme
(),
null
,
this
.
servletRequest
.
getServerName
(),
this
.
servletRequest
.
getServerPort
(),
this
.
servletRequest
.
getRequestURI
(),
this
.
servletRequest
.
getQueryString
(),
null
);
StringBuffer
url
=
this
.
servletRequest
.
getRequestURL
();
String
queryStr
=
this
.
servletRequest
.
getQueryString
();
if
(
StringUtils
.
hasText
(
queryStr
))
{
url
.
append
(
'?'
).
append
(
queryStr
);
}
return
new
URI
(
url
.
toString
());
}
catch
(
URISyntaxException
ex
)
{
throw
new
IllegalStateException
(
"Could not get HttpServletRequest URI: "
+
ex
.
getMessage
(),
ex
);
...
...
spring-web/src/test/java/org/springframework/http/server/ServletServerHttpRequestTests.java
浏览文件 @
5185953f
...
...
@@ -56,13 +56,16 @@ public class ServletServerHttpRequestTests {
@Test
public
void
getURI
()
throws
Exception
{
URI
uri
=
new
URI
(
"http://example.com/path?query"
);
mockRequest
.
setServerName
(
uri
.
getHost
());
mockRequest
.
setServerPort
(
uri
.
getPort
());
mockRequest
.
setRequestURI
(
uri
.
getPath
());
mockRequest
.
setQueryString
(
uri
.
getQuery
());
assertEquals
(
"Invalid uri"
,
uri
,
request
.
getURI
());
}
URI
uri
=
new
URI
(
"https://example.com/%E4%B8%AD%E6%96%87?redirect=https%3A%2F%2Fgithub.com%2Fspring-projects%2Fspring-framework"
);
mockRequest
.
setScheme
(
uri
.
getScheme
());
mockRequest
.
setServerName
(
uri
.
getHost
());
mockRequest
.
setServerPort
(
uri
.
getPort
());
// NOTE: should use getRawPath() instead of getPath() is decoded, while HttpServletRequest.setRequestURI() is encoded
mockRequest
.
setRequestURI
(
uri
.
getRawPath
());
// NOTE: should use getRawQuery() instead of getQuery() is decoded, while HttpServletRequest.getQueryString() is encoded
mockRequest
.
setQueryString
(
uri
.
getRawQuery
());
assertEquals
(
"Invalid uri"
,
uri
,
request
.
getURI
());
}
@Test
public
void
getHeaders
()
throws
Exception
{
...
...
spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/HttpEntityMethodProcessorMockTests.java
浏览文件 @
5185953f
...
...
@@ -175,7 +175,8 @@ public class HttpEntityMethodProcessorMockTests {
assertFalse
(
"The requestHandled flag shouldn't change"
,
mavContainer
.
isRequestHandled
());
RequestEntity
<?>
requestEntity
=
(
RequestEntity
<?>)
result
;
assertEquals
(
"Invalid method"
,
HttpMethod
.
GET
,
requestEntity
.
getMethod
());
assertEquals
(
"Invalid url"
,
new
URI
(
"http"
,
null
,
"www.example.com"
,
80
,
"/path"
,
null
,
null
),
requestEntity
.
getUrl
());
// using default port (which is 80), so do not need to append the port (-1 means ignore)
assertEquals
(
"Invalid url"
,
new
URI
(
"http"
,
null
,
"www.example.com"
,
-
1
,
"/path"
,
null
,
null
),
requestEntity
.
getUrl
());
assertEquals
(
"Invalid argument"
,
body
,
requestEntity
.
getBody
());
}
...
...
spring-websocket/src/test/java/org/springframework/web/socket/sockjs/transport/handler/HttpSendingTransportHandlerTests.java
浏览文件 @
5185953f
...
...
@@ -20,7 +20,6 @@ import java.sql.Date;
import
org.junit.Before
;
import
org.junit.Test
;
import
org.springframework.scheduling.TaskScheduler
;
import
org.springframework.web.socket.AbstractHttpRequestTests
;
import
org.springframework.web.socket.WebSocketHandler
;
...
...
@@ -31,6 +30,7 @@ import org.springframework.web.socket.sockjs.transport.session.AbstractSockJsSes
import
org.springframework.web.socket.sockjs.transport.session.PollingSockJsSession
;
import
org.springframework.web.socket.sockjs.transport.session.StreamingSockJsSession
;
import
org.springframework.web.socket.sockjs.transport.session.StubSockJsServiceConfig
;
import
org.springframework.web.util.UriUtils
;
import
static
org
.
junit
.
Assert
.
assertEquals
;
import
static
org
.
junit
.
Assert
.
assertFalse
;
...
...
@@ -114,7 +114,8 @@ public class HttpSendingTransportHandlerTests extends AbstractHttpRequestTests
setRequest
(
"POST"
,
"/"
);
if
(
callbackValue
!=
null
)
{
this
.
servletRequest
.
setQueryString
(
"c="
+
callbackValue
);
// need to encode the query parameter
this
.
servletRequest
.
setQueryString
(
"c="
+
UriUtils
.
encodeQueryParam
(
callbackValue
,
"UTF-8"
));
this
.
servletRequest
.
addParameter
(
"c"
,
callbackValue
);
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录