Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
爱吃血肠
spring-framework
提交
58b17bff
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 搜索 >>
提交
58b17bff
编写于
3月 19, 2019
作者:
R
Rossen Stoyanchev
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Remove framgent in ResourceUrlEncodingFilter
Closes gh-22552
上级
86bf6991
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
73 addition
and
74 deletion
+73
-74
spring-webmvc/src/main/java/org/springframework/web/servlet/resource/ResourceUrlEncodingFilter.java
...ework/web/servlet/resource/ResourceUrlEncodingFilter.java
+12
-5
spring-webmvc/src/test/java/org/springframework/web/servlet/resource/ResourceUrlEncodingFilterTests.java
.../web/servlet/resource/ResourceUrlEncodingFilterTests.java
+61
-69
未找到文件。
spring-webmvc/src/main/java/org/springframework/web/servlet/resource/ResourceUrlEncodingFilter.java
浏览文件 @
58b17bff
/*
* Copyright 2002-201
8
the original author or authors.
* Copyright 2002-201
9
the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
...
...
@@ -111,7 +111,7 @@ public class ResourceUrlEncodingFilter extends GenericFilterBean {
return
null
;
}
if
(
this
.
indexLookupPath
!=
null
&&
url
.
startsWith
(
this
.
prefixLookupPath
))
{
int
suffixIndex
=
get
QueryParams
Index
(
url
);
int
suffixIndex
=
get
EndPath
Index
(
url
);
String
suffix
=
url
.
substring
(
suffixIndex
);
String
lookupPath
=
url
.
substring
(
this
.
indexLookupPath
,
suffixIndex
);
lookupPath
=
this
.
resourceUrlProvider
.
getForLookupPath
(
lookupPath
);
...
...
@@ -122,9 +122,16 @@ public class ResourceUrlEncodingFilter extends GenericFilterBean {
return
null
;
}
private
int
getQueryParamsIndex
(
String
url
)
{
int
index
=
url
.
indexOf
(
'?'
);
return
(
index
>
0
?
index
:
url
.
length
());
private
int
getEndPathIndex
(
String
path
)
{
int
end
=
path
.
indexOf
(
'?'
);
int
fragmentIndex
=
path
.
indexOf
(
'#'
);
if
(
fragmentIndex
!=
-
1
&&
(
end
==
-
1
||
fragmentIndex
<
end
))
{
end
=
fragmentIndex
;
}
if
(
end
==
-
1
)
{
end
=
path
.
length
();
}
return
end
;
}
}
...
...
spring-webmvc/src/test/java/org/springframework/web/servlet/resource/ResourceUrlEncodingFilterTests.java
浏览文件 @
58b17bff
/*
* Copyright 2002-201
6
the original author or authors.
* Copyright 2002-201
9
the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
...
...
@@ -15,9 +15,11 @@
*/
package
org.springframework.web.servlet.resource
;
import
java.util.Arrays
;
import
java.io.IOException
;
import
java.util.ArrayList
;
import
java.util.Collections
;
import
java.util.List
;
import
javax.servlet.ServletException
;
import
javax.servlet.http.HttpServletResponse
;
import
org.junit.Before
;
...
...
@@ -27,7 +29,7 @@ import org.springframework.core.io.ClassPathResource;
import
org.springframework.mock.web.test.MockHttpServletRequest
;
import
org.springframework.mock.web.test.MockHttpServletResponse
;
import
static
org
.
junit
.
Assert
.
assertEquals
;
import
static
org
.
junit
.
Assert
.
*
;
/**
* Unit tests for {@code ResourceUrlEncodingFilter}.
...
...
@@ -40,41 +42,45 @@ public class ResourceUrlEncodingFilterTests {
private
ResourceUrlProvider
urlProvider
;
@Before
public
void
createFilter
()
throws
Exception
{
public
void
createFilter
()
{
VersionResourceResolver
versionResolver
=
new
VersionResourceResolver
();
versionResolver
.
setStrategyMap
(
Collections
.
singletonMap
(
"/**"
,
new
ContentVersionStrategy
()));
PathResourceResolver
pathResolver
=
new
PathResourceResolver
();
pathResolver
.
setAllowedLocations
(
new
ClassPathResource
(
"test/"
,
getClass
()));
List
<
ResourceResolver
>
resolvers
=
Arrays
.
asList
(
versionResolver
,
pathResolver
);
List
<
ResourceResolver
>
resolvers
=
new
ArrayList
<>();
resolvers
.
add
(
versionResolver
);
resolvers
.
add
(
pathResolver
);
this
.
filter
=
new
ResourceUrlEncodingFilter
();
this
.
urlProvider
=
createResourceUrlProvider
(
resolvers
);
}
private
ResourceUrlProvider
createResourceUrlProvider
(
List
<
ResourceResolver
>
resolvers
)
{
ResourceHttpRequestHandler
handler
=
new
ResourceHttpRequestHandler
();
handler
.
setLocations
(
Collections
.
singletonList
(
new
ClassPathResource
(
"test/"
,
getClass
())));
handler
.
setResourceResolvers
(
resolvers
);
ResourceUrlProvider
urlProvider
=
new
ResourceUrlProvider
();
urlProvider
.
setHandlerMap
(
Collections
.
singletonMap
(
"/resources/**"
,
handler
));
return
urlProvider
;
}
@Test
public
void
encodeURL
()
throws
Exception
{
MockHttpServletRequest
request
=
new
MockHttpServletRequest
(
"GET"
,
"/"
);
MockHttpServletResponse
response
=
new
MockHttpServletResponse
();
this
.
filter
.
doFilter
(
request
,
response
,
(
req
,
res
)
->
{
req
.
setAttribute
(
ResourceUrlProviderExposingInterceptor
.
RESOURCE_URL_PROVIDER_ATTR
,
this
.
urlProvider
);
String
result
=
((
HttpServletResponse
)
res
).
encodeURL
(
"/resources/bar.css"
);
assertEquals
(
"/resources/bar-11e16cf79faee7ac698c805cf28248d2.css"
,
result
);
});
testEncodeUrl
(
new
MockHttpServletRequest
(
"GET"
,
"/"
),
"/resources/bar.css"
,
"/resources/bar-11e16cf79faee7ac698c805cf28248d2.css"
);
}
@Test
public
void
encodeU
RL
WithContext
()
throws
Exception
{
public
void
encodeU
rl
WithContext
()
throws
Exception
{
MockHttpServletRequest
request
=
new
MockHttpServletRequest
(
"GET"
,
"/context/foo"
);
request
.
setContextPath
(
"/context"
);
MockHttpServletResponse
response
=
new
MockHttpServletResponse
();
this
.
filter
.
doFilter
(
request
,
response
,
(
req
,
res
)
->
{
req
.
setAttribute
(
ResourceUrlProviderExposingInterceptor
.
RESOURCE_URL_PROVIDER_ATTR
,
this
.
urlProvider
);
String
result
=
((
HttpServletResponse
)
res
).
encodeURL
(
"/context/resources/bar.css"
);
assertEquals
(
"/context/resources/bar-11e16cf79faee7ac698c805cf28248d2.css"
,
result
);
});
testEncodeUrl
(
request
,
"/context/resources/bar.css"
,
"/context/resources/bar-11e16cf79faee7ac698c805cf28248d2.css"
);
}
...
...
@@ -82,9 +88,8 @@ public class ResourceUrlEncodingFilterTests {
public
void
encodeUrlWithContextAndForwardedRequest
()
throws
Exception
{
MockHttpServletRequest
request
=
new
MockHttpServletRequest
(
"GET"
,
"/context/foo"
);
request
.
setContextPath
(
"/context"
);
MockHttpServletResponse
response
=
new
MockHttpServletResponse
();
this
.
filter
.
doFilter
(
request
,
response
,
(
req
,
res
)
->
{
this
.
filter
.
doFilter
(
request
,
new
MockHttpServletResponse
()
,
(
req
,
res
)
->
{
req
.
setAttribute
(
ResourceUrlProviderExposingInterceptor
.
RESOURCE_URL_PROVIDER_ATTR
,
this
.
urlProvider
);
request
.
setRequestURI
(
"/forwarded"
);
request
.
setContextPath
(
"/"
);
...
...
@@ -93,84 +98,71 @@ public class ResourceUrlEncodingFilterTests {
});
}
// SPR-13757
@Test
@Test
// SPR-13757
public
void
encodeContextPathUrlWithoutSuffix
()
throws
Exception
{
MockHttpServletRequest
request
=
new
MockHttpServletRequest
(
"GET"
,
"/context"
);
request
.
setContextPath
(
"/context"
);
MockHttpServletResponse
response
=
new
MockHttpServletResponse
();
this
.
filter
.
doFilter
(
request
,
response
,
(
req
,
res
)
->
{
req
.
setAttribute
(
ResourceUrlProviderExposingInterceptor
.
RESOURCE_URL_PROVIDER_ATTR
,
this
.
urlProvider
);
String
result
=
((
HttpServletResponse
)
res
).
encodeURL
(
"/context/resources/bar.css"
);
assertEquals
(
"/context/resources/bar-11e16cf79faee7ac698c805cf28248d2.css"
,
result
);
});
testEncodeUrl
(
request
,
"/context/resources/bar.css"
,
"/context/resources/bar-11e16cf79faee7ac698c805cf28248d2.css"
);
}
@Test
public
void
encodeContextPathUrlWithSuffix
()
throws
Exception
{
MockHttpServletRequest
request
=
new
MockHttpServletRequest
(
"GET"
,
"/context/"
);
request
.
setContextPath
(
"/context"
);
MockHttpServletResponse
response
=
new
MockHttpServletResponse
();
this
.
filter
.
doFilter
(
request
,
response
,
(
req
,
res
)
->
{
req
.
setAttribute
(
ResourceUrlProviderExposingInterceptor
.
RESOURCE_URL_PROVIDER_ATTR
,
this
.
urlProvider
);
String
result
=
((
HttpServletResponse
)
res
).
encodeURL
(
"/context/resources/bar.css"
);
assertEquals
(
"/context/resources/bar-11e16cf79faee7ac698c805cf28248d2.css"
,
result
);
});
testEncodeUrl
(
request
,
"/context/resources/bar.css"
,
"/context/resources/bar-11e16cf79faee7ac698c805cf28248d2.css"
);
}
// SPR-13018
@Test
public
void
encodeEmptyURLWithContext
()
throws
Exception
{
@Test
// SPR-13018
public
void
encodeEmptyUrlWithContext
()
throws
Exception
{
MockHttpServletRequest
request
=
new
MockHttpServletRequest
(
"GET"
,
"/context/foo"
);
request
.
setContextPath
(
"/context"
);
MockHttpServletResponse
response
=
new
MockHttpServletResponse
();
this
.
filter
.
doFilter
(
request
,
response
,
(
req
,
res
)
->
{
req
.
setAttribute
(
ResourceUrlProviderExposingInterceptor
.
RESOURCE_URL_PROVIDER_ATTR
,
this
.
urlProvider
);
String
result
=
((
HttpServletResponse
)
res
).
encodeURL
(
"?foo=1"
);
assertEquals
(
"?foo=1"
,
result
);
});
testEncodeUrl
(
request
,
"?foo=1"
,
"?foo=1"
);
}
// SPR-13374
@Test
public
void
encodeURLWithRequestParams
()
throws
Exception
{
@Test
// SPR-13374
public
void
encodeUrlWithRequestParams
()
throws
Exception
{
MockHttpServletRequest
request
=
new
MockHttpServletRequest
(
"GET"
,
"/foo"
);
request
.
setContextPath
(
"/"
);
MockHttpServletResponse
response
=
new
MockHttpServletResponse
();
this
.
filter
.
doFilter
(
request
,
response
,
(
req
,
res
)
->
{
req
.
setAttribute
(
ResourceUrlProviderExposingInterceptor
.
RESOURCE_URL_PROVIDER_ATTR
,
this
.
urlProvider
);
String
result
=
((
HttpServletResponse
)
res
).
encodeURL
(
"/resources/bar.css?foo=bar&url=http://example.org"
);
assertEquals
(
"/resources/bar-11e16cf79faee7ac698c805cf28248d2.css?foo=bar&url=http://example.org"
,
result
);
});
testEncodeUrl
(
request
,
"/resources/bar.css?foo=bar&url=http://example.org"
,
"/resources/bar-11e16cf79faee7ac698c805cf28248d2.css?foo=bar&url=http://example.org"
);
}
// SPR-13847
@Test
@Test
// SPR-13847
public
void
encodeUrlPreventStringOutOfBounds
()
throws
Exception
{
MockHttpServletRequest
request
=
new
MockHttpServletRequest
(
"GET"
,
"/context-path/index"
);
request
.
setContextPath
(
"/context-path"
);
request
.
setServletPath
(
""
);
MockHttpServletResponse
response
=
new
MockHttpServletResponse
();
this
.
filter
.
doFilter
(
request
,
response
,
(
req
,
res
)
->
{
req
.
setAttribute
(
ResourceUrlProviderExposingInterceptor
.
RESOURCE_URL_PROVIDER_ATTR
,
this
.
urlProvider
);
String
result
=
((
HttpServletResponse
)
res
).
encodeURL
(
"index?key=value"
);
assertEquals
(
"index?key=value"
,
result
);
});
testEncodeUrl
(
request
,
"index?key=value"
,
"index?key=value"
);
}
@Test
// gh-22552
public
void
encodeUrlWithFragment
()
throws
Exception
{
MockHttpServletRequest
request
=
new
MockHttpServletRequest
(
"GET"
,
"/foo"
);
request
.
setContextPath
(
"/"
);
testEncodeUrl
(
request
,
"/resources/bar.css#something"
,
"/resources/bar-11e16cf79faee7ac698c805cf28248d2.css#something"
);
testEncodeUrl
(
request
,
"/resources/bar.css?foo=bar&url=http://example.org#something"
,
"/resources/bar-11e16cf79faee7ac698c805cf28248d2.css?foo=bar&url=http://example.org#something"
);
}
private
void
testEncodeUrl
(
MockHttpServletRequest
request
,
String
url
,
String
expected
)
throws
ServletException
,
IOException
{
protected
ResourceUrlProvider
createResourceUrlProvider
(
List
<
ResourceResolver
>
resolvers
)
{
ResourceHttpRequestHandler
handler
=
new
ResourceHttpRequestHandler
();
handler
.
setLocations
(
Arrays
.
asList
(
new
ClassPathResource
(
"test/"
,
getClass
())));
handler
.
setResourceResolvers
(
resolvers
);
ResourceUrlProvider
urlProvider
=
new
ResourceUrlProvider
();
urlProvider
.
setHandlerMap
(
Collections
.
singletonMap
(
"/resources/**"
,
handler
));
return
urlProvider
;
this
.
filter
.
doFilter
(
request
,
new
MockHttpServletResponse
(),
(
req
,
res
)
->
{
req
.
setAttribute
(
ResourceUrlProviderExposingInterceptor
.
RESOURCE_URL_PROVIDER_ATTR
,
this
.
urlProvider
);
String
result
=
((
HttpServletResponse
)
res
).
encodeURL
(
url
);
assertEquals
(
expected
,
result
);
});
}
}
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录