Fix headers to be case-insensitive

Signed-off-by: Dmitry Sulman <[email protected]>

Author: dmitrysulman

logback-access-reactor-netty/src/main/kotlin/io/github/dmitrysulman/logback/access/reactor/netty/AccessEvent.kt

@@ -120,7 +120,7 @@ class AccessEvent(
             ?.mapNotNull { (name, value) ->
                 if (name.isNullOrEmpty()) return@mapNotNull null
                 if (value == null) return@mapNotNull null
-                name.toString() to value.toString()
+                name.toString().lowercase() to value.toString()
             }?.toMap()
             ?: emptyMap()
     }
@@ -193,7 +193,7 @@ class AccessEvent(
 
     override fun getRemoteAddr() = _remoteAddr
 
-    override fun getRequestHeader(key: String) = _requestHeaderMap[key] ?: NA
+    override fun getRequestHeader(key: String) = _requestHeaderMap[key.lowercase()] ?: NA
 
     override fun getRequestHeaderNames(): Enumeration<String> = enumeration(_requestHeaderMap.keys)
 
@@ -223,7 +223,7 @@ class AccessEvent(
 
     override fun getServerAdapter() = _serverAdapter
 
-    override fun getResponseHeader(key: String) = _responseHeaderMap[key] ?: NA
+    override fun getResponseHeader(key: String) = _responseHeaderMap[key.lowercase()] ?: NA
 
     override fun getResponseHeaderMap() = _responseHeaderMap
 

logback-access-reactor-netty/src/main/kotlin/io/github/dmitrysulman/logback/access/reactor/netty/ReactorNettyServerAdapter.kt

@@ -19,7 +19,7 @@ class ReactorNettyServerAdapter(
             ?.mapNotNull { (name, value) ->
                 if (name.isNullOrEmpty()) return@mapNotNull null
                 if (value == null) return@mapNotNull null
-                name.toString() to value.toString()
+                name.toString().lowercase() to value.toString()
             }?.toMap()
             ?: emptyMap()
     }

logback-access-reactor-netty/src/test/kotlin/io/github/dmitrysulman/logback/access/reactor/netty/AccessEventTests.kt

@@ -417,13 +417,22 @@ class AccessEventTests {
             mapOf(
                 "name1" to "value1",
                 "name2" to "value2",
+                "name3" to "value3",
                 "empty_value" to "",
             )
         accessEvent.requestHeaderNames
             .asIterator()
             .asSequence()
             .toList() shouldBe
-            listOf("name1", "name2", "empty_value")
+            listOf("name1", "name2", "name3", "empty_value")
+
+        accessEvent.getRequestHeader("name1") shouldBe "value1"
+        accessEvent.getRequestHeader("NaMe1") shouldBe "value1"
+        accessEvent.getRequestHeader("NAME1") shouldBe "value1"
+
+        accessEvent.getRequestHeader("name3") shouldBe "value3"
+        accessEvent.getRequestHeader("NaMe3") shouldBe "value3"
+        accessEvent.getRequestHeader("NAME3") shouldBe "value3"
     }
 
     @Test
@@ -438,10 +447,19 @@ class AccessEventTests {
             mapOf(
                 "name1" to "value1",
                 "name2" to "value2",
+                "name3" to "value3",
                 "empty_value" to "",
             )
         accessEvent.responseHeaderNameList shouldBe
-            listOf("name1", "name2", "empty_value")
+            listOf("name1", "name2", "name3", "empty_value")
+
+        accessEvent.getResponseHeader("name1") shouldBe "value1"
+        accessEvent.getResponseHeader("NaMe1") shouldBe "value1"
+        accessEvent.getResponseHeader("NAME1") shouldBe "value1"
+
+        accessEvent.getResponseHeader("name3") shouldBe "value3"
+        accessEvent.getResponseHeader("NaMe3") shouldBe "value3"
+        accessEvent.getResponseHeader("NAME3") shouldBe "value3"
     }
 
     @Test

logback-access-reactor-netty/src/test/kotlin/io/github/dmitrysulman/logback/access/reactor/netty/ReactorNettyServerAdapterTests.kt

@@ -29,6 +29,7 @@ class ReactorNettyServerAdapterTests {
             mapOf(
                 "name1" to "value1",
                 "name2" to "value2",
+                "name3" to "value3",
                 "empty_value" to "",
             )
     }

logback-access-reactor-netty/src/test/kotlin/io/github/dmitrysulman/logback/access/reactor/netty/TestsHelper.kt

@@ -10,6 +10,10 @@ val headerList =
             override val key = "name2"
             override val value = "value2"
         },
+        object : Map.Entry<CharSequence, CharSequence> {
+            override val key = "NAME3"
+            override val value = "value3"
+        },
         object : Map.Entry<CharSequence, CharSequence> {
             override val key = ""
             override val value = "empty_name"

logback-access-reactor-netty/src/test/kotlin/io/github/dmitrysulman/logback/access/reactor/netty/integration/IntegrationTests.kt

@@ -188,7 +188,9 @@ class IntegrationTests {
         accessEvent.timeStamp shouldBeGreaterThan now
         accessEvent.remoteUser shouldBe "-"
         accessEvent.getRequestHeader(TEST_REQUEST_HEADER_NAME) shouldBe TEST_REQUEST_HEADER_VALUE
+        accessEvent.getRequestHeader(TEST_REQUEST_HEADER_NAME_IGNORE_CASE.lowercase()) shouldBe TEST_REQUEST_HEADER_VALUE_IGNORE_CASE
         accessEvent.getResponseHeader(TEST_RESPONSE_HEADER_NAME) shouldBe TEST_RESPONSE_HEADER_VALUE
+        accessEvent.getResponseHeader(TEST_RESPONSE_HEADER_NAME_IGNORE_CASE.lowercase()) shouldBe TEST_RESPONSE_HEADER_VALUE_IGNORE_CASE
         accessEvent.getCookie(TEST_COOKIE_NAME) shouldBe TEST_COOKIE_VALUE
         accessEvent.contentLength shouldBe (response.responseHeaders().get(CONTENT_LENGTH)?.toLongOrNull() ?: 0)
     }
@@ -206,6 +208,7 @@ class IntegrationTests {
                 .addHeader(REMOTE_HOST_HEADER, remoteHost)
                 .addHeader(REMOTE_ADDRESS_HEADER, remoteAddress)
                 .addHeader(TEST_RESPONSE_HEADER_NAME, TEST_RESPONSE_HEADER_VALUE)
+                .addHeader(TEST_RESPONSE_HEADER_NAME_IGNORE_CASE, TEST_RESPONSE_HEADER_VALUE_IGNORE_CASE)
                 .sendByteArray(Mono.just(responseContent.toByteArray()))
         }.bindNow()
 
@@ -223,8 +226,10 @@ class IntegrationTests {
     private fun performGetRequest(uri: String): Mono<HttpClientResponse> =
         client
             .port(server.port())
-            .headers { it.add(TEST_REQUEST_HEADER_NAME, TEST_REQUEST_HEADER_VALUE) }
-            .cookie(DefaultCookie(TEST_COOKIE_NAME, TEST_COOKIE_VALUE))
+            .headers {
+                it.add(TEST_REQUEST_HEADER_NAME, TEST_REQUEST_HEADER_VALUE)
+                it.add(TEST_REQUEST_HEADER_NAME_IGNORE_CASE, TEST_REQUEST_HEADER_VALUE_IGNORE_CASE)
+            }.cookie(DefaultCookie(TEST_COOKIE_NAME, TEST_COOKIE_VALUE))
             .get()
             .uri(uri)
             .response()
@@ -234,8 +239,12 @@ class IntegrationTests {
         private const val REMOTE_ADDRESS_HEADER = "Remote-Address"
         private const val TEST_RESPONSE_HEADER_NAME = "Test-Response-Header"
         private const val TEST_RESPONSE_HEADER_VALUE = "testResponseHeaderValue"
+        private const val TEST_RESPONSE_HEADER_NAME_IGNORE_CASE = "Test-Response-Header-Ignore-Case"
+        private const val TEST_RESPONSE_HEADER_VALUE_IGNORE_CASE = "testResponseHeaderValueIgnoreCase"
         private const val TEST_REQUEST_HEADER_NAME = "Test-Request-Header"
         private const val TEST_REQUEST_HEADER_VALUE = "testRequestHeaderValue"
+        private const val TEST_REQUEST_HEADER_NAME_IGNORE_CASE = "Test-Request-Header-Ignore-Case"
+        private const val TEST_REQUEST_HEADER_VALUE_IGNORE_CASE = "testRequestHeaderValueIgnoreCase"
         private const val TEST_COOKIE_NAME = "cookieName"
         private const val TEST_COOKIE_VALUE = "cookieValue"
     }