KTOR-6709 Fix URLParserException on minimal file url (#4622)

ktorio · Jan 28, 2025 · 15f0921 · 15f0921
1 parent 5ff1a3c
commit 15f0921
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 0 deletions.
diff --git a/ktor-http/common/src/io/ktor/http/URLParser.kt b/ktor-http/common/src/io/ktor/http/URLParser.kt
@@ -136,6 +136,10 @@ internal fun URLBuilder.takeFromUnsafe(urlString: String): URLBuilder {
 
 private fun URLBuilder.parseFile(urlString: String, startIndex: Int, endIndex: Int, slashCount: Int) {
     when (slashCount) {
+        1 -> {
+            host = ""
+            encodedPath = urlString.substring(startIndex, endIndex)
+        }
         2 -> {
             val nextSlash = urlString.indexOf('/', startIndex)
             if (nextSlash == -1 || nextSlash == endIndex) {

diff --git a/ktor-http/common/test/io/ktor/tests/http/UrlTest.kt b/ktor-http/common/test/io/ktor/tests/http/UrlTest.kt
@@ -264,6 +264,15 @@ class UrlTest {
         assertEquals(expectedUrl, result.toString())
     }
 
+    @Test
+    fun testForFileProtocolMinimalRepresentation() {
+        val result = Url("file:/var/www")
+        assertEquals("file", result.protocol.name)
+        assertEquals("", result.host)
+        assertEquals(listOf("var", "www"), result.rawSegments)
+        assertEquals("file:///var/www", result.toString())
+    }
+
     @Test
     fun testForMailProtocol() {
         val expectedUrl = "mailto:[email protected]"