Merge pull request #1279 from stuartwdouglas/headers-test

[UNDERTOW-2006] Add test that headers of different case work
undertow-io · Dec 13, 2021 · b24d455 · b24d455
2 parents 6ac611d + cd08fc5
commit b24d455
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 1 deletion.
diff --git a/core/src/test/java/io/undertow/server/protocol/http/SimpleParserTestCase.java b/core/src/test/java/io/undertow/server/protocol/http/SimpleParserTestCase.java
@@ -419,6 +419,15 @@ public void testSimpleRequest() throws BadRequestException {
         runTest(in);
     }
 
+    @Test
+    public void testDifferentCaseHeaders() throws BadRequestException {
+        final ParseState context = new ParseState(10);
+        HttpServerExchange result = new HttpServerExchange(null);
+        byte[] in = "GET /somepath HTTP/1.1\r\nHost: www.somehost.net\r\nhost: other\r\n\r\n".getBytes();
+        HttpRequestParser.instance(OptionMap.EMPTY).handle(ByteBuffer.wrap(in), context, result);
+        Assert.assertArrayEquals(result.getRequestHeaders().get("HOST").toArray(), new String[] {"www.somehost.net", "other"});
+    }
+
     @Test(expected = BadRequestException.class)
     public void testTabInsteadOfSpaceAfterVerb() throws BadRequestException {
         byte[] in = "GET\t/somepath HTTP/1.1\r\nHost:   www.somehost.net\r\nOtherHeader: some\r\n    value\r\n\r\n".getBytes();

diff --git a/core/src/test/java/io/undertow/util/HeaderMapTestCase.java b/core/src/test/java/io/undertow/util/HeaderMapTestCase.java
@@ -25,6 +25,7 @@
 import java.util.Arrays;
 import java.util.List;
 
+import static org.junit.Assert.assertArrayEquals;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNotEquals;
@@ -47,6 +48,16 @@ public void testInitial() {
         assertFalse(headerMap.iterator().hasNext());
     }
 
+    @Test
+    public void testMixedCase() {
+        final HeaderMap headerMap = new HeaderMap();
+        headerMap.add(new HttpString("Aa"), "A");
+        headerMap.add(new HttpString("aa"), "a");
+        assertArrayEquals(headerMap.get(new HttpString("aa")).toArray(), new String[]{"A", "a"});
+        assertArrayEquals(headerMap.get(new HttpString("Aa")).toArray(), new String[]{"A", "a"});
+        assertArrayEquals(headerMap.get(new HttpString("AA")).toArray(), new String[]{"A", "a"});
+    }
+
     @Test
     public void testSimple() {
         final HeaderMap headerMap = new HeaderMap();
@@ -68,7 +79,7 @@ public void testSimple() {
     public void testGrowing() {
         final HeaderMap headerMap = new HeaderMap();
         for (HttpString item : HTTP_STRING_LIST) {
-            for (int i = 0; i < (item.hashCode() & 7) + 1; i ++)
+            for (int i = 0; i < (item.hashCode() & 7) + 1; i++)
                 headerMap.add(item, "Test value");
         }
         for (HttpString item : HTTP_STRING_LIST) {