Skip to content

Supercharge your AI agents with data from the web and beyond. Building the library for superintelligence. 🔥

fix(api): use constant-time comparison for shared tokens (#5309)

David Tippettf57118c51002
diff --git a/apps/api/src/controllers/auth.ts b/apps/api/src/controllers/auth.ts
index f112baf70..7c23158ce 100644
--- a/apps/api/src/controllers/auth.ts
+++ b/apps/api/src/controllers/auth.ts
@@ -2,6 +2,7 @@ import { RateLimiterRedis } from "rate-limiter-flexible";
import { isValidUuid } from "../lib/owner-id";
import { config } from "../config";
import { logger } from "../lib/logger";
+import { timingSafeSecretEqual } from "../lib/secret-compare";
import { parseApi } from "../lib/parseApi";
import { withAuth } from "../lib/withAuth";
import { getAgentSponsorStatus } from "../services/agent-sponsor";
@@ -218,7 +219,7 @@ async function getACUC(
mode === RateLimiterMode.ExtractStatus ||
mode === RateLimiterMode.ExtractAgentPreview;
- if (api_key === config.PREVIEW_TOKEN) {
+ if (timingSafeSecretEqual(api_key, config.PREVIEW_TOKEN)) {
const acuc = mockPreviewACUC(api_key, isExtract);
acuc.is_extract = isExtract;
return acuc;
@@ -567,8 +568,10 @@ function keylessSuspiciousIpMessage(signupUrl: string): string {
export function keylessClientIp(req): string {
let ip = req.ip ?? req.socket?.remoteAddress ?? "unknown";
if (
- config.KEYLESS_PROXY_SECRET &&
- req.headers["x-firecrawl-keyless-secret"] === config.KEYLESS_PROXY_SECRET
+ timingSafeSecretEqual(
+ req.headers["x-firecrawl-keyless-secret"],
+ config.KEYLESS_PROXY_SECRET,
+ )
) {
const forwarded = req.headers["x-firecrawl-keyless-ip"];
if (typeof forwarded === "string" && forwarded.trim()) {
@@ -890,7 +893,7 @@ async function supaAuthenticateUser(
"Unauthenticated Playground calls are temporarily disabled due to abuse. Please sign up.",
);
}
- if (token == config.PREVIEW_TOKEN) {
+ if (timingSafeSecretEqual(token, config.PREVIEW_TOKEN)) {
if (mode == RateLimiterMode.CrawlStatus) {
rateLimiter = getRateLimiter(RateLimiterMode.CrawlStatus);
} else if (mode == RateLimiterMode.ExtractStatus) {
@@ -1114,7 +1117,9 @@ async function supaAuthenticateUser(
}
}
- const team_endpoint_token = token === config.PREVIEW_TOKEN ? iptoken : teamId;
+ const team_endpoint_token = timingSafeSecretEqual(token, config.PREVIEW_TOKEN)
+ ? iptoken
+ : teamId;
try {
await rateLimiter.consume(team_endpoint_token);
@@ -1144,7 +1149,7 @@ async function supaAuthenticateUser(
}
if (
- token === config.PREVIEW_TOKEN &&
+ timingSafeSecretEqual(token, config.PREVIEW_TOKEN) &&
(mode === RateLimiterMode.Scrape ||
mode === RateLimiterMode.Preview ||
mode === RateLimiterMode.Map ||
diff --git a/apps/api/src/controllers/v1/scrape.ts b/apps/api/src/controllers/v1/scrape.ts
index 8ffec9240..f9fc32e2e 100644
--- a/apps/api/src/controllers/v1/scrape.ts
+++ b/apps/api/src/controllers/v1/scrape.ts
@@ -1,5 +1,6 @@
import { Response } from "express";
import { config } from "../../config";
+import { timingSafeSecretEqual } from "../../lib/secret-compare";
import { logger as _logger } from "../../lib/logger";
import {
Document,
@@ -191,9 +192,10 @@ async function scrapeControllerInner(
// const startTime = new Date().getTime();
- const isDirectToBullMQ =
- config.SEARCH_PREVIEW_TOKEN !== undefined &&
- config.SEARCH_PREVIEW_TOKEN === req.body.__searchPreviewToken;
+ const isDirectToBullMQ = timingSafeSecretEqual(
+ req.body.__searchPreviewToken,
+ config.SEARCH_PREVIEW_TOKEN,
+ );
const { scrapeOptions, internalOptions } = fromV1ScrapeOptions(
req.body,
diff --git a/apps/api/src/controllers/v1/search.ts b/apps/api/src/controllers/v1/search.ts
index 708aa1c5c..57bc740e1 100644
--- a/apps/api/src/controllers/v1/search.ts
+++ b/apps/api/src/controllers/v1/search.ts
@@ -1,5 +1,6 @@
import { Response } from "express";
import { config } from "../../config";
+import { timingSafeSecretEqual } from "../../lib/secret-compare";
import {
Document,
RequestWithAuth,
@@ -130,9 +131,10 @@ export async function searchController(
id: jobId,
};
const middlewareTime = controllerStartTime - middlewareStartTime;
- const isSearchPreview =
- config.SEARCH_PREVIEW_TOKEN !== undefined &&
- config.SEARCH_PREVIEW_TOKEN === req.body.__searchPreviewToken;
+ const isSearchPreview = timingSafeSecretEqual(
+ req.body.__searchPreviewToken,
+ config.SEARCH_PREVIEW_TOKEN,
+ );
let reservedKeylessCredits = 0;
let reconciledKeylessCredits = false;
diff --git a/apps/api/src/controllers/v2/keyless-eligibility.ts b/apps/api/src/controllers/v2/keyless-eligibility.ts
index f97ce99ea..2056451d0 100644
--- a/apps/api/src/controllers/v2/keyless-eligibility.ts
+++ b/apps/api/src/controllers/v2/keyless-eligibility.ts
@@ -1,5 +1,6 @@
import { Request, Response } from "express";
import { config } from "../../config";
+import { timingSafeSecretEqual } from "../../lib/secret-compare";
import {
checkKeylessEligibility,
keylessSignupUrlForIp,
@@ -33,7 +34,7 @@ export async function keylessEligibilityController(
res: Response,
): Promise<void> {
const secret = req.headers["x-firecrawl-keyless-secret"];
- if (!config.KEYLESS_PROXY_SECRET || secret !== config.KEYLESS_PROXY_SECRET) {
+ if (!timingSafeSecretEqual(secret, config.KEYLESS_PROXY_SECRET)) {
res.status(401).json({ eligible: false, error: "Unauthorized" });
return;
}
diff --git a/apps/api/src/controllers/v2/parse.ts b/apps/api/src/controllers/v2/parse.ts
index e0b370dff..bfecd83c1 100644
--- a/apps/api/src/controllers/v2/parse.ts
+++ b/apps/api/src/controllers/v2/parse.ts
@@ -1,5 +1,6 @@
import { NextFunction, Request, Response } from "express";
import { config } from "../../config";
+import { timingSafeSecretEqual } from "../../lib/secret-compare";
import { logger as _logger } from "../../lib/logger";
import {
Document,
@@ -396,9 +397,10 @@ export async function parseController(
const agentRequestId = req.body.__agentInterop?.requestId ?? null;
const boostConcurrency =
req.body.__agentInterop?.boostConcurrency ?? false;
- const isDirectToBullMQ =
- config.SEARCH_PREVIEW_TOKEN !== undefined &&
- config.SEARCH_PREVIEW_TOKEN === req.body.__searchPreviewToken;
+ const isDirectToBullMQ = timingSafeSecretEqual(
+ req.body.__searchPreviewToken,
+ config.SEARCH_PREVIEW_TOKEN,
+ );
const projectedKeylessCredits =
shouldBill && !isDirectToBullMQ
? projectScrapeCredits(
diff --git a/apps/api/src/controllers/v2/scrape.ts b/apps/api/src/controllers/v2/scrape.ts
index 2fcba9cf2..f81fddc73 100644
--- a/apps/api/src/controllers/v2/scrape.ts
+++ b/apps/api/src/controllers/v2/scrape.ts
@@ -2,6 +2,7 @@ import { Response } from "express";
import { providerScrapeController } from "./scrape-alexandria";
import { discoverTools } from "../../search/alexandria";
import { config } from "../../config";
+import { timingSafeSecretEqual } from "../../lib/secret-compare";
import { logger as _logger } from "../../lib/logger";
import {
Document,
@@ -246,9 +247,10 @@ export async function scrapeController(
const agentRequestId = req.body.__agentInterop?.requestId ?? null;
const boostConcurrency =
req.body.__agentInterop?.boostConcurrency ?? false;
- const isDirectToBullMQ =
- config.SEARCH_PREVIEW_TOKEN !== undefined &&
- config.SEARCH_PREVIEW_TOKEN === req.body.__searchPreviewToken;
+ const isDirectToBullMQ = timingSafeSecretEqual(
+ req.body.__searchPreviewToken,
+ config.SEARCH_PREVIEW_TOKEN,
+ );
const projectedKeylessCredits =
shouldBill && !isDirectToBullMQ
? projectScrapeCredits(
diff --git a/apps/api/src/controllers/v2/search.ts b/apps/api/src/controllers/v2/search.ts
index 924cb977a..e43b4782b 100644
--- a/apps/api/src/controllers/v2/search.ts
+++ b/apps/api/src/controllers/v2/search.ts
@@ -1,6 +1,7 @@
import { NextFunction, Request, Response } from "express";
import { externalRequestId } from "../../lib/external-request-id";
import { config } from "../../config";
+import { timingSafeSecretEqual } from "../../lib/secret-compare";
import {
RequestWithAuth,
SearchRequest,
@@ -144,9 +145,10 @@ async function searchControllerInner(
});
const middlewareTime = controllerStartTime - middlewareStartTime;
- const isSearchPreview =
- config.SEARCH_PREVIEW_TOKEN !== undefined &&
- config.SEARCH_PREVIEW_TOKEN === req.body.__searchPreviewToken;
+ const isSearchPreview = timingSafeSecretEqual(
+ req.body.__searchPreviewToken,
+ config.SEARCH_PREVIEW_TOKEN,
+ );
let zeroDataRetention = teamForcedKind !== null;
let reservedKeylessCredits = 0;
diff --git a/apps/api/src/lib/keyless-signup-link.ts b/apps/api/src/lib/keyless-signup-link.ts
index f3136527d..0c9e5a34b 100644
--- a/apps/api/src/lib/keyless-signup-link.ts
+++ b/apps/api/src/lib/keyless-signup-link.ts
@@ -2,6 +2,7 @@ import { createCipheriv } from "node:crypto";
import { isIPv4 } from "node:net";
import { config } from "../config";
import { logger } from "./logger";
+import { timingSafeSecretEqual } from "./secret-compare";
import { resolveIntegration } from "../utils/integration";
// Keyless prompts link to signup at https://firecrawl.dev/k/<token>. The token
@@ -340,9 +341,10 @@ export function keylessSignupSurface(req: RequestLike): KeylessSignupSurface {
: (headerOrigin ?? bodyOrigin);
const integration = resolveIntegration(lowerString(body.integration), req);
if (
- config.KEYLESS_PROXY_SECRET &&
- firstHeader(req, "x-firecrawl-keyless-secret") ===
- config.KEYLESS_PROXY_SECRET
+ timingSafeSecretEqual(
+ firstHeader(req, "x-firecrawl-keyless-secret"),
+ config.KEYLESS_PROXY_SECRET,
+ )
) {
return "mcp";
}
diff --git a/apps/api/src/lib/secret-compare.ts b/apps/api/src/lib/secret-compare.ts
new file mode 100644
index 000000000..115e1c153
--- /dev/null
+++ b/apps/api/src/lib/secret-compare.ts
@@ -0,0 +1,12 @@
+import { createHash, timingSafeEqual } from "node:crypto";
+
+// Compares SHA-256 digests so neither content nor length leaks through timing.
+export function timingSafeSecretEqual(
+ provided: unknown,
+ expected?: string,
+): boolean {
+ if (typeof provided !== "string" || !provided || !expected) return false;
+ const left = createHash("sha256").update(provided).digest();
+ const right = createHash("sha256").update(expected).digest();
+ return timingSafeEqual(left, right);
+}
diff --git a/apps/api/src/routes/mcp-action-logs.ts b/apps/api/src/routes/mcp-action-logs.ts
index e4a6a59f5..b664cb1ce 100644
--- a/apps/api/src/routes/mcp-action-logs.ts
+++ b/apps/api/src/routes/mcp-action-logs.ts
@@ -1,4 +1,3 @@
-import crypto from "node:crypto";
import express, {
Application,
NextFunction,
@@ -13,6 +12,9 @@ import {
listMcpActionLogsController,
} from "../controllers/v2/mcp-action-logs";
import { wrap } from "./shared";
+import { timingSafeSecretEqual } from "../lib/secret-compare";
+
+export { timingSafeSecretEqual };
const BODY_LIMIT = "64kb";
const DEFAULT_LIMIT = 600;
@@ -24,16 +26,6 @@ function bearerToken(value: string | string[] | undefined) {
return header?.startsWith("Bearer ") ? header.slice(7) : null;
}
-export function timingSafeSecretEqual(
- provided: string | null,
- expected?: string,
-) {
- if (!provided || !expected) return false;
- const left = Buffer.from(provided);
- const right = Buffer.from(expected);
- return left.length === right.length && crypto.timingSafeEqual(left, right);
-}
-
function requireWritesEnabled(
_req: Request,
res: Response,