The modern link attribution platform. Loved by world-class engineering teams at Twilio, Zillow, Jobber, Vercel, Raycast, and more.
TypeScript clickhousemysqlnextjsopen-sourceplanetscaleprismatailwindcsstinybirdtypescriptupstashvercel
Harden domain verification against invalid slugs
Kiran Ka294817949f5
diff --git a/apps/web/app/(ee)/api/cron/domains/verify/route.ts b/apps/web/app/(ee)/api/cron/domains/verify/route.tsindex 4f4faa3826..18923d48ef 100644--- a/apps/web/app/(ee)/api/cron/domains/verify/route.ts+++ b/apps/web/app/(ee)/api/cron/domains/verify/route.ts@@ -1,5 +1,6 @@import { getConfigResponse } from "@/lib/api/domains/get-config-response";import { getDomainResponse } from "@/lib/api/domains/get-domain-response";+import { isValidDomainFormat } from "@/lib/api/domains/is-valid-domain";import { verifyDomain } from "@/lib/api/domains/verify-domain";import { withCron } from "@/lib/cron/with-cron";import { prisma } from "@/lib/prisma";@@ -51,27 +52,7 @@ export const GET = withCron(async () => {const results = await Promise.allSettled(domains.map(async (domain) => {const { slug, verified, primary, createdAt } = domain;- const [domainJson, configJson] = await Promise.all([- getDomainResponse(slug),- getConfigResponse(slug),- ]);-- let newVerified;-- if (domainJson?.error?.code === "not_found") {- newVerified = false;- } else if (!domainJson.verified) {- const verificationJson = await verifyDomain(slug);- if (verificationJson && verificationJson.verified) {- newVerified = true;- } else {- newVerified = false;- }- } else if (!configJson.misconfigured) {- newVerified = true;- } else {- newVerified = false;- }+ const newVerified = await getVerificationStatus(slug);const prismaResponse = await prisma.domain.update({where: {@@ -106,3 +87,27 @@ export const GET = withCron(async () => {return NextResponse.json(results);});++async function getVerificationStatus(slug: string) {+ // The Vercel helpers throw on these slugs, which would leave `lastChecked`+ // unchanged and keep the row at the front of this queue on every run.+ if (!isValidDomainFormat(slug)) {+ return false;+ }++ const [domainJson, configJson] = await Promise.all([+ getDomainResponse(slug),+ getConfigResponse(slug),+ ]);++ if (domainJson?.error?.code === "not_found") {+ return false;+ }++ if (!domainJson.verified) {+ const verificationJson = await verifyDomain(slug);+ return Boolean(verificationJson?.verified);+ }++ return !configJson.misconfigured;+}diff --git a/apps/web/app/(ee)/api/cron/import/csv/route.ts b/apps/web/app/(ee)/api/cron/import/csv/route.tsindex e13b43ddc5..0292274f16 100644--- a/apps/web/app/(ee)/api/cron/import/csv/route.ts+++ b/apps/web/app/(ee)/api/cron/import/csv/route.ts@@ -1,5 +1,6 @@import { createId } from "@/lib/api/create-id";import { addDomainToVercel } from "@/lib/api/domains/add-domain-vercel";+import { isValidDomainFormat } from "@/lib/api/domains/is-valid-domain";import { handleAndReturnErrorResponse } from "@/lib/api/errors";import { bulkCreateLinks, createLink, processLink } from "@/lib/api/links";import { qstash } from "@/lib/cron";@@ -173,6 +174,14 @@ const mapCsvRowToLink = (};}const domain = linkObj.hostname;++ if (!isValidDomainFormat(domain)) {+ return {+ success: false,+ error: `Invalid domain: ${domain}`,+ };+ }+const key = linkObj.pathname.slice(1) || "_root";let urlObj: URL;diff --git a/apps/web/app/api/domains/[domain]/verify/route.ts b/apps/web/app/api/domains/[domain]/verify/route.tsindex bc55031199..e824038196 100644--- a/apps/web/app/api/domains/[domain]/verify/route.ts+++ b/apps/web/app/api/domains/[domain]/verify/route.ts@@ -1,6 +1,7 @@import { getConfigResponse } from "@/lib/api/domains/get-config-response";import { getDomainOrThrow } from "@/lib/api/domains/get-domain-or-throw";import { getDomainResponse } from "@/lib/api/domains/get-domain-response";+import { serializeVerificationResponse } from "@/lib/api/domains/serialize-verification-response";import { verifyDomainWithRetry } from "@/lib/api/domains/verify-domain";import { withWorkspace } from "@/lib/auth";import { DEFAULT_DC_SERVICE_SUBDOMAIN } from "@/lib/domain-connect/constants";@@ -38,14 +39,14 @@ export const GET = withWorkspace(status = "Domain Not Found";return NextResponse.json({status,- response: { configJson, domainJson },+ response: serializeVerificationResponse({ domainJson, configJson }),domainConnect: null,});} else if (domainJson.error) {status = "Unknown Error";return NextResponse.json({status,- response: { configJson, domainJson },+ response: serializeVerificationResponse({ domainJson, configJson }),domainConnect: null,});}@@ -57,7 +58,7 @@ export const GET = withWorkspace(status = "Conflicting DNS Records";return NextResponse.json({status,- response: { configJson, domainJson },+ response: serializeVerificationResponse({ domainJson, configJson }),domainConnect: null,});}@@ -93,11 +94,10 @@ export const GET = withWorkspace(return NextResponse.json({status,- response: {- configJson: freshConfig,+ response: serializeVerificationResponse({domainJson: { ...domainJson, verified: true },- verificationJson,- },+ configJson: freshConfig,+ }),domainConnect,});}@@ -121,15 +121,14 @@ export const GET = withWorkspace(return NextResponse.json({status,- response: { configJson, domainJson, verificationJson },+ response: serializeVerificationResponse({ domainJson, configJson }),domainConnect,});}- let prismaResponse: any = null;let domainConnect: DomainConnectDiscovery | null = null;if (!configJson.misconfigured) {- prismaResponse = await prisma.domain.update({+ await prisma.domain.update({where: {slug: domain,},@@ -140,7 +139,7 @@ export const GET = withWorkspace(});} else {status = "Invalid Configuration";- [prismaResponse, domainConnect] = await Promise.all([+ [, domainConnect] = await Promise.all([prisma.domain.update({where: { slug: domain },data: { verified: false, lastChecked: new Date() },@@ -151,7 +150,7 @@ export const GET = withWorkspace(return NextResponse.json({status,- response: { configJson, domainJson, prismaResponse },+ response: serializeVerificationResponse({ domainJson, configJson }),domainConnect,});},diff --git a/apps/web/lib/api/domains/serialize-verification-response.ts b/apps/web/lib/api/domains/serialize-verification-response.tsnew file mode 100644index 0000000000..0a6c388796--- /dev/null+++ b/apps/web/lib/api/domains/serialize-verification-response.ts@@ -0,0 +1,53 @@+import * as z from "zod/v4";++// Only fields rendered by `ui/domains/domain-configuration.tsx` are returned.+// Unknown keys from Vercel's responses are stripped.+const vercelDomainSchema = z.object({+ name: z.string().optional(),+ apexName: z.string().optional(),+ verified: z.boolean().optional(),+ verification: z+ .array(+ z.object({+ type: z.string().optional(),+ domain: z.string().optional(),+ value: z.string().optional(),+ }),+ )+ .optional(),+ error: z+ .object({+ code: z.string().optional(),+ message: z.string().optional(),+ })+ .optional(),+});++const vercelConfigSchema = z.object({+ misconfigured: z.boolean().optional(),+ conflicts: z+ .array(+ z.object({+ name: z.string().optional(),+ type: z.string().optional(),+ value: z.string().optional(),+ }),+ )+ .optional(),+});++export function serializeVerificationResponse({+ domainJson,+ configJson,+}: {+ domainJson: unknown;+ configJson: unknown;+}) {+ const domain = vercelDomainSchema.safeParse(domainJson);+ const config = vercelConfigSchema.safeParse(configJson);++ return {+ domainJson: domain.success ? domain.data : {},+ configJson: config.success ? config.data : {},+ };+}