KTOR-6646 Fix overflow for cookie with long Max-Age (#3985)

ktorio · Mar 11, 2024 · 313b381 · 313b381
1 parent 33b243a
commit 313b381
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 1 deletion.
diff --git a/...ent/ktor-client-core/common/src/io/ktor/client/plugins/cookies/AcceptAllCookiesStorage.kt b/...ent/ktor-client-core/common/src/io/ktor/client/plugins/cookies/AcceptAllCookiesStorage.kt
@@ -66,5 +66,5 @@ public class AcceptAllCookiesStorage(private val clock: () -> Long = { getTimeMi
     }
 
     private fun Cookie.maxAgeOrExpires(createdAt: Long): Long? =
-        maxAge?.let { createdAt + it * 1000 } ?: expires?.timestamp
+        maxAge?.let { createdAt + it * 1000L } ?: expires?.timestamp
 }
diff --git a/ktor-client/ktor-client-core/common/test/AcceptAllCookiesStorageTest.kt b/ktor-client/ktor-client-core/common/test/AcceptAllCookiesStorageTest.kt
@@ -47,4 +47,14 @@ class AcceptAllCookiesStorageTest {
         time += 1001
         assertEquals(emptyList(), storage.get(Url("http://localhost/")))
     }
+
+    @Test
+    fun testLongMaxAge() = testSuspend {
+        val storage = AcceptAllCookiesStorage()
+        val twoYears = 2 * 365 * 24 * 3600
+        val cookie = Cookie("name", "value", maxAge = twoYears)
+        storage.addCookie(Url("/"), cookie)
+
+        assertEquals(cookie.value, storage.get(Url("/")).single().value)
+    }
 }