Skip to content

Trim trailing whitespace in cookie value: JavaNetCookieJar to avoid crash #9374

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
yschimke merged 2 commits into from
Mar 19, 2026
+59 −0
Merged

Trim trailing whitespace in cookie value: JavaNetCookieJar to avoid crash #9374

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
da15e0e
Trim cookie value in JavaNetCookieJar to avoid crash (#9373)
vansh1sh Mar 13, 2026
654fcfc
Add receiveAndSendUntrimmedCookie regression test
vansh1sh Mar 17, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions okhttp-java-net-cookiejar/src/main/kotlin/okhttp3/java/net/cookiejar/JavaNetCookieJar.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,6 +112,9 @@ class JavaNetCookieJar(
value = value.substring(1, value.length - 1)
}

// Minimal normalisation so Cookie.Builder doesn't crash on values like "abc123 ".
value = value.trim()

result.add(
Cookie
.Builder()
Expand Down
56 changes: 56 additions & 0 deletions okhttp/src/jvmTest/kotlin/okhttp3/CookiesTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -378,6 +378,62 @@ class CookiesTest {
assertThat(request.headers["Quux"]).isNull()
}

@Test
fun cookieHandlerWithQuotedValueAndTrailingSpace() {
Copy link
Copy Markdown
Collaborator

@yschimke yschimke Mar 14, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is testing injecting a Cookie via CookieHandler. I can't reproduce via an actual request/response stored to the cookieJar, so I'm assuming this is only a problem with a shared or custom CookieHandler?

Can we add a test to confirm, something like

  @Test
  fun receiveAndSendUntrimmedCookie() {
    server.enqueue(
      MockResponse
        .Builder()
        .addHeader("Set-Cookie", "a=\"android \"")
        .build(),
    )
    server.enqueue(MockResponse())
    val cookieManager = CookieManager(null, CookiePolicy.ACCEPT_ORIGINAL_SERVER)
    client =
      client
        .newBuilder()
        .cookieJar(JavaNetCookieJar(cookieManager))
        .build()
    get(urlWithIpAddress(server, "/"))
    val request1 = server.takeRequest()
    assertThat(request1.headers["Cookie"]).isNull()
    get(urlWithIpAddress(server, "/"))
    val request2 = server.takeRequest()
    assertThat(request2.headers["Cookie"]).isEqualTo("a=android")
  }

Copy link
Copy Markdown
Contributor Author

@vansh1sh vansh1sh Mar 17, 2026 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

added a commit for this test. It succeeds in both the flows for me, so probably happening because of shared Cookie Handler.

server.enqueue(MockResponse())
val serverUrl = urlWithIpAddress(server, "/")
val androidCookieHandler: CookieHandler =
object : CookieHandler() {
override fun get(
uri: URI,
map: Map<String, List<String>>,
) = mapOf(
"Cookie" to
listOf(
"a=\"android \"",
),
)

override fun put(
uri: URI,
map: Map<String, List<String>>,
) {
}
}
client =
client
.newBuilder()
.cookieJar(JavaNetCookieJar(androidCookieHandler))
.build()
get(serverUrl)
val request = server.takeRequest()
assertThat(request.headers["Cookie"]).isEqualTo("a=android")
assertThat(request.headers["Quux"]).isNull()
}

@Test
fun receiveAndSendUntrimmedCookie() {
server.enqueue(
MockResponse
.Builder()
.addHeader("Set-Cookie", "a=\"android \"")
.build(),
)
server.enqueue(MockResponse())
val cookieManager = CookieManager(null, CookiePolicy.ACCEPT_ORIGINAL_SERVER)
client =
client
.newBuilder()
.cookieJar(JavaNetCookieJar(cookieManager))
.build()
get(urlWithIpAddress(server, "/"))
val request1 = server.takeRequest()
assertThat(request1.headers["Cookie"]).isNull()
get(urlWithIpAddress(server, "/"))
val request2 = server.takeRequest()
assertThat(request2.headers["Cookie"]).isEqualTo("a=android")
}

private fun urlWithIpAddress(
server: MockWebServer,
path: String,
Expand Down
Loading