From bbbe2a80356811ff4dbaa99da2417a067eb614cc Mon Sep 17 00:00:00 2001 From: Stefaan Dutry Date: Tue, 25 Jul 2017 14:30:07 +0200 Subject: [PATCH] WW-4818 added a couple of simple tests for MULTIPART_FORM_DATA_REGEX --- .../struts2/dispatcher/DispatcherTest.java | 26 +++++++++++++++++++ 1 file changed, 26 insertions(+) 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 0f430de55..4f043cb7b 100644 --- a/core/src/test/java/org/apache/struts2/dispatcher/DispatcherTest.java +++ b/core/src/test/java/org/apache/struts2/dispatcher/DispatcherTest.java @@ -146,6 +146,32 @@ public class DispatcherTest extends StrutsInternalTestCase { assertTrue(wrapped instanceof MultiPartRequestWrapper); } + public void testPrepareMultipartRequestAllAllowedCharacters() throws Exception { + MockHttpServletRequest req = new MockHttpServletRequest(); + MockHttpServletResponse res = new MockHttpServletResponse(); + + req.setMethod("post"); + req.setContentType("multipart/form-data; boundary=01=23a.bC:D((e)d'z?p+o_r,e-"); + Dispatcher du = initDispatcher(Collections.emptyMap()); + du.prepare(req, res); + HttpServletRequest wrapped = du.wrapRequest(req); + + assertTrue(wrapped instanceof MultiPartRequestWrapper); + } + + public void testPrepareMultipartRequestIllegalCharacter() throws Exception { + MockHttpServletRequest req = new MockHttpServletRequest(); + MockHttpServletResponse res = new MockHttpServletResponse(); + + req.setMethod("post"); + req.setContentType("multipart/form-data; boundary=01=2;3a.bC:D((e)d'z?p+o_r,e-"); + Dispatcher du = initDispatcher(Collections.emptyMap()); + du.prepare(req, res); + HttpServletRequest wrapped = du.wrapRequest(req); + + assertFalse(wrapped instanceof MultiPartRequestWrapper); + } + public void testDispatcherListener() throws Exception { final DispatcherListenerState state = new DispatcherListenerState();