Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
爱吃血肠
spring-framework
提交
ea73ec5c
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 搜索 >>
提交
ea73ec5c
编写于
1月 10, 2018
作者:
R
Rossen Stoyanchev
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
ResourceUrlProvider handles sanitizes double slashes
Issue: SPR-16296
上级
cdf2ab97
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
31 addition
and
0 deletion
+31
-0
spring-webmvc/src/main/java/org/springframework/web/servlet/resource/ResourceUrlProvider.java
...ngframework/web/servlet/resource/ResourceUrlProvider.java
+9
-0
spring-webmvc/src/test/java/org/springframework/web/servlet/resource/ResourceUrlProviderTests.java
...mework/web/servlet/resource/ResourceUrlProviderTests.java
+22
-0
未找到文件。
spring-webmvc/src/main/java/org/springframework/web/servlet/resource/ResourceUrlProvider.java
浏览文件 @
ea73ec5c
...
...
@@ -34,6 +34,7 @@ import org.springframework.core.annotation.AnnotationAwareOrderComparator;
import
org.springframework.lang.Nullable
;
import
org.springframework.util.AntPathMatcher
;
import
org.springframework.util.PathMatcher
;
import
org.springframework.util.StringUtils
;
import
org.springframework.web.servlet.handler.SimpleUrlHandlerMapping
;
import
org.springframework.web.util.UrlPathHelper
;
...
...
@@ -217,6 +218,14 @@ public class ResourceUrlProvider implements ApplicationListener<ContextRefreshed
*/
@Nullable
public
final
String
getForLookupPath
(
String
lookupPath
)
{
// Clean duplicate slashes or pathWithinPattern won't match lookupPath
String
previous
;
do
{
previous
=
lookupPath
;
lookupPath
=
StringUtils
.
replace
(
lookupPath
,
"//"
,
"/"
);
}
while
(!
lookupPath
.
equals
(
previous
));
if
(
logger
.
isTraceEnabled
())
{
logger
.
trace
(
"Getting resource URL for lookup path \""
+
lookupPath
+
"\""
);
}
...
...
spring-webmvc/src/test/java/org/springframework/web/servlet/resource/ResourceUrlProviderTests.java
浏览文件 @
ea73ec5c
...
...
@@ -35,6 +35,9 @@ import org.springframework.web.context.support.AnnotationConfigWebApplicationCon
import
org.springframework.web.servlet.handler.SimpleUrlHandlerMapping
;
import
static
org
.
junit
.
Assert
.*;
import
static
org
.
mockito
.
ArgumentMatchers
.
any
;
import
static
org
.
mockito
.
Mockito
.
mock
;
import
static
org
.
mockito
.
Mockito
.
when
;
/**
...
...
@@ -136,6 +139,25 @@ public class ResourceUrlProviderTests {
assertFalse
(
urlProviderBean
.
isAutodetect
());
}
@Test
// SPR-16296
public
void
getForLookupPathShouldNotFailIfPathContainsDoubleSlashes
()
{
// given
ResourceResolver
mockResourceResolver
=
mock
(
ResourceResolver
.
class
);
when
(
mockResourceResolver
.
resolveUrlPath
(
any
(),
any
(),
any
())).
thenReturn
(
"some-path"
);
ResourceHttpRequestHandler
handler
=
new
ResourceHttpRequestHandler
();
handler
.
getResourceResolvers
().
add
(
mockResourceResolver
);
ResourceUrlProvider
provider
=
new
ResourceUrlProvider
();
provider
.
getHandlerMap
().
put
(
"/some-pattern/**"
,
handler
);
// when
String
lookupForPath
=
provider
.
getForLookupPath
(
"/some-pattern/some-lib//some-resource"
);
// then
assertEquals
(
"/some-pattern/some-path"
,
lookupForPath
);
}
@Configuration
@SuppressWarnings
({
"unused"
,
"WeakerAccess"
})
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录