Working

Author: robotdan

src/test/java/io/fusionauth/http/BaseSocketTest.java

@@ -66,25 +66,7 @@ private void assertResponse(String request, String chunkedExtension, String resp
       var body = bodyString.repeat(((requestBufferSize / bodyString.length())) * 2);
 
       if (request.contains("Transfer-Encoding: chunked")) {
-        //noinspection ExtractMethodRecommender
-        var result = "";
-        // Chunk in 100 byte increments. Using a smaller chunk size to ensure we don't end up with a single chunk.
-        int chunkSize = 100;
-        for (var i = 0; i < body.length(); i += chunkSize) {
-          var endIndex = Math.min(i + chunkSize, body.length());
-          var chunk = body.substring(i, endIndex);
-          var chunkLength = chunk.getBytes(StandardCharsets.UTF_8).length;
-          String hex = Integer.toHexString(chunkLength);
-          //noinspection StringConcatenationInLoop
-          result += hex;
-
-          if (chunkedExtension != null) {
-            result += chunkedExtension;
-          }
-
-          result += ("\r\n" + chunk + "\r\n");
-        }
-        body = result + "0\r\n\r\n";
+        body = chunkItUp(body, chunkedExtension);
       }
 
       request = request.replace("{body}", body);

src/test/java/io/fusionauth/http/BaseTest.java

@@ -47,8 +47,10 @@
 import java.time.Instant;
 import java.time.ZonedDateTime;
 import java.time.format.DateTimeFormatter;
+import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Date;
+import java.util.List;
 import java.util.Map;
 import java.util.UUID;
 import java.util.stream.Collectors;
@@ -328,6 +330,19 @@ public Object[][] schemes() {
     };
   }
 
+  /**
+   * @return The possible schemes - {@code http} and {@code https} and chunked.
+   */
+  @DataProvider
+  public Object[][] schemesAndChunked() {
+    return new Object[][]{
+        {"http", true},
+        {"http", false},
+        {"https", true},
+        {"https", false}
+    };
+  }
+
   /**
    * @return The possible response buffer lengths and schemes.
    */
@@ -415,6 +430,29 @@ protected void assertHTTPResponseEquals(Socket socket, String expectedResponse)
     }
   }
 
+  protected String chunkItUp(String body, String chunkedExtension) {
+    List<String> result = new ArrayList<>();
+    // Chunk in 100 byte increments. Using a smaller chunk size to ensure we don't end up with a single chunk.
+    int chunkSize = 100;
+    for (var i = 0; i < body.length(); i += chunkSize) {
+      var endIndex = Math.min(i + chunkSize, body.length());
+      var chunk = body.substring(i, endIndex);
+      var chunkLength = chunk.getBytes(StandardCharsets.UTF_8).length;
+
+      String hex = Integer.toHexString(chunkLength);
+      result.add(hex);
+
+      if (chunkedExtension != null) {
+        result.add(chunkedExtension);
+      }
+
+      result.add(("\r\n" + chunk + "\r\n"));
+    }
+
+    result.add(("0\r\n\r\n"));
+    return String.join("", result);
+  }
+
   protected void printf(String format, Object... args) {
     if (verbose) {
       System.out.printf(SystemOutPrefix + format, args);

src/test/java/io/fusionauth/http/FormDataTest.java

@@ -48,14 +48,11 @@ public class FormDataTest extends BaseTest {
       """
       .replaceAll("\\s", "");
 
-  @Test(dataProvider = "schemes")
-  public void post_server_configuration_max_form_data(String scheme) throws Exception {
-    // Fixed length. n, n is < max length, Ok.
-    // Fixed length. n, n > too big
-    // Not tested yet: Chunked, too big.
-
+  @Test(dataProvider = "schemesAndChunked")
+  public void post_server_configuration_max_form_data(String scheme, boolean chunked) throws Exception {
     // File too big even though the overall request size is ok.
     withScheme(scheme)
+        .withChunked(chunked)
         .withBodyParameterCount(4096)
         .withBodyParameterSize(32)
         // Body is [180,223]
@@ -75,7 +72,8 @@ public void post_server_configuration_max_form_data(String scheme) throws Except
 
     // Exceeded
     withScheme(scheme)
-        .withBodyParameterCount(42 * 1024)  // 131,072, 131,072
+        .withChunked(chunked)
+        .withBodyParameterCount(42 * 1024)  // 43,008
         .withBodyParameterSize(128)
         // 4k * 33 > 128k
         .withConfiguration(config -> config.withMaxFormDataSize(128 * 1024))
@@ -89,6 +87,7 @@ public void post_server_configuration_max_form_data(String scheme) throws Except
 
     // Large, but max size has been disabled
     withScheme(scheme)
+        .withChunked(chunked)
         .withBodyParameterCount(42 * 1024)  // 131,072, 131,072
         .withBodyParameterSize(128)
         // Disable the limit
@@ -155,7 +154,6 @@ public void post_server_configuration_max_request_header_size(String scheme) thr
             \r
             {"version":"42"}""")
         .expectNoExceptionOnWrite();
-
   }
 
   private Builder withScheme(String scheme) {
@@ -168,6 +166,8 @@ private class Builder {
 
     private int bodyParameterSize = 42;
 
+    private boolean chunked;
+
     private Consumer<HTTPServerConfiguration> configuration;
 
     private int headerCount;
@@ -257,11 +257,20 @@ public Builder expectResponse(String response) throws Exception {
           body += String.join("&", bodyParameters);
         }
 
-        var contentLength = body.getBytes(StandardCharsets.UTF_8).length;
-        if (contentLength > 0) {
+        if (chunked) {
           request += """
-              Content-Length: {contentLength}\r
-              """.replace("{contentLength}", contentLength + "");
+              Transfer-Encoding: chunked\r
+              """;
+
+          // Convert body to chunked
+          body = chunkItUp(body, null);
+        } else {
+          var contentLength = body.getBytes(StandardCharsets.UTF_8).length;
+          if (contentLength > 0) {
+            request += """
+                Content-Length: {contentLength}\r
+                """.replace("{contentLength}", contentLength + "");
+          }
         }
 
         List<String> headers = new ArrayList<>();
@@ -273,9 +282,7 @@ public Builder expectResponse(String response) throws Exception {
           request += String.join("\r\n", headers) + "\r\n";
         }
 
-        request += """
-            \r
-            {body}""".replace("{body}", body);
+        request = request + "\r\n" + body;
 
         var os = socket.getOutputStream();
         // Do our best to write, but ignore exceptions.
@@ -301,6 +308,11 @@ public Builder withBodyParameterSize(int bodyParameterSize) {
       return this;
     }
 
+    public Builder withChunked(boolean chunked) {
+      this.chunked = chunked;
+      return this;
+    }
+
     public Builder withConfiguration(Consumer<HTTPServerConfiguration> configuration) throws Exception {
       this.configuration = configuration;
       return this;