Tests

Author: robotdan

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

@@ -60,6 +60,7 @@
 import java.util.zip.InflaterInputStream;
 
 import io.fusionauth.http.HTTPValues.Connections;
+import io.fusionauth.http.HTTPValues.ContentEncodings;
 import io.fusionauth.http.log.FileLogger;
 import io.fusionauth.http.log.FileLoggerFactory;
 import io.fusionauth.http.log.Level;
@@ -104,7 +105,21 @@
  * @author Brian Pontarelli
  */
 public abstract class BaseTest {
+  protected byte[] compressUsingContentEncoding(byte[] bytes, String contentEncoding) throws Exception {
+    if (!contentEncoding.isEmpty()) {
+      var requestEncodings = contentEncoding.toLowerCase().trim().split(",");
+      for (String part : requestEncodings) {
+        String encoding = part.trim();
+        if (encoding.equals(ContentEncodings.Deflate)) {
+          bytes = deflate(bytes);
+        } else if (encoding.equals(ContentEncodings.Gzip)) {
+          bytes = gzip(bytes);
+        }
+      }
+    }
 
+    return bytes;
+  }
   /**
    * This timeout is used for the HttpClient during each test. If you are in a debugger, you will need to change this timeout to be much
    * larger, otherwise, the client might truncate the request to the server.
@@ -248,6 +263,17 @@ public Object[][] connections() {
     };
   }
 
+  @DataProvider(name = "contentEncoding")
+  public Object[][] contentEncoding() {
+    return new Object[][]{
+        {""},
+        {"gzip"},
+        {"deflate"},
+        {"gzip, deflate"},
+        {"deflate, gzip"}
+    };
+  }
+
   @AfterMethod
   public void flush() {
     FileLogger fl = (FileLogger) FileLoggerFactory.FACTORY.getLogger(BaseTest.class);

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

@@ -33,17 +33,6 @@
  * @author Daniel DeGroff
  */
 public class HTTPInputStreamTest extends BaseTest {
-  @DataProvider(name = "contentEncoding")
-  public Object[][] contentEncoding() {
-    return new Object[][]{
-        {""},
-        {"gzip"},
-        {"deflate"},
-        {"gzip, deflate"},
-        {"deflate, gzip"}
-    };
-  }
-
   @Test(dataProvider = "contentEncoding")
   public void read_chunked_withPushback(String contentEncoding) throws Exception {
     // Ensure that when we read a chunked encoded body that the InputStream returns the correct number of bytes read even when
@@ -53,18 +42,8 @@ public void read_chunked_withPushback(String contentEncoding) throws Exception {
     byte[] payload = content.getBytes(StandardCharsets.UTF_8);
     int contentLength = payload.length;
 
-    // Optionally compress the payload
-    if (!contentEncoding.isEmpty()) {
-      var requestEncodings = contentEncoding.toLowerCase().trim().split(",");
-      for (String part : requestEncodings) {
-        String encoding = part.trim();
-        if (encoding.equals(ContentEncodings.Deflate)) {
-          payload = deflate(payload);
-        } else if (encoding.equals(ContentEncodings.Gzip)) {
-          payload = gzip(payload);
-        }
-      }
-    }
+    // Optionally compress
+    payload = compressUsingContentEncoding(payload, contentEncoding);
 
     // Chunk the content, add part of the next request
     payload = chunkEncoded(payload, 38, null);
@@ -93,18 +72,8 @@ public void read_fixedLength_withPushback(String contentEncoding) throws Excepti
     byte[] payload = content.getBytes(StandardCharsets.UTF_8);
     int contentLength = payload.length;
 
-    // Optionally compress the payload
-    if (!contentEncoding.isEmpty()) {
-      var requestEncodings = contentEncoding.toLowerCase().trim().split(",");
-      for (String part : requestEncodings) {
-        String encoding = part.trim();
-        if (encoding.equals(ContentEncodings.Deflate)) {
-          payload = deflate(payload);
-        } else if (encoding.equals(ContentEncodings.Gzip)) {
-          payload = gzip(payload);
-        }
-      }
-    }
+    // Optionally compress
+    payload = compressUsingContentEncoding(payload, contentEncoding);
 
     // Content-Length must be the compressed length
     int compressedLength = payload.length;

src/test/java/io/fusionauth/http/util/HTTPToolsTest.java

@@ -16,6 +16,7 @@
 package io.fusionauth.http.util;
 
 import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
 import java.net.URLEncoder;
 import java.nio.charset.Charset;
 import java.nio.charset.StandardCharsets;
@@ -26,6 +27,7 @@
 import java.util.Map;
 
 import com.inversoft.json.ToString;
+import io.fusionauth.http.BaseTest;
 import io.fusionauth.http.HTTPMethod;
 import io.fusionauth.http.io.PushbackInputStream;
 import io.fusionauth.http.server.HTTPRequest;
@@ -42,7 +44,7 @@
  * @author Brian Pontarelli
  */
 @Test
-public class HTTPToolsTest {
+public class HTTPToolsTest extends BaseTest {
   @Test
   public void getMaxRequestBodySize() {
     var configuration = Map.of(
@@ -183,16 +185,18 @@ public void parseHeaderValue() {
     assertEquals(HTTPTools.parseHeaderValue("value; f= f"), new HeaderValue("value", Map.of("f", " f")));
   }
 
-  @Test
-  public void parsePreamble() throws Exception {
+  @Test(dataProvider = "contentEncoding")
+  public void parsePreamble(String contentEncoding) throws Exception {
     // Ensure that we can correctly read the preamble when the InputStream contains the next request.
+    // - Optionally compress the body to ensure we can push back bytes on the preamble read w/out hosing it up.
 
-    //noinspection ExtractMethodRecommender
-    String request = """
+    ByteArrayOutputStream out = new ByteArrayOutputStream();
+    String header = """
         GET / HTTP/1.1\r
         Host: localhost:42\r
         Connection: close\r
-        Content-Length: 113\r
+        Content-Encoding: {contentEncoding}\r
+        Content-Length: {contentLength}\r
         Header1: Value1\r
         Header2: Value2\r
         Header3: Value3\r
@@ -204,17 +208,31 @@ public void parsePreamble() throws Exception {
         Header9: Value9\r
         Header10: Value10\r
         \r
-        These pretzels are making me thirsty. These pretzels are making me thirsty. These pretzels are making me thirsty.GET / HTTP/1.1\r
-        """;
+        """.replace("{contentEncoding}", contentEncoding);
+
+    // Now add the body, optionally compressed
+    String body = "These pretzels are making me thirsty. These pretzels are making me thirsty. These pretzels are making me thirsty.";
+    byte[] bodyBytes = body.getBytes(StandardCharsets.UTF_8);
+    int uncompressedBodyLength = bodyBytes.length;
+    bodyBytes = compressUsingContentEncoding(bodyBytes, contentEncoding);
+
+    header = header.replace("{contentLength}", bodyBytes.length + "");
+    out.write(header.getBytes(StandardCharsets.UTF_8));
+    out.write(bodyBytes);
+
+    // Now add part of the next request
+    String nextRequest = "GET / HTTP/1.1\n\r";
+    byte[] nextRequestBytes = nextRequest.getBytes(StandardCharsets.UTF_8);
+    out.write(nextRequestBytes);
 
     // Fixed length body with the start of the next request in the buffer
-    byte[] bytes = request.getBytes(StandardCharsets.UTF_8);
-    int bytesAvailable = bytes.length;
+    byte[] payload = out.toByteArray();
+    int bytesAvailable = payload.length;
 
     // Ensure the request buffer size will contain the entire request.
     HTTPServerConfiguration configuration = new HTTPServerConfiguration().withRequestBufferSize(bytesAvailable + 100);
 
-    ByteArrayInputStream is = new ByteArrayInputStream(bytes);
+    ByteArrayInputStream is = new ByteArrayInputStream(payload);
     PushbackInputStream pushbackInputStream = new PushbackInputStream(is, null);
 
     HTTPRequest httpRequest = new HTTPRequest();
@@ -229,37 +247,38 @@ public void parsePreamble() throws Exception {
     assertEquals(httpRequest.getMethod(), HTTPMethod.GET);
     assertEquals(httpRequest.getHost(), "localhost");
     assertEquals(httpRequest.getPort(), 42);
-    assertEquals(httpRequest.getContentLength(), 113);
-    assertEquals(httpRequest.getHeaders().size(), 13);
-    assertEquals(httpRequest.getHeader("Content-Length"), "113");
+    assertEquals(httpRequest.getContentLength(), bodyBytes.length);
+    assertEquals(httpRequest.getHeaders().size(), contentEncoding.isEmpty() ? 13 : 14);
+    assertEquals(httpRequest.getHeader("Content-Encoding"), contentEncoding.isEmpty() ? null : contentEncoding);
+    assertEquals(httpRequest.getHeader("Content-Length"), bodyBytes.length + "");
     assertEquals(httpRequest.getHeader("Connection"), "close");
     assertEquals(httpRequest.getHeader("Host"), "localhost:42");
     for (int i = 1; i <= 10; i++) {
       assertEquals(httpRequest.getHeader("Header" + i), "Value" + i);
     }
 
-    // Expect 129 bytes left over which is 113 for the body + 16 from the next request
-    assertEquals(pushbackInputStream.getAvailableBufferedBytesRemaining(), 113 + 16);
+    // Expect that the body bytes and the next request have been pushed into the pushback buffer
+    assertEquals(pushbackInputStream.getAvailableBufferedBytesRemaining(), bodyBytes.length + nextRequestBytes.length);
 
     // Read the remaining bytes for this request, we should still have some left over.
     HTTPInputStream httpInputStream = new HTTPInputStream(configuration, httpRequest, pushbackInputStream, -1);
     byte[] buffer = new byte[1024];
     int read = httpInputStream.read(buffer);
-    assertEquals(read, 113);
+    assertEquals(read, uncompressedBodyLength);
 
     // Another read should return -1 because we are at the end of this request.
     int nextRead = httpInputStream.read(buffer);
     assertEquals(nextRead, -1);
 
     // The next read from the pushback which will be used by the next request should return the remaining bytes.
-    assertEquals(pushbackInputStream.getAvailableBufferedBytesRemaining(), 16);
+    assertEquals(pushbackInputStream.getAvailableBufferedBytesRemaining(), nextRequestBytes.length);
     int nextRequestRead = pushbackInputStream.read(buffer);
-    assertEquals(nextRequestRead, 16);
+    // Expect that we are able to read the bytes for the next request header
+    assertEquals(nextRequestRead, nextRequestBytes.length);
   }
 
   private void assertEncodedData(String actualValue, String expectedValue, Charset charset) {
     assertEncodedData(actualValue, expectedValue, charset, charset);
-
   }
 
   private void assertEncodedData(String actualValue, String expectedValue, Charset encodingCharset, Charset decodingCharset) {