Skip to content

fix(auth): trim bearer tokens in rate-limit keys #65

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

Closed
jony376 wants to merge 4 commits into from
Closed

fix(auth): trim bearer tokens in rate-limit keys #65

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
3ab540a
fix(auth): trim bearer tokens in rate-limit keys
jony376 May 29, 2026
f8e1231
Merge remote-tracking branch 'upstream/main' into fix/rate-limit-bear…
jony376 Jun 1, 2026
c3eb882
Merge branch 'main' into fix/rate-limit-bearer-trim
JSONbored Jun 1, 2026
44fb0b0
Merge branch 'main' into fix/rate-limit-bearer-trim
JSONbored Jun 2, 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
6 changes: 3 additions & 3 deletions src/auth/rate-limit.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import type { Context } from "hono";
import { DurableObject } from "cloudflare:workers";
import { recordAuditEvent } from "../db/repositories";
import { hashToken } from "./security";
import { extractBearerToken, hashToken } from "./security";

export type RateLimitClass = "strict" | "normal" | "expensive";

Expand Down Expand Up @@ -116,15 +116,15 @@ export function routeClassForPath(path: string): RateLimitClass {
}

async function rateLimitKey(c: Context<{ Bindings: Env }>, routeClass: RateLimitClass): Promise<string> {
const token = c.req.header("authorization")?.replace(/^Bearer\s+/i, "");
const token = extractBearerToken(c.req.header("authorization"));
const ip = c.req.header("cf-connecting-ip") ?? c.req.header("x-forwarded-for")?.split(",")[0]?.trim() ?? "unknown-ip";
const pathGroup = c.req.path.replace(/\/\d+(?=\/|$)/g, "/:number").replace(/\/[^/]+\/[^/]+\/pulls\//, "/:owner/:repo/pulls/");
const identity = token ? `token:${await hashToken(token)}` : `ip:${await hashToken(ip)}`;
return `${routeClass}:${pathGroup}:${identity}`;
}

async function actorHint(c: Context<{ Bindings: Env }>): Promise<string> {
const token = c.req.header("authorization")?.replace(/^Bearer\s+/i, "");
const token = extractBearerToken(c.req.header("authorization"));
if (!token) return "anonymous";
return `token:${(await hashToken(token)).slice(0, 16)}`;
}
9 changes: 8 additions & 1 deletion test/unit/auth.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { afterEach, describe, expect, it, vi } from "vitest";
import { completeGitHubWebOAuth, createSessionFromGitHubToken, pollGitHubDeviceFlow, startGitHubDeviceFlow, startGitHubWebOAuth } from "../../src/auth/github-oauth";
import { enforceRateLimit, RateLimiter, routeClassForPath } from "../../src/auth/rate-limit";
import { authenticatePrivateToken, buildBrowserSessionCookie, createSessionForGitHubUser, extractCookieValue, isAuthorizedGitHubSessionLogin, revokeSession, timingSafeEqual } from "../../src/auth/security";
import { authenticatePrivateToken, buildBrowserSessionCookie, createSessionForGitHubUser, extractBearerToken, extractCookieValue, hashToken, isAuthorizedGitHubSessionLogin, revokeSession, timingSafeEqual } from "../../src/auth/security";
import { createTestEnv } from "../helpers/d1";

describe("private-beta auth and rate limiting", () => {
Expand Down Expand Up @@ -92,6 +92,13 @@ describe("private-beta auth and rate limiting", () => {
expect(routeClassForPath("/v1/repos")).toBe("normal");
});

it("hashes trimmed bearer tokens for rate-limit identity", async () => {
const padded = extractBearerToken("Bearer session-token ");
const plain = extractBearerToken("Bearer session-token");
expect(padded).toBe(plain);
expect(await hashToken(padded!)).toEqual(await hashToken(plain!));
});

it("enforces route limits with session and IP keys plus retry headers", async () => {
const env = createTestEnv();
const noLimiter = fakeContext(env, "/v1/repos/123/pulls/456", { authorization: "Bearer session-token" });
Expand Down