Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
爱吃血肠
spring-framework
提交
9a65eec3
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 搜索 >>
提交
9a65eec3
编写于
4月 20, 2015
作者:
S
Sebastien Deleuze
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Avoid registering CorsConfiguration for methods without @CrossOrigin
Issue: SPR-12931
上级
e829b2aa
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
30 addition
and
5 deletion
+30
-5
spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/RequestMappingHandlerMapping.java
...t/mvc/method/annotation/RequestMappingHandlerMapping.java
+6
-4
spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/CrossOriginTests.java
...k/web/servlet/mvc/method/annotation/CrossOriginTests.java
+24
-1
未找到文件。
spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/RequestMappingHandlerMapping.java
浏览文件 @
9a65eec3
...
...
@@ -271,13 +271,15 @@ public class RequestMappingHandlerMapping extends RequestMappingInfoHandlerMappi
@Override
protected
CorsConfiguration
initCorsConfiguration
(
Object
handler
,
Method
method
,
RequestMappingInfo
mappingInfo
)
{
HandlerMethod
handlerMethod
=
createHandlerMethod
(
handler
,
method
);
CrossOrigin
typeAnnotation
=
AnnotationUtils
.
findAnnotation
(
handlerMethod
.
getBeanType
(),
CrossOrigin
.
class
);
CrossOrigin
methodAnnotation
=
AnnotationUtils
.
findAnnotation
(
method
,
CrossOrigin
.
class
);
CorsConfiguration
config
=
new
CorsConfiguration
();
if
(
typeAnnotation
==
null
&&
methodAnnotation
==
null
)
{
return
null
;
}
C
rossOrigin
typeAnnotation
=
AnnotationUtils
.
findAnnotation
(
handlerMethod
.
getBeanType
(),
CrossOrigin
.
class
);
C
orsConfiguration
config
=
new
CorsConfiguration
(
);
applyAnnotation
(
config
,
typeAnnotation
);
CrossOrigin
methodAnnotation
=
AnnotationUtils
.
findAnnotation
(
method
,
CrossOrigin
.
class
);
applyAnnotation
(
config
,
methodAnnotation
);
if
(
CollectionUtils
.
isEmpty
(
config
.
getAllowedMethods
()))
{
...
...
spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/CrossOriginTests.java
浏览文件 @
9a65eec3
...
...
@@ -66,7 +66,7 @@ public class CrossOriginTests {
}
@Test
public
void
noAnnotation
()
throws
Exception
{
public
void
noAnnotation
WithoutOrigin
()
throws
Exception
{
this
.
handlerMapping
.
registerHandler
(
new
MethodLevelController
());
MockHttpServletRequest
request
=
new
MockHttpServletRequest
(
"GET"
,
"/no"
);
HandlerExecutionChain
chain
=
this
.
handlerMapping
.
getHandler
(
request
);
...
...
@@ -74,6 +74,25 @@ public class CrossOriginTests {
assertNull
(
config
);
}
@Test
// SPR-12931
public
void
noAnnotationWithOrigin
()
throws
Exception
{
this
.
handlerMapping
.
registerHandler
(
new
MethodLevelController
());
this
.
request
.
setRequestURI
(
"/no"
);
HandlerExecutionChain
chain
=
this
.
handlerMapping
.
getHandler
(
request
);
CorsConfiguration
config
=
getCorsConfiguration
(
chain
,
false
);
assertNull
(
config
);
}
@Test
// SPR-12931
public
void
noAnnotationPostWithOrigin
()
throws
Exception
{
this
.
handlerMapping
.
registerHandler
(
new
MethodLevelController
());
this
.
request
.
setMethod
(
"POST"
);
this
.
request
.
setRequestURI
(
"/no"
);
HandlerExecutionChain
chain
=
this
.
handlerMapping
.
getHandler
(
request
);
CorsConfiguration
config
=
getCorsConfiguration
(
chain
,
false
);
assertNull
(
config
);
}
@Test
public
void
defaultAnnotation
()
throws
Exception
{
this
.
handlerMapping
.
registerHandler
(
new
MethodLevelController
());
...
...
@@ -203,6 +222,10 @@ public class CrossOriginTests {
public
void
noAnnotation
()
{
}
@RequestMapping
(
value
=
"/no"
,
method
=
RequestMethod
.
POST
)
public
void
noAnnotationPost
()
{
}
@CrossOrigin
@RequestMapping
(
value
=
"/default"
,
method
=
RequestMethod
.
GET
)
public
void
defaultAnnotation
()
{
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录