Bump cookie max-age value to Int.MAX_VALUE (ktorio#892)

schleinzer · Feb 26, 2019 · acb52e7 · acb52e7
1 parent 7fc1a5f
commit acb52e7
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 4 deletions.
diff --git a/ktor-server/ktor-server-core/jvm/src/io/ktor/sessions/SessionTransportCookie.kt b/ktor-server/ktor-server-core/jvm/src/io/ktor/sessions/SessionTransportCookie.kt
@@ -28,7 +28,7 @@ class SessionTransportCookie(
 
     override fun send(call: ApplicationCall, value: String) {
         val now = GMTDate()
-        val maxAge = configuration.duration?.let { it[ChronoUnit.SECONDS] }?.takeIf { it <= Int.MAX_VALUE }
+        val maxAge = configuration.duration?.let { it[ChronoUnit.SECONDS].coerceAtMost(Int.MAX_VALUE.toLong()) }
         val expires = maxAge?.let { now + TimeUnit.SECONDS.toMillis(maxAge) }
 
         val cookie = Cookie(

diff --git a/ktor-server/ktor-server-tests/jvm/test/io/ktor/tests/server/sessions/SessionTest.kt b/ktor-server/ktor-server-tests/jvm/test/io/ktor/tests/server/sessions/SessionTest.kt
@@ -1,7 +1,6 @@
 package io.ktor.tests.server.sessions
 
-import io.ktor.application.call
-import io.ktor.application.install
+import io.ktor.application.*
 import io.ktor.http.*
 import io.ktor.response.respondText
 import io.ktor.routing.get
@@ -11,8 +10,8 @@ import io.ktor.server.testing.*
 import io.ktor.sessions.*
 import io.ktor.util.date.*
 import io.ktor.util.hex
+import kotlinx.coroutines.*
 import kotlinx.coroutines.io.jvm.javaio.*
-import kotlinx.coroutines.runBlocking
 import java.time.Duration
 import java.util.*
 import kotlin.test.*
@@ -670,6 +669,34 @@ class SessionTest {
         }
     }
 
+    @Test
+    fun testSessionLongDuration(): Unit = withTestApplication {
+        val transport = SessionTransportCookie("test", CookieConfiguration().apply {
+            duration = Duration.ofDays(365 * 100)
+        }, emptyList())
+
+        val call = createCall {}
+        transport.send(call, "my-session")
+
+        val cookies = call.response.cookies["test"]
+        assertNotNull(cookies)
+        assertEquals(Int.MAX_VALUE, cookies.maxAge)
+    }
+
+    @Test
+    fun testSessionOverflowDuration(): Unit = withTestApplication {
+        val transport = SessionTransportCookie("test", CookieConfiguration().apply {
+            duration = Duration.ofSeconds(Long.MAX_VALUE)
+        }, emptyList())
+
+        val call = createCall {}
+        transport.send(call, "my-session")
+
+        val cookies = call.response.cookies["test"]
+        assertNotNull(cookies)
+        assertEquals(Int.MAX_VALUE, cookies.maxAge)
+    }
+
     private fun flipLastHexDigit(sessionId: String) = sessionId.mapIndexed { index, letter ->
         when {
             index != sessionId.lastIndex -> letter