Get Content Type From Multipart (robaho#30)

SentryMan · robaho · web-flow · commit 708d96ea6f45 · 2025-09-22T12:38:03.000-05:00
* get content type from multipart

* fix PR. add test cases

---------

Co-authored-by: robert engels &lt;robaho@users.noreply.github.com&gt;
diff --git a/.gitignore b/.gitignore
@@ -8,3 +8,8 @@ fileserver/
 gradlew.bat
 gradle/
 gradle/
+/target/
+.classpath
+.factorypath
+*.prefs
+.project
diff --git a/src/main/java/robaho/net/httpserver/extras/MultipartFormParser.java b/src/main/java/robaho/net/httpserver/extras/MultipartFormParser.java
@@ -38,7 +38,7 @@ public record Part(String contentType, String filename, String data, File file)
 
     }
 
-    private record PartMetadata(String name, String filename) {
+    private record PartMetadata(String contentType, String name, String filename) {
 
     }
 
@@ -120,12 +120,12 @@ public static Map<String, List<Part>> parse(String encoding, String content_type
             if (meta.filename == null) {
                 var bos = new ByteArrayOutputStream();
                 os = bos;
-                addToResults = () -> results.computeIfAbsent(meta.name, k -> new LinkedList<Part>()).add(new Part(null, null, bos.toString(charset), null));
+                addToResults = () -> results.computeIfAbsent(meta.name, k -> new LinkedList<Part>()).add(new Part(meta.contentType, null, bos.toString(charset), null));
             } else {
                 File file = Path.of(storage.toString(), meta.filename).toFile();
                 file.deleteOnExit();
                 os = new NoSyncBufferedOutputStream(new FileOutputStream(file));
-                addToResults = () -> results.computeIfAbsent(meta.name, k -> new LinkedList<Part>()).add(new Part(null, meta.filename, null, file));
+                addToResults = () -> results.computeIfAbsent(meta.name, k -> new LinkedList<Part>()).add(new Part(meta.contentType, meta.filename, null, file));
             }
 
             try (os) {
@@ -170,6 +170,7 @@ public static Map<String, List<Part>> parse(String encoding, String content_type
     private static PartMetadata parseHeaders(List<String> headers) {
         String name = null;
         String filename = null;
+        String contentType = null;
         for (var header : headers) {
             String[] parts = header.split(":", 2);
             if ("content-disposition".equalsIgnoreCase(parts[0])) {
@@ -188,9 +189,11 @@ private static PartMetadata parseHeaders(List<String> headers) {
                     }
                 }
 
+            } else if ("content-type".equalsIgnoreCase(parts[0])) {
+                contentType = parts[1].trim();
             }
         }
-        return new PartMetadata(name, filename);
+        return new PartMetadata(contentType, name, filename);
     }
 
     private static String readLine(Charset charset, InputStream is) throws IOException {
diff --git a/src/test/java/robaho/net/httpserver/extras/MultipartFormParserTest.java b/src/test/java/robaho/net/httpserver/extras/MultipartFormParserTest.java
@@ -52,13 +52,16 @@ public void testFiles() throws UnsupportedEncodingException, IOException {
         s += "111Y\r\n";
         s += "111Z\rCCCC\nCCCC\r\nCCCCC@\r\n";
 
+        Assert.assertEquals(values.get(0).contentType(),"text/plain");
         Assert.assertEquals(s.getBytes("UTF-8"), Files.readAllBytes((values.get(0).file()).toPath()), "file1 failed");
 
+
         s = "\r\n";
         s += "@22X";
         s += "222Y\r\n";
         s += "222Z\r222W\n2220\r\n666@";
 
+        Assert.assertEquals(values.get(1).contentType(),"text/plain");
         Assert.assertEquals(s.getBytes("UTF-8"), Files.readAllBytes((values.get(1).file()).toPath()), "file2 failed");
     }
 
@@ -118,6 +121,7 @@ public void testFormSample() throws IOException {
 
         Assert.assertEquals(results.size(), 1);
         List<Part> values = results.get("myfile");
+        Assert.assertEquals(values.get(0).contentType(), "text/plain");
         Assert.assertEquals(values.size(), 1);
     }
 
@@ -133,6 +137,12 @@ public void testMultiFileFormSample() throws IOException {
 
         Assert.assertEquals(results.size(), 2);
         List<Part> values = results.get("myfile");
+        Assert.assertEquals(values.get(0).contentType(), "text/plain");
+        Assert.assertEquals(values.size(), 1);
+
+        values = results.get("myfile2");
+        Assert.assertEquals(values.get(0).contentType(), "image/png");
         Assert.assertEquals(values.size(), 1);
+
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -38,7 +38,7 @@ public record Part(String contentType, String filename, String data, File file)`
`38`	`38`
`39`	`39`	`}`
`40`	`40`
`41`		`- private record PartMetadata(String name, String filename) {`
	`41`	`+ private record PartMetadata(String contentType, String name, String filename) {`
`42`	`42`
`43`	`43`	`}`
`44`	`44`
`@@ -120,12 +120,12 @@ public static Map<String, List<Part>> parse(String encoding, String content_type`
`120`	`120`	`if (meta.filename == null) {`
`121`	`121`	`var bos = new ByteArrayOutputStream();`
`122`	`122`	`os = bos;`
`123`		`- addToResults = () -> results.computeIfAbsent(meta.name, k -> new LinkedList<Part>()).add(new Part(null, null, bos.toString(charset), null));`
	`123`	`+ addToResults = () -> results.computeIfAbsent(meta.name, k -> new LinkedList<Part>()).add(new Part(meta.contentType, null, bos.toString(charset), null));`
`124`	`124`	`} else {`
`125`	`125`	`File file = Path.of(storage.toString(), meta.filename).toFile();`
`126`	`126`	`file.deleteOnExit();`
`127`	`127`	`os = new NoSyncBufferedOutputStream(new FileOutputStream(file));`
`128`		`- addToResults = () -> results.computeIfAbsent(meta.name, k -> new LinkedList<Part>()).add(new Part(null, meta.filename, null, file));`
	`128`	`+ addToResults = () -> results.computeIfAbsent(meta.name, k -> new LinkedList<Part>()).add(new Part(meta.contentType, meta.filename, null, file));`
`129`	`129`	`}`
`130`	`130`
`131`	`131`	`try (os) {`
`@@ -170,6 +170,7 @@ public static Map<String, List<Part>> parse(String encoding, String content_type`
`170`	`170`	`private static PartMetadata parseHeaders(List<String> headers) {`
`171`	`171`	`String name = null;`
`172`	`172`	`String filename = null;`
	`173`	`+ String contentType = null;`
`173`	`174`	`for (var header : headers) {`
`174`	`175`	`String[] parts = header.split(":", 2);`
`175`	`176`	`if ("content-disposition".equalsIgnoreCase(parts[0])) {`
`@@ -188,9 +189,11 @@ private static PartMetadata parseHeaders(List<String> headers) {`
`188`	`189`	`}`
`189`	`190`	`}`
`190`	`191`
	`192`	`+ } else if ("content-type".equalsIgnoreCase(parts[0])) {`
	`193`	`+ contentType = parts[1].trim();`
`191`	`194`	`}`
`192`	`195`	`}`
`193`		`- return new PartMetadata(name, filename);`
	`196`	`+ return new PartMetadata(contentType, name, filename);`
`194`	`197`	`}`
`195`	`198`
`196`	`199`	`private static String readLine(Charset charset, InputStream is) throws IOException {`