Add option to disable header name canonicalization. This fixes google#90

. PiperOrigin-RevId: 408399619 Change-Id: I0adca149c11fd396fc69266f9d7cbf6bcf6e334b
miguelangat · Nov 8, 2021 · f630cc0 · f630cc0
1 parent 8ed1756
commit f630cc0
Show file tree

Hide file tree

Showing 2 changed files with 33 additions and 0 deletions.
diff --git a/common/src/main/java/com/google/tsunami/common/net/http/HttpHeaders.java b/common/src/main/java/com/google/tsunami/common/net/http/HttpHeaders.java
@@ -147,6 +147,17 @@ public Builder addHeader(String name, String value) {
       return this;
     }
 
+    public Builder addHeader(String name, String value, boolean canonicalize) {
+      checkNotNull(name, "Name cannot be null.");
+      checkNotNull(value, "Value cannot be null.");
+      if (canonicalize) {
+        return addHeader(name, value);
+      } else {
+        rawHeadersBuilder().put(name, value);
+        return this;
+      }
+    }
+
     public abstract HttpHeaders build();
 
     private static boolean isLegalHeaderName(String str) {

diff --git a/common/src/test/java/com/google/tsunami/common/net/http/HttpHeadersTest.java b/common/src/test/java/com/google/tsunami/common/net/http/HttpHeadersTest.java
@@ -46,6 +46,28 @@ public void builderAddHeader_withKnownHeader_canonicalizesHeaderName() {
             ImmutableListMultimap.of(com.google.common.net.HttpHeaders.ACCEPT, "test_value"));
   }
 
+  @Test
+  public void builderAddHeader_whenEnableCanonicalization_canonicalizesHeaderName() {
+    HttpHeaders httpHeaders =
+        HttpHeaders.builder()
+            .addHeader("TEST_Header", "test_value", true)
+            .build();
+    assertThat(httpHeaders.rawHeaders())
+        .containsExactlyEntriesIn(
+            ImmutableListMultimap.of("test_header", "test_value"));
+  }
+
+  @Test
+  public void builderAddHeader_whenDisableCanonicalization_addsHeaderNameAsIs() {
+    HttpHeaders httpHeaders =
+        HttpHeaders.builder()
+            .addHeader("TEST_Header", "test_value", false)
+            .build();
+    assertThat(httpHeaders.rawHeaders())
+        .containsExactlyEntriesIn(
+            ImmutableListMultimap.of("TEST_Header", "test_value"));
+  }
+
   @Test
   public void builderAddHeader_withNullName_throwsNullPointerException() {
     assertThrows(