Working

Author: robotdan

src/main/java/io/fusionauth/http/server/internal/HTTPWorker.java

@@ -257,7 +257,7 @@ public void run() {
       closeSocketOnly(reason);
     } catch (ParseException e) {
       logger.debug("[{}] Closing socket with status [{}]. Bad request, failed to parse request. Reason [{}] Parser state [{}]", Thread.currentThread().threadId(), Status.BadRequest, e.getMessage(), e.getState());
-      closeSocketOnError(response, Status.HTTPVersionNotSupported);
+      closeSocketOnError(response, Status.BadRequest);
     } catch (SocketException e) {
       // When the HTTPServerThread shuts down, we will interrupt each client thread, so debug log it accordingly.
       // - This will cause the socket to throw a SocketException, so log it.

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

@@ -99,11 +99,6 @@ private void assertResponse(String request, String chunkedExtension, String resp
       var os = socket.getOutputStream();
       os.write(request.getBytes(StandardCharsets.UTF_8));
 
-      // 1. Write bytes, the content-length is short by one byte.
-      // 2. Next byte \n
-      // 3. Success.
-      // 4. Next keep-alive request reads preamble, and reads the \n and throws an exception
-
       assertHTTPResponseEquals(socket, response);
     }
   }

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

@@ -386,33 +386,32 @@ public void tearDown() {
   protected void assertHTTPResponseEquals(Socket socket, String expectedResponse) throws Exception {
     var is = socket.getInputStream();
     var expectedResponseLength = expectedResponse.getBytes(StandardCharsets.UTF_8).length;
-    try {
 
-      byte[] buffer = new byte[expectedResponseLength * 2];
-      int read = is.read(buffer);
-      var actualResponse = new String(buffer, 0, read, StandardCharsets.UTF_8);
-
-      // Perform an initial equality check, this is fast. If it fails, it may because there are remaining bytes left to read. This is slower.
-      if (!actualResponse.equals(expectedResponse)) {
-        // Note this is going to block until the socket keep-alive times out.
-        try {
-          assertResponseEquals(is, actualResponse, expectedResponse);
-        } catch (SocketException se) {
-          // If the server has not read the entire request, trying to read from the InputStream will cause a SocketException due to Connection reset.
-          // - Attempt to recover from this condition and read the response.
-          // - Note that "normal" HTTP clients won't do this, so this isn't to show what a client would normally see, but it is to show what the server
-          //   is returning regardless if the client is smart enough or cares enough to read the response.
-          if (se.getMessage().equals("Connection reset")) {
-            var addr = socket.getRemoteSocketAddress();
-            socket.close();
+    byte[] buffer = new byte[expectedResponseLength * 2];
+    int read = is.read(buffer);
+    var actualResponse = new String(buffer, 0, read, StandardCharsets.UTF_8);
+
+    // Perform an initial equality check, this is fast. If it fails, it may because there are remaining bytes left to read. This is slower.
+    if (!actualResponse.equals(expectedResponse)) {
+      // Note this is going to block until the socket keep-alive times out.
+      try {
+        assertResponseEquals(is, actualResponse, expectedResponse);
+      } catch (SocketException se) {
+        // If the server has not read the entire request, trying to read from the InputStream will cause a SocketException due to Connection reset.
+        // - Attempt to recover from this condition and read the response.
+        // - Note that "normal" HTTP clients won't do this, so this isn't to show what a client would normally see, but it is to show what the server
+        //   is returning regardless if the client is smart enough or cares enough to read the response.
+        if (se.getMessage().equals("Connection reset")) {
+          var addr = socket.getRemoteSocketAddress();
+          socket.close();
+          try {
             socket.connect(addr);
             assertResponseEquals(socket.getInputStream(), actualResponse, expectedResponse);
+          } catch (Exception e) {
+            assertEquals(actualResponse, expectedResponse, "[" + e.getClass().getSimpleName() + "] was thrown trying to read. We are going to assert on what we have.\n");
           }
         }
       }
-    } catch (SocketException e) {
-      System.out.println(e);
-      fail("Failed!", e);
     }
   }
 
@@ -470,7 +469,7 @@ private void assertResponseEquals(InputStream is, String actualResponse, String
       var remainingBytes = is.readAllBytes();
       String fullResponse = actualResponse + new String(remainingBytes, StandardCharsets.UTF_8);
       // Use assertEquals so we can get Eclipse error formatting
-      assertEquals(fullResponse, expectedResponse);
+      assertEquals(fullResponse, expectedResponse, "An additional [" + remainingBytes.length + "] was read from the InputStream to complete the message.\nInitial expected response\n[" + expectedResponse + "]\nInitial actual response\n[" + actualResponse + "]\n");
     } catch (SocketTimeoutException e) {
       assertEquals(actualResponse, expectedResponse, "[SocketTimeoutException] was thrown trying to read. We are going to assert on what we have.\n");
     }

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

@@ -390,18 +390,12 @@ public void transfer_encoding_content_length() throws Exception {
         Content-Length: {contentLength}\r
         Transfer-Encoding: chunked\r
         \r
-        {body}
-        """
+        {body}"""
     ).expectResponse("""
         HTTP/1.1 200 \r
         connection: keep-alive\r
         content-length: 0\r
         \r
         """);
-
-    // Order of operation:
-    // 1. Write body w/ a trailing line return not accounted for in Content-Length.
-    // 2. Read body, write 200 response. Keep alive.
-    // 3. Read remaining byte, parse error. Write 400 response. Close connection.
   }
 }