Skip to content

fix: correctly handle expired JWE's in cookies #2082

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

Draft
wants to merge 1 commit into
base: main
Choose a base branch
from
+291 −109
Draft

fix: correctly handle expired JWE's in cookies #2082

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
89 changes: 69 additions & 20 deletions src/server/auth-client.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -514,10 +514,10 @@ ca/T0LLtgmbMmxSv/MmzIg==
// assert session has been updated
const updatedSessionCookie = response.cookies.get("__session");
expect(updatedSessionCookie).toBeDefined();
const { payload: updatedSessionCookieValue } = await decrypt(
const { payload: updatedSessionCookieValue } = (await decrypt(
updatedSessionCookie!.value,
secret
);
)) as jose.JWTDecryptResult;
expect(updatedSessionCookieValue).toEqual(
expect.objectContaining({
user: {
Expand Down Expand Up @@ -954,7 +954,14 @@ ca/T0LLtgmbMmxSv/MmzIg==
`__txn_${authorizationUrl.searchParams.get("state")}`
);
expect(transactionCookie).toBeDefined();
expect((await decrypt(transactionCookie!.value, secret)).payload).toEqual(
expect(
(
(await decrypt(
transactionCookie!.value,
secret
)) as jose.JWTDecryptResult
).payload
).toEqual(
expect.objectContaining({
nonce: authorizationUrl.searchParams.get("nonce"),
codeVerifier: expect.any(String),
Expand Down Expand Up @@ -1158,7 +1165,12 @@ ca/T0LLtgmbMmxSv/MmzIg==
);
expect(transactionCookie).toBeDefined();
expect(
(await decrypt(transactionCookie!.value, secret)).payload
(
(await decrypt(
transactionCookie!.value,
secret
)) as jose.JWTDecryptResult
).payload
).toEqual(
expect.objectContaining({
nonce: authorizationUrl.searchParams.get("nonce"),
Expand Down Expand Up @@ -1493,7 +1505,14 @@ ca/T0LLtgmbMmxSv/MmzIg==
`__txn_${authorizationUrl.searchParams.get("state")}`
);
expect(transactionCookie).toBeDefined();
expect((await decrypt(transactionCookie!.value, secret)).payload).toEqual(
expect(
(
(await decrypt(
transactionCookie!.value,
secret
)) as jose.JWTDecryptResult
).payload
).toEqual(
expect.objectContaining({
nonce: authorizationUrl.searchParams.get("nonce"),
maxAge: 3600,
Expand Down Expand Up @@ -1540,7 +1559,14 @@ ca/T0LLtgmbMmxSv/MmzIg==
`__txn_${authorizationUrl.searchParams.get("state")}`
);
expect(transactionCookie).toBeDefined();
expect((await decrypt(transactionCookie!.value, secret)).payload).toEqual(
expect(
(
(await decrypt(
transactionCookie!.value,
secret
)) as jose.JWTDecryptResult
).payload
).toEqual(
expect.objectContaining({
nonce: authorizationUrl.searchParams.get("nonce"),
codeVerifier: expect.any(String),
Expand Down Expand Up @@ -1586,7 +1612,14 @@ ca/T0LLtgmbMmxSv/MmzIg==
`__txn_${authorizationUrl.searchParams.get("state")}`
);
expect(transactionCookie).toBeDefined();
expect((await decrypt(transactionCookie!.value, secret)).payload).toEqual(
expect(
(
(await decrypt(
transactionCookie!.value,
secret
)) as jose.JWTDecryptResult
).payload
).toEqual(
expect.objectContaining({
nonce: authorizationUrl.searchParams.get("nonce"),
codeVerifier: expect.any(String),
Expand Down Expand Up @@ -1720,7 +1753,12 @@ ca/T0LLtgmbMmxSv/MmzIg==
const state = transactionCookie.name.replace("__txn_", "");
expect(transactionCookie).toBeDefined();
expect(
(await decrypt(transactionCookie!.value, secret)).payload
(
(await decrypt(
transactionCookie.value,
secret
)) as jose.JWTDecryptResult
).payload
).toEqual(
expect.objectContaining({
nonce: expect.any(String),
Expand Down Expand Up @@ -1874,7 +1912,12 @@ ca/T0LLtgmbMmxSv/MmzIg==
const state = transactionCookie.name.replace("__txn_", "");
expect(transactionCookie).toBeDefined();
expect(
(await decrypt(transactionCookie!.value, secret)).payload
(
(await decrypt(
transactionCookie.value,
secret
)) as jose.JWTDecryptResult
).payload
).toEqual(
expect.objectContaining({
nonce: expect.any(String),
Expand Down Expand Up @@ -1956,7 +1999,7 @@ ca/T0LLtgmbMmxSv/MmzIg==
const state = transactionCookie.name.replace("__txn_", "");
expect(transactionCookie).toBeDefined();
expect(
(await decrypt(transactionCookie!.value, secret)).payload
(await decrypt(transactionCookie!.value, secret))!.payload
).toEqual(
expect.objectContaining({
nonce: expect.any(String),
Expand Down Expand Up @@ -2512,7 +2555,10 @@ ca/T0LLtgmbMmxSv/MmzIg==
// validate the session cookie
const sessionCookie = response.cookies.get("__session");
expect(sessionCookie).toBeDefined();
const { payload: session } = await decrypt(sessionCookie!.value, secret);
const { payload: session } = (await decrypt(
sessionCookie!.value,
secret
)) as jose.JWTDecryptResult;
expect(session).toEqual(
expect.objectContaining({
user: {
Expand Down Expand Up @@ -2695,7 +2741,10 @@ ca/T0LLtgmbMmxSv/MmzIg==
// validate the session cookie
const sessionCookie = response.cookies.get("__session");
expect(sessionCookie).toBeDefined();
const { payload: session } = await decrypt(sessionCookie!.value, secret);
const { payload: session } = (await decrypt(
sessionCookie!.value,
secret
)) as jose.JWTDecryptResult;
expect(session).toEqual(
expect.objectContaining({
user: {
Expand Down Expand Up @@ -3081,10 +3130,10 @@ ca/T0LLtgmbMmxSv/MmzIg==
// validate the session cookie
const sessionCookie = response.cookies.get("__session");
expect(sessionCookie).toBeDefined();
const { payload: session } = await decrypt(
const { payload: session } = (await decrypt(
sessionCookie!.value,
secret
);
)) as jose.JWTDecryptResult;
expect(session).toEqual(expect.objectContaining(expectedSession));
});

Expand Down Expand Up @@ -3545,10 +3594,10 @@ ca/T0LLtgmbMmxSv/MmzIg==
// validate the session cookie
const sessionCookie = response.cookies.get("__session");
expect(sessionCookie).toBeDefined();
const { payload: session } = await decrypt(
const { payload: session } = (await decrypt(
sessionCookie!.value,
secret
);
)) as jose.JWTDecryptResult;
expect(session).toEqual(
expect.objectContaining({
user: {
Expand Down Expand Up @@ -3679,10 +3728,10 @@ ca/T0LLtgmbMmxSv/MmzIg==
// validate the session cookie
const sessionCookie = response.cookies.get("__session");
expect(sessionCookie).toBeDefined();
const { payload: session } = await decrypt(
const { payload: session } = (await decrypt(
sessionCookie!.value,
secret
);
)) as jose.JWTDecryptResult;
expect(session).toEqual(
expect.objectContaining({
user: {
Expand Down Expand Up @@ -3783,10 +3832,10 @@ ca/T0LLtgmbMmxSv/MmzIg==

// validate that the session cookie has been updated
const updatedSessionCookie = response.cookies.get("__session");
const { payload: updatedSession } = await decrypt<SessionData>(
const { payload: updatedSession } = (await decrypt<SessionData>(
updatedSessionCookie!.value,
secret
);
)) as jose.JWTDecryptResult<SessionData>;
expect(updatedSession.tokenSet.accessToken).toEqual(newAccessToken);
});

Expand Down
10 changes: 5 additions & 5 deletions src/server/cookies.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import { NextResponse } from "next/server";
import * as jose from "jose";
import { describe, expect, it } from "vitest";

import { generateSecret } from "../test/utils";
Expand All @@ -13,9 +14,9 @@ describe("encrypt/decrypt", async () => {
const maxAge = 60 * 60; // 1 hour in seconds
const expiration = Math.floor(Date.now() / 1000 + maxAge);
const encrypted = await encrypt(payload, secret, expiration);
const decrypted = await decrypt(encrypted, secret);
const decrypted = await decrypt(encrypted, secret) as jose.JWTDecryptResult;

expect(decrypted.payload).toEqual(expect.objectContaining(payload));
expect(decrypted!.payload).toEqual(expect.objectContaining(payload));
});

it("should fail to decrypt a payload with the incorrect secret", async () => {
Expand All @@ -32,9 +33,8 @@ describe("encrypt/decrypt", async () => {
const payload = { key: "value" };
const expiration = Math.floor(Date.now() / 1000 - 60); // 60 seconds in the past
const encrypted = await encrypt(payload, secret, expiration);
await expect(() => decrypt(encrypted, secret)).rejects.toThrowError(
`"exp" claim timestamp check failed`
);
const decrypted = await decrypt(encrypted, secret);
expect(decrypted).toBeNull();
});

it("should fail to encrypt if a secret is not provided", async () => {
Expand Down
31 changes: 19 additions & 12 deletions src/server/cookies.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,20 +44,27 @@ export async function decrypt<T>(
secret: string,
options?: jose.JWTDecryptOptions
) {
const encryptionSecret = await hkdf(
DIGEST,
secret,
"",
ENCRYPTION_INFO,
BYTE_LENGTH
);
try {
const encryptionSecret = await hkdf(
DIGEST,
secret,
"",
ENCRYPTION_INFO,
BYTE_LENGTH
);

const cookie = await jose.jwtDecrypt<T>(cookieValue, encryptionSecret, {
...options,
...{ clockTolerance: 15 }
});
const cookie = await jose.jwtDecrypt<T>(cookieValue, encryptionSecret, {
...options,
...{ clockTolerance: 15 }
});

return cookie;
return cookie;
} catch (e: any) {
if (e.code === "ERR_JWT_EXPIRED") {
return null;
}
throw e;
}
}

/**
Expand Down
36 changes: 29 additions & 7 deletions src/server/session/stateful-session-store.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import * as jose from "jose";
import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";

import { generateSecret } from "../../test/utils";
Expand Down Expand Up @@ -332,7 +333,10 @@ describe("Stateful Session Store", async () => {
await sessionStore.set(requestCookies, responseCookies, session);

const cookie = responseCookies.get("__session");
const { payload: cookieValue } = await decrypt(cookie!.value, secret);
const { payload: cookieValue } = (await decrypt(
cookie!.value,
secret
)) as jose.JWTDecryptResult;

expect(cookie).toBeDefined();
expect(cookieValue).toHaveProperty("id");
Expand Down Expand Up @@ -386,7 +390,10 @@ describe("Stateful Session Store", async () => {
await sessionStore.set(requestCookies, responseCookies, session);

const cookie = responseCookies.get("__session");
const { payload: cookieValue } = await decrypt(cookie!.value, secret);
const { payload: cookieValue } = (await decrypt(
cookie!.value,
secret
)) as jose.JWTDecryptResult;

expect(cookie).toBeDefined();
expect(cookieValue).toHaveProperty("id");
Expand Down Expand Up @@ -434,7 +441,10 @@ describe("Stateful Session Store", async () => {
await sessionStore.set(requestCookies, responseCookies, session);

const cookie = responseCookies.get("__session");
const { payload: cookieValue } = await decrypt(cookie!.value, secret);
const { payload: cookieValue } = (await decrypt(
cookie!.value,
secret
)) as jose.JWTDecryptResult;

expect(cookie).toBeDefined();
expect(cookieValue).toHaveProperty("id");
Expand Down Expand Up @@ -493,7 +503,10 @@ describe("Stateful Session Store", async () => {
await sessionStore.set(requestCookies, responseCookies, session, true);

const cookie = responseCookies.get("__session");
const { payload: cookieValue } = await decrypt(cookie!.value, secret);
const { payload: cookieValue } = (await decrypt(
cookie!.value,
secret
)) as jose.JWTDecryptResult;

expect(cookie).toBeDefined();
expect(store.delete).toHaveBeenCalledWith(sessionId); // the old session should be deleted
Expand Down Expand Up @@ -542,7 +555,10 @@ describe("Stateful Session Store", async () => {
await sessionStore.set(requestCookies, responseCookies, session);

const cookie = responseCookies.get("__session");
const { payload: cookieValue } = await decrypt(cookie!.value, secret);
const { payload: cookieValue } = (await decrypt(
cookie!.value,
secret
)) as jose.JWTDecryptResult;

expect(cookie).toBeDefined();
expect(cookieValue).toHaveProperty("id");
Expand Down Expand Up @@ -592,7 +608,10 @@ describe("Stateful Session Store", async () => {
await sessionStore.set(requestCookies, responseCookies, session);

const cookie = responseCookies.get("__session");
const { payload: cookieValue } = await decrypt(cookie!.value, secret);
const { payload: cookieValue } = (await decrypt(
cookie!.value,
secret
)) as jose.JWTDecryptResult;

expect(cookie).toBeDefined();
expect(cookieValue).toHaveProperty("id");
Expand Down Expand Up @@ -686,7 +705,10 @@ describe("Stateful Session Store", async () => {
await sessionStore.set(requestCookies, responseCookies, session);

const cookie = responseCookies.get("my-session");
const { payload: cookieValue } = await decrypt(cookie!.value, secret);
const { payload: cookieValue } = (await decrypt(
cookie!.value,
secret
)) as jose.JWTDecryptResult;

expect(cookie).toBeDefined();
expect(cookieValue).toHaveProperty("id");
Expand Down
Loading