Skip to content

fix(oidc-proxy): validate exp independently of MAX_TOKEN_AGE_SECONDS (#8832) #8904

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

Open
bzqzheng wants to merge 1 commit into
base: main
Choose a base branch
from
+6 −3
Open

fix(oidc-proxy): validate exp independently of MAX_TOKEN_AGE_SECONDS (#8832) #8904

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
4 changes: 3 additions & 1 deletion oidc-proxy/src/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -195,7 +195,9 @@ async function verifyOidcToken(token, env) {
if (age > parseInt(env.MAX_TOKEN_AGE_SECONDS, 10)) {
return { valid: false, reason: "Token too old" };
}
} else if (!payload.exp || payload.exp < Date.now() / 1000) {
}

if (!payload.exp || payload.exp < Date.now() / 1000) {
return { valid: false, reason: "Token expired" };
}

Expand Down
5 changes: 3 additions & 2 deletions oidc-proxy/test/index.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -229,7 +229,7 @@ describe("proxies valid requests", () => {
expect((await response.json()).id).toBe("msg_123");
});

it("accepts recently-expired token within MAX_TOKEN_AGE_SECONDS", async () => {
it("rejects expired token even when within MAX_TOKEN_AGE_SECONDS", async () => {
const now = Math.floor(Date.now() / 1000);
const token = await createSignedJwt(
validPayload({ iat: now - 600, exp: now - 300 }),
Expand All @@ -245,7 +245,8 @@ describe("proxies valid requests", () => {
const response = await worker.fetch(request, testEnv(), ctx);
await waitOnExecutionContext(ctx);

expect(response.status).toBe(200);
expect(response.status).toBe(401);
expect((await response.json()).error).toBe("Token expired");
});
});

Expand Down