Supercharge your AI agents with data from the web and beyond. Building the library for superintelligence. 🔥
TypeScript aiai-agentsai-crawlerai-scrapingai-searchcrawlerdata-extractionhtml-to-markdownllmmarkdownscraperscrapingweb-crawlerweb-dataweb-data-extractionweb-scraperweb-scrapingweb-searchwebscraping
fix(auth): accept REST-audience grant keys on OAuth tokens (#5325)
Erik Engervall6e14d58cb643
diff --git a/apps/api/src/controllers/__tests__/auth.test.ts b/apps/api/src/controllers/__tests__/auth.test.tsindex 9d1c420eb..7983ff7e6 100644--- a/apps/api/src/controllers/__tests__/auth.test.ts+++ b/apps/api/src/controllers/__tests__/auth.test.ts@@ -883,11 +883,24 @@ describe("authenticateUser", () => {);});- it("rejects a managed OAuth credential on the public REST token path", async () => {+ it("looks up a REST-audience grant key as a managed credential", async () => {config.USE_DB_AUTHENTICATION = true;config.OAUTH_INTROSPECT_URL = "https://example.test/introspect";config.OAUTH_INTROSPECT_SECRET = "secret";vi.mocked(getValue).mockResolvedValue(null);+ vi.mocked(authCreditUsageChunk).mockResolvedValue([+ {+ api_key: "11111111-1111-1111-8111-111111111111",+ api_key_id: 1,+ team_id: "team-1",+ org_id: "org-1",+ flags: null,+ },+ ]);+ mockMultiplier(1);+ vi.mocked(getAutumnRateLimiter).mockReturnValue({+ consume: vi.fn().mockResolvedValue(undefined),+ } as never);vi.stubGlobal("fetch",vi.fn().mockResolvedValue(@@ -916,9 +929,52 @@ describe("authenticateUser", () => {RateLimiterMode.Scrape,);+ expect(auth).toEqual(+ expect.objectContaining({ success: true, team_id: "team-1" }),+ );+ expect(authCreditUsageChunk).toHaveBeenCalledWith(+ expect.anything(),+ "11111111-1111-1111-8111-111111111111",+ "hosted_mcp_oauth",+ );+ });++ it("rejects a grant key whose audience is hosted MCP", async () => {+ config.USE_DB_AUTHENTICATION = true;+ config.OAUTH_INTROSPECT_URL = "https://example.test/introspect";+ config.OAUTH_INTROSPECT_SECRET = "secret";+ vi.mocked(getValue).mockResolvedValue(null);+ vi.stubGlobal(+ "fetch",+ vi.fn().mockResolvedValue(+ new Response(+ JSON.stringify({+ active: true,+ api_key: "fc-11111111111111118111111111111111",+ scope: "firecrawl:global",+ client_id: "client-1",+ team_id: "team-1",+ exp: Math.floor(Date.now() / 1000) + 60,+ aud: "https://mcp.firecrawl.dev/v2/mcp",+ credential_purpose: "hosted_mcp_oauth",+ }),+ { status: 200, headers: { "Content-Type": "application/json" } },+ ),+ ),+ );++ const auth = await authenticateUser(+ {+ headers: { authorization: "Bearer fco_managed_token" },+ socket: { remoteAddress: "127.0.0.1" },+ },+ {},+ RateLimiterMode.Scrape,+ );+expect(auth).toEqual({success: false,- error: "Unauthorized: Invalid token",+ error: "Unauthorized: Invalid or expired OAuth token",status: 401,});expect(authCreditUsageChunk).not.toHaveBeenCalled();diff --git a/apps/api/src/controllers/auth.ts b/apps/api/src/controllers/auth.tsindex 5478612c1..1d5b7de8e 100644--- a/apps/api/src/controllers/auth.ts+++ b/apps/api/src/controllers/auth.ts@@ -974,10 +974,11 @@ async function supaAuthenticateUser(status: 401,});}- if (- introspection.credential_purpose !== undefined &&- introspection.credential_purpose !== "general"- ) {+ const credentialPurpose = introspection.credential_purpose ?? "general";+ const isRestGrantKey =+ credentialPurpose === "hosted_mcp_oauth" &&+ introspection.aud === FIRECRAWL_REST_RESOURCE;+ if (credentialPurpose !== "general" && !isRestGrantKey) {return denied(req, "oauth_purpose_mismatch", {success: false,error: "Unauthorized: Invalid token",@@ -985,14 +986,13 @@ async function supaAuthenticateUser(});}- // Use the resolved fc- API key to get the normal ACUC chunkconst resolvedApi = parseApi(introspection.api_key);chunk = await getACUC(resolvedApi,false,true,RateLimiterMode.Scrape,- "general",+ credentialPurpose,);if (chunk === null) {