KTOR-6851 Parsing Content-Length to Long instead of Int to prevent Nu… (

#4008) * KTOR-6851 Parse Content-Length to Long instead of Int to prevent NumberFormatException for lengths more than Int.MAX_VALUE
ktorio · Mar 28, 2024 · 5513dcf · 5513dcf
1 parent 9c78494
commit 5513dcf
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 1 deletion.
diff --git a/ktor-server/ktor-server-cio/jvmAndNix/src/io/ktor/server/cio/CIOApplicationEngine.kt b/ktor-server/ktor-server-cio/jvmAndNix/src/io/ktor/server/cio/CIOApplicationEngine.kt
@@ -145,7 +145,7 @@ public class CIOApplicationEngine(
     }
 
     private fun hasBody(request: CIOApplicationRequest): Boolean {
-        val contentLength = request.headers[HttpHeaders.ContentLength]?.toInt()
+        val contentLength = request.headers[HttpHeaders.ContentLength]?.toLong()
         val transferEncoding = request.headers[HttpHeaders.TransferEncoding]
         return transferEncoding != null || (contentLength != null && contentLength > 0)
     }

diff --git a/...-server/ktor-server-test-suites/jvm/src/io/ktor/server/testing/suites/ContentTestSuite.kt b/...-server/ktor-server-test-suites/jvm/src/io/ktor/server/testing/suites/ContentTestSuite.kt
@@ -734,6 +734,27 @@ abstract class ContentTestSuite<TEngine : ApplicationEngine, TConfiguration : Ap
         }
     }
 
+    @Test
+    fun testReceivingBodyWithContentLengthMoreThanMaxInt() {
+        createAndStartServer {
+            post("/") {
+                call.receiveChannel()
+                call.respondText { "OK" }
+            }
+        }
+
+        withUrl(
+            "/",
+            {
+                method = HttpMethod.Post
+                headers.append("Content-Length", (Int.MAX_VALUE.toLong() + 1).toString())
+            }
+        ) {
+            assertEquals(200, status.value)
+            assertEquals("OK", bodyAsText())
+        }
+    }
+
     companion object {
         const val classesDir: String = "build/classes/"
     }