[UNDERTOW-1601] - fix max entity handling for multipart

Author: baranowb

core/src/main/java/io/undertow/server/HttpServerExchange.java

@@ -40,6 +40,7 @@
 import io.undertow.util.ConduitFactory;
 import io.undertow.util.Cookies;
 import io.undertow.util.HeaderMap;
+import io.undertow.util.HeaderValues;
 import io.undertow.util.Headers;
 import io.undertow.util.HttpString;
 import io.undertow.util.Methods;
@@ -228,12 +229,15 @@ public final class HttpServerExchange extends AbstractAttachable {
      * The default value for this is determined by the {@link io.undertow.UndertowOptions#MAX_ENTITY_SIZE} option. A value
      * of 0 indicates that this is unbounded.
      * <p>
+     * In case of multipart handling, this will default to {@link io.undertow.UndertowOptions#MULTIPART_MAX_ENTITY_SIZE}
+     * <p>
      * If this entity size is exceeded the request channel will be forcibly closed.
      * <p>
      * TODO: integrate this with HTTP 100-continue responses, to make it possible to send a 417 rather than just forcibly
      * closing the channel.
      *
      * @see io.undertow.UndertowOptions#MAX_ENTITY_SIZE
+     * @see io.undertow.UndertowOptions#MULTIPART_MAX_ENTITY_SIZE
      */
     private long maxEntitySize;
 
@@ -1871,6 +1875,16 @@ public XnioIoThread getIoThread() {
         return connection.getIoThread();
     }
 
+    public boolean isMultiPartExchange() {
+        //NOTE: should this include Range response?
+        final HeaderValues contentTypeHeaders = getRequestHeaders().get("Content-Type");
+        if(contentTypeHeaders != null && contentTypeHeaders.size() >0) {
+            return contentTypeHeaders.getFirst().startsWith("multipart");
+        } else {
+            return false;
+        }
+    }
+
     /**
      * @return The maximum entity size for this exchange
      */

servlet/src/main/java/io/undertow/servlet/core/ManagedServlet.java

@@ -60,7 +60,7 @@ public class ManagedServlet implements Lifecycle {
     private final InstanceStrategy instanceStrategy;
     private volatile boolean permanentlyUnavailable = false;
 
-    private long maxRequestSize;
+    private long maxMultipartRequestSize;
     private FormParserFactory formParserFactory;
     private MultipartConfigElement multipartConfig;
 
@@ -92,9 +92,9 @@ public void setupMultipart(ServletContextImpl servletContext) {
             //todo: fileSizeThreshold
             MultipartConfigElement config = multipartConfig;
             if (config.getMaxRequestSize() != -1) {
-                maxRequestSize = config.getMaxRequestSize();
+                maxMultipartRequestSize = config.getMaxRequestSize();
             } else {
-                maxRequestSize = -1;
+                maxMultipartRequestSize = -1;
             }
             final Path tempDir;
             if(config.getLocation() == null || config.getLocation().isEmpty()) {
@@ -127,7 +127,7 @@ public void setupMultipart(ServletContextImpl servletContext) {
         } else {
             //no multipart config we don't allow multipart requests
             formParserFactory = FormParserFactory.builder(false).addParser(formDataParser).build();
-            maxRequestSize = -1;
+            maxMultipartRequestSize = -1;
         }
     }
 
@@ -235,8 +235,16 @@ public ServletInfo getServletInfo() {
         return servletInfo;
     }
 
+    /**
+     * @deprecated
+     * @return
+     */
     public long getMaxRequestSize() {
-        return maxRequestSize;
+        return maxMultipartRequestSize;
+    }
+
+    public long getMaxMultipartRequestSize() {
+        return maxMultipartRequestSize;
     }
 
     public FormParserFactory getFormParserFactory() {

servlet/src/main/java/io/undertow/servlet/handlers/ServletInitialHandler.java

@@ -154,8 +154,8 @@ public void handleRequest(final HttpServerExchange exchange) throws Exception {
         final HttpServletRequestImpl request = new HttpServletRequestImpl(exchange, servletContext);
         final ServletRequestContext servletRequestContext = new ServletRequestContext(servletContext.getDeployment(), request, response, info);
         //set the max request size if applicable
-        if (info.getServletChain().getManagedServlet().getMaxRequestSize() > 0) {
-            exchange.setMaxEntitySize(info.getServletChain().getManagedServlet().getMaxRequestSize());
+        if (info.getServletChain().getManagedServlet().getMaxMultipartRequestSize() > 0 && exchange.isMultiPartExchange()) {
+            exchange.setMaxEntitySize(info.getServletChain().getManagedServlet().getMaxMultipartRequestSize());
         }
         exchange.putAttachment(ServletRequestContext.ATTACHMENT_KEY, servletRequestContext);
 
@@ -224,8 +224,8 @@ public void dispatchMockRequest(HttpServletRequest request, HttpServletResponse
         servletRequestContext.setServletRequest(request);
         servletRequestContext.setServletResponse(response);
         //set the max request size if applicable
-        if (info.getServletChain().getManagedServlet().getMaxRequestSize() > 0) {
-            exchange.setMaxEntitySize(info.getServletChain().getManagedServlet().getMaxRequestSize());
+        if (info.getServletChain().getManagedServlet().getMaxMultipartRequestSize() > 0 && exchange.isMultiPartExchange()) {
+            exchange.setMaxEntitySize(info.getServletChain().getManagedServlet().getMaxMultipartRequestSize());
         }
         exchange.putAttachment(ServletRequestContext.ATTACHMENT_KEY, servletRequestContext);