The modern link attribution platform. Loved by world-class engineering teams at Twilio, Zillow, Jobber, Vercel, Raycast, and more.
TypeScript clickhousemysqlnextjsopen-sourceplanetscaleprismatailwindcsstinybirdtypescriptupstashvercel
Return proper status codes from cron signature verification failures.
Kiran K6e2c5c112daa
diff --git a/apps/web/app/api/jobs/process/[jobName]/route.ts b/apps/web/app/api/jobs/process/[jobName]/route.tsindex aad8b1f2d9..57c5001983 100644--- a/apps/web/app/api/jobs/process/[jobName]/route.ts+++ b/apps/web/app/api/jobs/process/[jobName]/route.ts@@ -1,3 +1,4 @@+import { handleAndReturnErrorResponse } from "@/lib/api/errors";import { logger, withAxiomBodyLog } from "@/lib/axiom/server";import { verifyQstashSignature } from "@/lib/cron/verify-qstash";import { jobEnvelopeSchema } from "@/lib/jobs";@@ -16,7 +17,11 @@ export const POST = withAxiomBodyLog(const clonedReq = req.clone();const rawBody = await clonedReq.text();- await verifyQstashSignature({ req, rawBody });+ try {+ await verifyQstashSignature({ req, rawBody });+ } catch (error) {+ return handleAndReturnErrorResponse(error);+ }let parsedBody: unknown = null;diff --git a/apps/web/lib/api/error-codes.ts b/apps/web/lib/api/error-codes.tsindex cdbf24c617..cb4934fe5e 100644--- a/apps/web/lib/api/error-codes.ts+++ b/apps/web/lib/api/error-codes.ts@@ -20,3 +20,5 @@ export const ErrorCode = z.enum(...(keyof typeof ErrorCodes)[],],);++export type HttpStatusCode = (typeof ErrorCodes)[keyof typeof ErrorCodes];diff --git a/apps/web/lib/cron/verify-qstash.ts b/apps/web/lib/cron/verify-qstash.tsindex 2f39085ec1..95be4daa35 100644--- a/apps/web/lib/cron/verify-qstash.ts+++ b/apps/web/lib/cron/verify-qstash.ts@@ -1,4 +1,3 @@-import { log } from "@dub/utils";import { Receiver } from "@upstash/qstash";import { DubApiError } from "../api/errors";@@ -22,7 +21,7 @@ export const verifyQstashSignature = async ({if (!signature) {throw new DubApiError({code: "bad_request",- message: "Upstash-Signature header not found.",+ message: "Upstash-Signature header is required.",});}@@ -34,18 +33,9 @@ export const verifyQstashSignature = async ({});if (!isValid) {- const url = req.url;- const messageId = req.headers.get("Upstash-Message-Id");-- log({- message: `Invalid QStash request signature: *${url}* - *${messageId}*`,- type: "errors",- mention: true,- });-throw new DubApiError({code: "unauthorized",- message: "Invalid QStash request signature.",+ message: "Invalid Upstash-Signature header.",});}};diff --git a/apps/web/lib/cron/verify-vercel.ts b/apps/web/lib/cron/verify-vercel.tsindex d74d7bd9f5..74236fa183 100644--- a/apps/web/lib/cron/verify-vercel.ts+++ b/apps/web/lib/cron/verify-vercel.ts@@ -1,5 +1,7 @@import { DubApiError } from "../api/errors";+const cronSecret = process.env.CRON_SECRET;+export const verifyVercelSignature = async (req: Request) => {// skip verification in local developmentif (process.env.VERCEL !== "1") {@@ -8,13 +10,24 @@ export const verifyVercelSignature = async (req: Request) => {const authHeader = req.headers.get("authorization");- if (- !process.env.CRON_SECRET ||- authHeader !== `Bearer ${process.env.CRON_SECRET}`- ) {+ if (!authHeader) {+ throw new DubApiError({+ code: "unauthorized",+ message: "Vercel Authorization header is required.",+ });+ }++ if (!cronSecret) {+ throw new DubApiError({+ code: "internal_server_error",+ message: "CRON_SECRET environment variable is not set.",+ });+ }++ if (authHeader !== `Bearer ${cronSecret}`) {throw new DubApiError({code: "unauthorized",- message: "Invalid Vercel cron request signature",+ message: "Invalid Vercel Authorization header.",});}};diff --git a/apps/web/lib/cron/with-cron.ts b/apps/web/lib/cron/with-cron.tsindex 5e5c43697c..4b20ad21b6 100644--- a/apps/web/lib/cron/with-cron.ts+++ b/apps/web/lib/cron/with-cron.ts@@ -1,5 +1,6 @@-import { APP_DOMAIN_WITH_NGROK, getSearchParams, log } from "@dub/utils";+import { getSearchParams } from "@dub/utils";import { logAndRespond } from "app/(ee)/api/cron/utils";+import { ErrorCodes, HttpStatusCode } from "../api/error-codes";import { logger, withAxiomBodyLog } from "../axiom/server";import { verifyQstashSignature } from "./verify-qstash";import { verifyVercelSignature } from "./verify-vercel";@@ -30,7 +31,6 @@ export const withCron = (handler: WithCronHandler) => {const params = (await initialParams) || {};const searchParams = getSearchParams(req.url);- const url = new URL(req.url || "", APP_DOMAIN_WITH_NGROK);try {let rawBody: string | undefined;@@ -63,12 +63,10 @@ export const withCron = (handler: WithCronHandler) => {logger.error(errorMessage, error);await logger.flush();- await log({- message: `Cron job "${url.pathname}" failed during execution. Error: ${errorMessage}`,- type: "errors",- });+ const statusCode: HttpStatusCode =+ ErrorCodes[error.code ?? "internal_server_error"];- return logAndRespond(errorMessage, { status: 500 });+ return logAndRespond(errorMessage, { status: statusCode });}},);