Fix CIO headers parsing

Closes #853
ktorio · Jan 16, 2019 · 4625b71 · 4625b71
1 parent 2306a2d
commit 4625b71
Show file tree

Hide file tree

Showing 4 changed files with 62 additions and 19 deletions.
diff --git a/ktor-client/ktor-client-curl/posix/src/io/ktor/client/engine/curl/CurlClientEngine.kt b/ktor-client/ktor-client-curl/posix/src/io/ktor/client/engine/curl/CurlClientEngine.kt
@@ -29,7 +29,10 @@ internal class CurlClientEngine(override val config: CurlClientEngineConfig) : H
         val responseData = curlProcessor.executeRequest(curlRequest)
 
         val response = with(responseData) {
-            val headers = parseHeaders(ByteReadChannel(headersBytes))
+            val headerBytes = ByteReadChannel(headersBytes).apply {
+                readUTF8Line()
+            }
+            val headers = parseHeaders(headerBytes)
 
             val body = writer(coroutineContext) {
                 channel.writeFully(bodyBytes)

diff --git a/ktor-http/ktor-http-cio/common/src/io/ktor/http/cio/HttpParser.kt b/ktor-http/ktor-http-cio/common/src/io/ktor/http/cio/HttpParser.kt
@@ -107,21 +107,17 @@ internal suspend fun parseHeaders(
             if (range.start == range.end) break
 
             val nameStart = range.start
-            val nameEnd = findColonOrSpace(builder, range)
+            val nameEnd = findLetterBeforeColon(builder, range) + 1
+
+            if (nameEnd <= 0) {
+                val header = builder.substring(nameStart, builder.length)
+                throw ParserException("No colon in HTTP header in $header in builder: \n$builder")
+            }
+
             val nameHash = builder.hashCodeLowerCase(nameStart, nameEnd)
             range.start = nameEnd
 
             skipSpacesAndColon(builder, range)
-            if (range.start == range.end) {
-                throw ParserException(
-                    "No HTTP header value provided for name ${builder.substring(
-                        nameStart,
-                        nameEnd
-                    )}: \n$builder"
-                )
-            }
-
-            // TODO check for trailing spaces in HTTP spec
 
             val valueStart = range.start
             val valueEnd = range.end

diff --git a/ktor-http/ktor-http-cio/common/src/io/ktor/http/cio/internals/Tokenizer.kt b/ktor-http/ktor-http-cio/common/src/io/ktor/http/cio/internals/Tokenizer.kt
@@ -60,15 +60,17 @@ internal fun findSpaceOrEnd(text: CharSequence, range: MutableRange): Int {
     return idx
 }
 
-internal fun findColonOrSpace(text: CharSequence, range: MutableRange): Int {
-    var idx = range.start
+internal fun findLetterBeforeColon(text: CharSequence, range: MutableRange): Int {
+    var index = range.start
+    var lastCharIndex = index
     val end = range.end
 
-    while (idx < end) {
-        val ch = text[idx]
-        if (ch == ' ' || ch == ':') return idx
-        idx++
+    while (index < end) {
+        val ch = text[index]
+        if (ch == ':') return lastCharIndex
+        if (ch != ' ') lastCharIndex = index
+        index++
     }
 
-    return idx
+    return -1
 }
diff --git a/ktor-http/ktor-http-cio/jvm/test/io/ktor/tests/http/cio/HeadersTest.kt b/ktor-http/ktor-http-cio/jvm/test/io/ktor/tests/http/cio/HeadersTest.kt
@@ -209,4 +209,46 @@ class HeadersTest {
             request.release()
         }
     }
+
+    @Test
+    fun testEmptyHeaderValue() = runBlocking {
+        ch.writeStringUtf8("Host:\r\n\r\n")
+        val headers = parseHeaders(ch, builder)!!
+        assertEquals("", headers["Host"]?.toString())
+
+        headers.release()
+    }
+
+    @Test
+    fun testNoColon(): Unit = runBlocking<Unit> {
+        ch.writeStringUtf8("Host\r\n\r\n")
+
+        assertFails {
+            runBlocking {
+                parseHeaders(ch, builder)
+            }
+        }
+    }
+
+    @Test
+    fun testBlankHeaderValue() = runBlocking {
+        ch.writeStringUtf8("Host: \r\n\r\n")
+        val headers = parseHeaders(ch, builder)!!
+        assertEquals("", headers["Host"]?.toString())
+
+        headers.release()
+    }
+
+
+    @Test
+    fun testWrongHeader() = runBlocking<Unit> {
+        ch.writeStringUtf8("Hello world\r\n\r\n")
+
+        assertFails {
+            runBlocking {
+                parseHeaders(ch, builder)
+            }
+        }
+    }
+
 }