Cleanup

Author: robotdan

src/main/java/io/fusionauth/http/server/HTTPRequest.java

@@ -790,8 +790,8 @@ private void decodeHeader(String name, String value) {
             continue;
           }
 
-          // The HTTP/1.1 standard recommends that the servers supporting gzip also recognize x-gzip as an alias, for compatibility purposes.
-          if (encoding.equals(ContentEncodings.XGzip)) {
+          // The HTTP/1.1 standard recommends that the servers supporting gzip also recognize x-gzip as an alias for compatibility.
+          if (encoding.equalsIgnoreCase(ContentEncodings.XGzip)) {
             encoding = ContentEncodings.Gzip;
           }
 

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

@@ -40,6 +40,7 @@
 import org.testng.annotations.DataProvider;
 import org.testng.annotations.Test;
 import static org.testng.Assert.assertEquals;
+import static org.testng.Assert.assertNotEquals;
 import static org.testng.Assert.assertNotNull;
 import static org.testng.Assert.assertNull;
 import static org.testng.AssertJUnit.fail;
@@ -258,14 +259,17 @@ public void compressWithContentLength(String scheme) throws Exception {
 
       assertEquals(req.isChunked(), false);
 
-      // We forced a Content-Length by telling the JDK client not to chunk, so it will be present. It will
-      // be used in theory - and it should be ok as long as we are using it to count compressed bytes?
-      // TODO : Once I add the push back tests for compression, we'll see if this still works. We may
-      //        need to manually remove the Content-Length header when we know the body to be compressed.
+      // We forced a Content-Length by telling the JDK client not to chunk, so it will be present.
+      // - We can still correctly use the Content-Length because it is used by the FixedLengthInputStream which
+      //   is below the decompression. See HTTPInputStream.initialize
       var contentLength = req.getHeader(Headers.ContentLength);
       assertEquals(contentLength, payload.length + "");
 
-      String body = new String(req.getInputStream().readAllBytes());
+      // Because we are compressed, don't expect the final payload to be equal to the contentLength
+      byte[] readBytes = req.getInputStream().readAllBytes();
+      assertNotEquals(readBytes.length, contentLength);
+
+      String body = new String(readBytes);
       assertEquals(body, bodyString);
 
       res.setHeader(Headers.ContentType, "text/plain");
@@ -326,9 +330,9 @@ public Object[][] compressedChunkedSchemes() {
         {"deflate, gzip", "deflate, gzip"},
         {"gzip, deflate", "gzip, deflate"},
 
-        // x-gzip alias, https
+        // x-gzip with mixed case alias, https
         {"x-gzip", "deflate, gzip"},
-        {"x-gzip, deflate", "gzip, deflate"},
+        {"X-Gzip, deflate", "gzip, deflate"},
         {"deflate, x-gzip", "gzip, deflate"},
     };