You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@struts.apache.org by lu...@apache.org on 2025/01/05 08:21:28 UTC
(struts) branch fix/WW-5500-s7 created (now 6d71674cc)
This is an automated email from the ASF dual-hosted git repository.
lukaszlenart pushed a change to branch fix/WW-5500-s7
in repository https://gitbox.apache.org/repos/asf/struts.git
at 6d71674cc WW-5500 Extends pattern to validate multipart uploads
This branch includes the following new commits:
new 6d71674cc WW-5500 Extends pattern to validate multipart uploads
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
(struts) 01/01: WW-5500 Extends pattern to validate multipart uploads
Posted by lu...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
lukaszlenart pushed a commit to branch fix/WW-5500-s7
in repository https://gitbox.apache.org/repos/asf/struts.git
commit 6d71674cc150a969a8025b765c1484b8a39fb47a
Author: Lukasz Lenart <lu...@apache.org>
AuthorDate: Fri Jan 3 17:10:59 2025 +0100
WW-5500 Extends pattern to validate multipart uploads
---
core/src/main/java/org/apache/struts2/dispatcher/Dispatcher.java | 2 +-
core/src/test/java/org/apache/struts2/dispatcher/DispatcherTest.java | 3 +++
2 files changed, 4 insertions(+), 1 deletion(-)
diff --git a/core/src/main/java/org/apache/struts2/dispatcher/Dispatcher.java b/core/src/main/java/org/apache/struts2/dispatcher/Dispatcher.java
index cb85639d1..5cbd66b56 100644
--- a/core/src/main/java/org/apache/struts2/dispatcher/Dispatcher.java
+++ b/core/src/main/java/org/apache/struts2/dispatcher/Dispatcher.java
@@ -111,7 +111,7 @@ public class Dispatcher {
*/
public static final String REQUEST_POST_METHOD = "POST";
- public static final String MULTIPART_FORM_DATA_REGEX = "^multipart/form-data(?:\\s*;\\s*boundary=[0-9a-zA-Z'()+_,\\-./:=?]{1,70})?(?:\\s*;\\s*charset=[a-zA-Z\\-0-9]{3,14})?";
+ public static final String MULTIPART_FORM_DATA_REGEX = "^multipart/form-data(?:\\s*;\\s*boundary=[0-9a-zA-Z'\"()+_,\\-./:=?]{1,70})?(?:\\s*;\\s*charset=[a-zA-Z\\-0-9]{3,14})?";
private static final String CONFIG_SPLIT_REGEX = "\\s*,\\s*";
diff --git a/core/src/test/java/org/apache/struts2/dispatcher/DispatcherTest.java b/core/src/test/java/org/apache/struts2/dispatcher/DispatcherTest.java
index d2fa808b9..cdfe64b2c 100644
--- a/core/src/test/java/org/apache/struts2/dispatcher/DispatcherTest.java
+++ b/core/src/test/java/org/apache/struts2/dispatcher/DispatcherTest.java
@@ -344,6 +344,9 @@ public class DispatcherTest extends StrutsJUnit4InternalTestCase {
req.setContentType("Multipart/Form-Data ; boundary=---------------------------207103069210263;charset=UTF-16LE");
assertTrue(dispatcher.isMultipartRequest(req));
+
+ req.setContentType("multipart/form-data; boundary=\"----=_Part_38_1092302434.1734807780737\"");
+ assertTrue(dispatcher.isMultipartRequest(req));
}
@Test