handle non-compliant form senders

Robert Engels · Robert Engels · commit 24a4fabf900a · 2023-11-24T14:59:17.000-06:00
diff --git a/src/main/java/robaho/net/httpserver/extras/MultipartFormParser.java b/src/main/java/robaho/net/httpserver/extras/MultipartFormParser.java
@@ -67,15 +67,16 @@ public static Map<String, List<Part>> parse(String encoding, String content_type
 
         System.out.println("reading until start of part");
         // read until boundary found
-        int matchCount = 0;
+        int matchCount = 2; // starting at 2 allows matching non-compliant senders. rfc says CRLF is part of
+                            // boundary marker
         while (true) {
             int c = is.read();
             if (c == -1) {
                 return results;
             }
             if (c == boundaryCheck[matchCount]) {
                 matchCount++;
-                if (matchCount == boundaryCheck.length) {
+                if (matchCount == boundaryCheck.length - 2) {
                     System.out.println("found boundary marker");
                     break;
                 }
diff --git a/src/test/java/robaho/net/httpserver/extras/MultipartFormParserTest.java b/src/test/java/robaho/net/httpserver/extras/MultipartFormParserTest.java
@@ -2,8 +2,9 @@
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
-import java.io.File;
 import java.io.IOException;
+import java.io.InputStream;
+import java.io.FileInputStream;
 import java.io.UnsupportedEncodingException;
 import java.nio.file.Files;
 import java.nio.file.Path;
@@ -104,4 +105,34 @@ public void testBinary() throws IOException {
 
         Assert.assertEquals(Files.readAllBytes(Path.of("src/test/resources/small.png")), Files.readAllBytes((values.get(0).file()).toPath()), "parse failed");
     }
+
+    @Test
+    public void testFormSample() throws IOException {
+        var header = "Content-Type: multipart/form-data; boundary=46096193475433413916154539608327683027925589011069618792210780606661436297073";
+        InputStream is = new FileInputStream("src/test/resources/formcapture.bin");
+
+        Path storage = Path.of("/tmp", "parser_test");
+        storage.toFile().mkdirs();
+
+        var results = parse("UTF-8", header, is, storage);
+
+        Assert.assertEquals(results.size(), 1);
+        List<Part> values = results.get("myfile");
+        Assert.assertEquals(values.size(), 1);
+    }
+
+    @Test
+    public void testMultiFileFormSample() throws IOException {
+        var header = "Content-Type: multipart/form-data; boundary=32727956756671617181299787496850966478586709733883895208245398568225409799378";
+        InputStream is = new FileInputStream("src/test/resources/multifile_formcapture.bin");
+
+        Path storage = Path.of("/tmp", "parser_test");
+        storage.toFile().mkdirs();
+
+        var results = parse("UTF-8", header, is, storage);
+
+        Assert.assertEquals(results.size(), 2);
+        List<Part> values = results.get("myfile");
+        Assert.assertEquals(values.size(), 1);
+    }
 }
diff --git a/src/test/resources/formcapture.bin b/src/test/resources/formcapture.bin
@@ -0,0 +1,6 @@
+--46096193475433413916154539608327683027925589011069618792210780606661436297073
+Content-Disposition: form-data; name="myfile"; filename="hello.txt"
+Content-Type: text/plain
+
+This is a sample text file.
+--46096193475433413916154539608327683027925589011069618792210780606661436297073--
diff --git a/src/test/resources/multifile_formcapture.bin b/src/test/resources/multifile_formcapture.bin
