Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
爱吃血肠
spring-framework
提交
695bf296
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,发现更多精彩内容 >>
提交
695bf296
编写于
3月 29, 2018
作者:
J
Juergen Hoeller
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Consistent trace logging in PathResourceResolver
Issue: SPR-16616
上级
53d01392
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
10 addition
and
10 deletion
+10
-10
spring-webflux/src/main/java/org/springframework/web/reactive/resource/PathResourceResolver.java
...framework/web/reactive/resource/PathResourceResolver.java
+5
-5
spring-webmvc/src/main/java/org/springframework/web/servlet/resource/PathResourceResolver.java
...gframework/web/servlet/resource/PathResourceResolver.java
+5
-5
未找到文件。
spring-webflux/src/main/java/org/springframework/web/reactive/resource/PathResourceResolver.java
浏览文件 @
695bf296
...
...
@@ -118,10 +118,10 @@ public class PathResourceResolver extends AbstractResourceResolver {
}
else
if
(
logger
.
isTraceEnabled
())
{
Resource
[]
allowedLocations
=
getAllowedLocations
();
logger
.
trace
(
"Resource path
=
\""
+
resourcePath
+
"\" was successfully resolved "
+
"but resource
=
\""
+
resource
.
getURL
()
+
"\" is neither under the "
+
"current location
=
\""
+
location
.
getURL
()
+
"\" nor under any of the "
+
"allowed locations
=
"
+
(
allowedLocations
!=
null
?
Arrays
.
asList
(
allowedLocations
)
:
"[]"
));
logger
.
trace
(
"Resource path
\""
+
resourcePath
+
"\" was successfully resolved "
+
"but resource
\""
+
resource
.
getURL
()
+
"\" is neither under the "
+
"current location
\""
+
location
.
getURL
()
+
"\" nor under any of the "
+
"allowed locations
"
+
(
allowedLocations
!=
null
?
Arrays
.
asList
(
allowedLocations
)
:
"[]"
));
}
}
else
if
(
logger
.
isTraceEnabled
())
{
...
...
@@ -195,7 +195,7 @@ public class PathResourceResolver extends AbstractResourceResolver {
String
decodedPath
=
URLDecoder
.
decode
(
resourcePath
,
"UTF-8"
);
if
(
decodedPath
.
contains
(
"../"
)
||
decodedPath
.
contains
(
"..\\"
))
{
if
(
logger
.
isTraceEnabled
())
{
logger
.
trace
(
"
Ignoring invalid resource path with escape sequences ["
+
resourcePath
+
"]"
);
logger
.
trace
(
"
Resolved resource path contains encoded \"../\" or \"..\\\": "
+
resourcePath
);
}
return
true
;
}
...
...
spring-webmvc/src/main/java/org/springframework/web/servlet/resource/PathResourceResolver.java
浏览文件 @
695bf296
...
...
@@ -189,10 +189,10 @@ public class PathResourceResolver extends AbstractResourceResolver {
}
else
if
(
logger
.
isTraceEnabled
())
{
Resource
[]
allowedLocations
=
getAllowedLocations
();
logger
.
trace
(
"Resource path
=
\""
+
resourcePath
+
"\" was successfully resolved "
+
"but resource
=
\""
+
resource
.
getURL
()
+
"\" is neither under the "
+
"current location
=
\""
+
location
.
getURL
()
+
"\" nor under any of the "
+
"allowed locations
=
"
+
(
allowedLocations
!=
null
?
Arrays
.
asList
(
allowedLocations
)
:
"[]"
));
logger
.
trace
(
"Resource path
\""
+
resourcePath
+
"\" was successfully resolved "
+
"but resource
\""
+
resource
.
getURL
()
+
"\" is neither under the "
+
"current location
\""
+
location
.
getURL
()
+
"\" nor under any of the "
+
"allowed locations
"
+
(
allowedLocations
!=
null
?
Arrays
.
asList
(
allowedLocations
)
:
"[]"
));
}
}
return
null
;
...
...
@@ -286,7 +286,7 @@ public class PathResourceResolver extends AbstractResourceResolver {
String
decodedPath
=
URLDecoder
.
decode
(
resourcePath
,
"UTF-8"
);
if
(
decodedPath
.
contains
(
"../"
)
||
decodedPath
.
contains
(
"..\\"
))
{
if
(
logger
.
isTraceEnabled
())
{
logger
.
trace
(
"
Ignoring invalid resource path with escape sequences ["
+
resourcePath
+
"]"
);
logger
.
trace
(
"
Resolved resource path contains encoded \"../\" or \"..\\\": "
+
resourcePath
);
}
return
true
;
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录