Resteasy Reactive: Handle null fields in multiparts

When having null values in parts, these should be ignored. I confirmed that this behaviour is the same then in Resteasy Classic. Fix #22847
quarkusio · Jan 13, 2022 · d3e3ad5 · d3e3ad5
1 parent a026614
commit d3e3ad5
Show file tree

Hide file tree

Showing 3 changed files with 37 additions and 14 deletions.
diff --git a/...test/java/io/quarkus/resteasy/reactive/server/test/multipart/MultipartOutputResource.java b/...test/java/io/quarkus/resteasy/reactive/server/test/multipart/MultipartOutputResource.java
@@ -49,4 +49,14 @@ public MultipartOutputFileResponse complex() {
         return response;
     }
 
+    @GET
+    @Path("/with-null-fields")
+    @Produces(MediaType.MULTIPART_FORM_DATA)
+    public MultipartOutputFileResponse nullFields() {
+        MultipartOutputFileResponse response = new MultipartOutputFileResponse();
+        response.name = null;
+        response.file = null;
+        return response;
+    }
+
 }
diff --git a/...us/resteasy/reactive/server/test/multipart/MultipartOutputUsingBlockingEndpointsTest.java b/...us/resteasy/reactive/server/test/multipart/MultipartOutputUsingBlockingEndpointsTest.java
@@ -67,6 +67,17 @@ public void testWithFiles() {
         assertContainsFile(response, "file", MediaType.APPLICATION_OCTET_STREAM, "lorem.txt");
     }
 
+    @Test
+    public void testWithNullFields() {
+        RestAssured
+                .given()
+                .get("/multipart/output/with-null-fields")
+                .then()
+                .contentType(ContentType.MULTIPART)
+                .log().all()
+                .statusCode(200); // should return 200 with no parts
+    }
+
     private void assertContainsFile(String response, String name, String contentType, String fileName) {
         String[] lines = response.split("--");
         assertThat(lines).anyMatch(line -> line.contains(String.format(EXPECTED_CONTENT_DISPOSITION_FILE_PART, name, fileName))

diff --git a/...in/java/org/jboss/resteasy/reactive/server/core/multipart/MultipartMessageBodyWriter.java b/...in/java/org/jboss/resteasy/reactive/server/core/multipart/MultipartMessageBodyWriter.java
@@ -69,20 +69,22 @@ private void write(List<PartItem> parts, String boundary, OutputStream outputStr
         Charset charset = requestContext.getDeployment().getRuntimeConfiguration().body().defaultCharset();
         String boundaryLine = "--" + boundary;
         for (PartItem part : parts) {
-            // write boundary: --...
-            writeLine(outputStream, boundaryLine, charset);
-            // write content disposition header
-            writeLine(outputStream, HttpHeaders.CONTENT_DISPOSITION + ": form-data; name=\"" + part.getName() + "\""
-                    + getFileNameIfFile(part.getValue()), charset);
-            // write content content type
-            writeLine(outputStream, HttpHeaders.CONTENT_TYPE + ": " + part.getType(), charset);
-            // extra line
-            writeLine(outputStream, charset);
-
-            // write content
-            write(outputStream, serialiseEntity(part.getValue(), part.getType(), requestContext));
-            // extra line
-            writeLine(outputStream, charset);
+            if (part.getValue() != null) {
+                // write boundary: --...
+                writeLine(outputStream, boundaryLine, charset);
+                // write content disposition header
+                writeLine(outputStream, HttpHeaders.CONTENT_DISPOSITION + ": form-data; name=\"" + part.getName() + "\""
+                        + getFileNameIfFile(part.getValue()), charset);
+                // write content content type
+                writeLine(outputStream, HttpHeaders.CONTENT_TYPE + ": " + part.getType(), charset);
+                // extra line
+                writeLine(outputStream, charset);
+
+                // write content
+                write(outputStream, serialiseEntity(part.getValue(), part.getType(), requestContext));
+                // extra line
+                writeLine(outputStream, charset);
+            }
         }
 
         // write boundary: -- ... --