Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
带水的鱼儿
spring-framework
提交
e1c0f3b0
S
spring-framework
项目概览
带水的鱼儿
/
spring-framework
与 Fork 源项目一致
从无法访问的项目Fork
通知
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,发现更多精彩内容 >>
提交
e1c0f3b0
编写于
7月 12, 2021
作者:
J
Juergen Hoeller
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
CommonsMultipartResolver supports configurable HTTP methods
Closes gh-27161
上级
1ff8da36
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
97 addition
and
4 deletion
+97
-4
spring-web/src/main/java/org/springframework/web/multipart/commons/CommonsMultipartResolver.java
...ework/web/multipart/commons/CommonsMultipartResolver.java
+36
-3
spring-web/src/test/java/org/springframework/web/multipart/commons/CommonsMultipartResolverTests.java
.../web/multipart/commons/CommonsMultipartResolverTests.java
+61
-1
未找到文件。
spring-web/src/main/java/org/springframework/web/multipart/commons/CommonsMultipartResolver.java
浏览文件 @
e1c0f3b0
/*
* Copyright 2002-20
18
the original author or authors.
* Copyright 2002-20
21
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.
...
...
@@ -16,7 +16,10 @@
package
org.springframework.web.multipart.commons
;
import
java.util.Arrays
;
import
java.util.HashSet
;
import
java.util.List
;
import
java.util.Set
;
import
javax.servlet.ServletContext
;
import
javax.servlet.http.HttpServletRequest
;
...
...
@@ -27,7 +30,9 @@ import org.apache.commons.fileupload.FileUpload;
import
org.apache.commons.fileupload.FileUploadBase
;
import
org.apache.commons.fileupload.FileUploadException
;
import
org.apache.commons.fileupload.servlet.ServletFileUpload
;
import
org.apache.commons.fileupload.servlet.ServletRequestContext
;
import
org.springframework.lang.Nullable
;
import
org.springframework.util.Assert
;
import
org.springframework.web.context.ServletContextAware
;
import
org.springframework.web.multipart.MaxUploadSizeExceededException
;
...
...
@@ -41,7 +46,11 @@ import org.springframework.web.util.WebUtils;
/**
* Servlet-based {@link MultipartResolver} implementation for
* <a href="https://commons.apache.org/proper/commons-fileupload">Apache Commons FileUpload</a>
* 1.2 or above.
* 1.2 or above. This resolver variant delegates to a local FileUpload library
* within the application, providing maximum portability across Servlet containers.
*
* <p>Commons FileUpload traditionally parses POST requests with any "multipart/" type.
* Supported HTTP methods may be customized through {@link #setSupportedMethods}.
*
* <p>Provides "maxUploadSize", "maxInMemorySize" and "defaultEncoding" settings as
* bean properties (inherited from {@link CommonsFileUploadSupport}). See corresponding
...
...
@@ -52,19 +61,29 @@ import org.springframework.web.util.WebUtils;
* Needs to be initialized <i>either</i> by an application context <i>or</i>
* via the constructor that takes a ServletContext (for standalone usage).
*
* <p>Note: The common alternative is
* {@link org.springframework.web.multipart.support.StandardServletMultipartResolver},
* delegating to the Servlet container's own multipart parser, with configuration to
* happen at the container level and potentially with container-specific limitations.
*
* @author Trevor D. Cook
* @author Juergen Hoeller
* @since 29.09.2003
* @see #CommonsMultipartResolver(ServletContext)
* @see #setResolveLazily
* @see #setSupportedMethods
* @see org.apache.commons.fileupload.servlet.ServletFileUpload
* @see org.apache.commons.fileupload.disk.DiskFileItemFactory
* @see org.springframework.web.multipart.support.StandardServletMultipartResolver
*/
public
class
CommonsMultipartResolver
extends
CommonsFileUploadSupport
implements
MultipartResolver
,
ServletContextAware
{
private
boolean
resolveLazily
=
false
;
@Nullable
private
Set
<
String
>
supportedMethods
;
/**
* Constructor for use as bean. Determines the servlet container's
...
...
@@ -101,6 +120,17 @@ public class CommonsMultipartResolver extends CommonsFileUploadSupport
this
.
resolveLazily
=
resolveLazily
;
}
/**
* Specify supported methods as an array of HTTP method names.
* The traditional Commons FileUpload default is "POST" only.
* <p>When configured as a Spring property value,
* this can be a comma-separated String: e.g. "POST,PUT".
* @since 5.3.9
*/
public
void
setSupportedMethods
(
String
...
supportedMethods
)
{
this
.
supportedMethods
=
new
HashSet
<>(
Arrays
.
asList
(
supportedMethods
));
}
/**
* Initialize the underlying {@code org.apache.commons.fileupload.servlet.ServletFileUpload}
* instance. Can be overridden to use a custom subclass, e.g. for testing purposes.
...
...
@@ -122,7 +152,10 @@ public class CommonsMultipartResolver extends CommonsFileUploadSupport
@Override
public
boolean
isMultipart
(
HttpServletRequest
request
)
{
return
ServletFileUpload
.
isMultipartContent
(
request
);
return
(
this
.
supportedMethods
!=
null
?
this
.
supportedMethods
.
contains
(
request
.
getMethod
())
&&
FileUploadBase
.
isMultipartContent
(
new
ServletRequestContext
(
request
))
:
ServletFileUpload
.
isMultipartContent
(
request
));
}
@Override
...
...
spring-web/src/test/java/org/springframework/web/multipart/commons/CommonsMultipartResolverTests.java
浏览文件 @
e1c0f3b0
/*
* Copyright 2002-20
19
the original author or authors.
* Copyright 2002-20
21
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.
...
...
@@ -46,6 +46,7 @@ import org.apache.commons.fileupload.servlet.ServletFileUpload;
import
org.junit.jupiter.api.Test
;
import
org.springframework.beans.MutablePropertyValues
;
import
org.springframework.http.MediaType
;
import
org.springframework.util.MultiValueMap
;
import
org.springframework.web.bind.ServletRequestDataBinder
;
import
org.springframework.web.context.WebApplicationContext
;
...
...
@@ -71,6 +72,65 @@ import static org.assertj.core.api.Assertions.assertThat;
*/
public
class
CommonsMultipartResolverTests
{
@Test
public
void
isMultipartWithDefaultSetting
()
{
CommonsMultipartResolver
resolver
=
new
CommonsMultipartResolver
();
MockHttpServletRequest
request
=
new
MockHttpServletRequest
(
"POST"
,
"/"
);
assertThat
(
resolver
.
isMultipart
(
request
)).
isFalse
();
request
.
setContentType
(
MediaType
.
MULTIPART_FORM_DATA_VALUE
);
assertThat
(
resolver
.
isMultipart
(
request
)).
isTrue
();
request
.
setContentType
(
MediaType
.
MULTIPART_MIXED_VALUE
);
assertThat
(
resolver
.
isMultipart
(
request
)).
isTrue
();
request
.
setContentType
(
MediaType
.
MULTIPART_RELATED_VALUE
);
assertThat
(
resolver
.
isMultipart
(
request
)).
isTrue
();
request
=
new
MockHttpServletRequest
(
"PUT"
,
"/"
);
assertThat
(
resolver
.
isMultipart
(
request
)).
isFalse
();
request
.
setContentType
(
MediaType
.
MULTIPART_FORM_DATA_VALUE
);
assertThat
(
resolver
.
isMultipart
(
request
)).
isFalse
();
request
.
setContentType
(
MediaType
.
MULTIPART_MIXED_VALUE
);
assertThat
(
resolver
.
isMultipart
(
request
)).
isFalse
();
request
.
setContentType
(
MediaType
.
MULTIPART_RELATED_VALUE
);
assertThat
(
resolver
.
isMultipart
(
request
)).
isFalse
();
}
@Test
public
void
isMultipartWithSupportedMethods
()
{
CommonsMultipartResolver
resolver
=
new
CommonsMultipartResolver
();
resolver
.
setSupportedMethods
(
"POST"
,
"PUT"
);
MockHttpServletRequest
request
=
new
MockHttpServletRequest
(
"POST"
,
"/"
);
assertThat
(
resolver
.
isMultipart
(
request
)).
isFalse
();
request
.
setContentType
(
MediaType
.
MULTIPART_FORM_DATA_VALUE
);
assertThat
(
resolver
.
isMultipart
(
request
)).
isTrue
();
request
.
setContentType
(
MediaType
.
MULTIPART_MIXED_VALUE
);
assertThat
(
resolver
.
isMultipart
(
request
)).
isTrue
();
request
.
setContentType
(
MediaType
.
MULTIPART_RELATED_VALUE
);
assertThat
(
resolver
.
isMultipart
(
request
)).
isTrue
();
request
=
new
MockHttpServletRequest
(
"PUT"
,
"/"
);
assertThat
(
resolver
.
isMultipart
(
request
)).
isFalse
();
request
.
setContentType
(
MediaType
.
MULTIPART_FORM_DATA_VALUE
);
assertThat
(
resolver
.
isMultipart
(
request
)).
isTrue
();
request
.
setContentType
(
MediaType
.
MULTIPART_MIXED_VALUE
);
assertThat
(
resolver
.
isMultipart
(
request
)).
isTrue
();
request
.
setContentType
(
MediaType
.
MULTIPART_RELATED_VALUE
);
assertThat
(
resolver
.
isMultipart
(
request
)).
isTrue
();
}
@Test
public
void
withApplicationContext
()
throws
Exception
{
doTestWithApplicationContext
(
false
);
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录