Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

explicitly specify maxFormKeys for MultiPartServletTest 

Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
This commit is contained in:
Lachlan Roberts 2023-03-30 14:34:22 +11:00
parent 8b81103a50
commit 0abf51c712
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
jetty-servlet/src/test/java/org/eclipse/jetty/servlet/MultiPartServletTest.java
View File

@ -75,6 +75,7 @@ public class MultiPartServletTest
private ServerConnector connector; private ServerConnector connector;
private HttpClient client; private HttpClient client;
private Path tmpDir; private Path tmpDir;
private ServletContextHandler contextHandler;
private static final int MAX_FILE_SIZE = 512 * 1024; private static final int MAX_FILE_SIZE = 512 * 1024;
private static final int MAX_REQUEST_SIZE = 1024 * 1024 * 8; private static final int MAX_REQUEST_SIZE = 1024 * 1024 * 8;
@ -155,7 +156,7 @@ public class MultiPartServletTest
MultipartConfigElement defaultConfig = new MultipartConfigElement(tmpDir.toAbsolutePath().toString(), MultipartConfigElement defaultConfig = new MultipartConfigElement(tmpDir.toAbsolutePath().toString(),
-1, -1, 1); -1, -1, 1);
ServletContextHandler contextHandler = new ServletContextHandler(ServletContextHandler.SESSIONS); contextHandler = new ServletContextHandler(ServletContextHandler.SESSIONS);
contextHandler.setContextPath("/"); contextHandler.setContextPath("/");
ServletHolder servletHolder = contextHandler.addServlet(MultiPartServlet.class, "/"); ServletHolder servletHolder = contextHandler.addServlet(MultiPartServlet.class, "/");
servletHolder.getRegistration().setMultipartConfig(config); servletHolder.getRegistration().setMultipartConfig(config);
@ -228,6 +229,8 @@ public class MultiPartServletTest
@MethodSource("complianceModes") @MethodSource("complianceModes")
public void testManyParts(MultiPartFormDataCompliance compliance) throws Exception public void testManyParts(MultiPartFormDataCompliance compliance) throws Exception
{ {
int maxParts = 1000;
contextHandler.setMaxFormKeys(maxParts);
connector.getConnectionFactory(HttpConnectionFactory.class).getHttpConfiguration() connector.getConnectionFactory(HttpConnectionFactory.class).getHttpConfiguration()
.setMultiPartFormDataCompliance(compliance); .setMultiPartFormDataCompliance(compliance);
@ -235,7 +238,7 @@ public class MultiPartServletTest
Arrays.fill(byteArray, (byte)1); Arrays.fill(byteArray, (byte)1);
MultiPartRequestContent multiPart = new MultiPartRequestContent(); MultiPartRequestContent multiPart = new MultiPartRequestContent();
for (int i = 0; i < 1000; i++) for (int i = 0; i < maxParts; i++)
{ {
BytesRequestContent content = new BytesRequestContent(byteArray); BytesRequestContent content = new BytesRequestContent(byteArray);
multiPart.addFieldPart("part" + i, content, null); multiPart.addFieldPart("part" + i, content, null);
@ -260,6 +263,8 @@ public class MultiPartServletTest
@MethodSource("complianceModes") @MethodSource("complianceModes")
public void testTooManyParts(MultiPartFormDataCompliance compliance) throws Exception public void testTooManyParts(MultiPartFormDataCompliance compliance) throws Exception
{ {
int maxParts = 1000;
contextHandler.setMaxFormKeys(maxParts);
connector.getConnectionFactory(HttpConnectionFactory.class).getHttpConfiguration() connector.getConnectionFactory(HttpConnectionFactory.class).getHttpConfiguration()
.setMultiPartFormDataCompliance(compliance); .setMultiPartFormDataCompliance(compliance);
@ -267,7 +272,7 @@ public class MultiPartServletTest
Arrays.fill(byteArray, (byte)1); Arrays.fill(byteArray, (byte)1);
MultiPartRequestContent multiPart = new MultiPartRequestContent(); MultiPartRequestContent multiPart = new MultiPartRequestContent();
for (int i = 0; i < 1001; i++) for (int i = 0; i < maxParts + 1; i++)
{ {
BytesRequestContent content = new BytesRequestContent(byteArray); BytesRequestContent content = new BytesRequestContent(byteArray);
multiPart.addFieldPart("part" + i, content, null); multiPart.addFieldPart("part" + i, content, null);