Email for professionals and teams
fix(security): constrain webhook targets and skip spam/trash dispatch (#224)
Hieu Nguyen (Jack)7a0ac0c6c1c1
diff --git a/src/lib/email/inbound.ts b/src/lib/email/inbound.tsindex 2046595..6bd2504 100644--- a/src/lib/email/inbound.ts+++ b/src/lib/email/inbound.ts@@ -269,16 +269,19 @@ export async function processInboundMessage(subject: parsed.subject,});}- await dispatchWebhooks(env, decision.mailbox.userId, "message.inbound", {- messageId,- from: fromAddr,- to: payload.to,- cc: parsed.ccAddr ?? undefined,- subject: parsed.subject,- threadId,- spamScore: spamAnalysis?.score,- spamVerdict: spamAnalysis?.verdict,- });+ // Spam and blocked mail carry an unauthenticated From; consumers acting on it would be fooled.+ if (status !== "spam" && status !== "trash") {+ await dispatchWebhooks(env, decision.mailbox.userId, "message.inbound", {+ messageId,+ from: fromAddr,+ to: payload.to,+ cc: parsed.ccAddr ?? undefined,+ subject: parsed.subject,+ threadId,+ spamScore: spamAnalysis?.score,+ spamVerdict: spamAnalysis?.verdict,+ });+ }try {await scheduleAutoDraft(env, { mailboxId: decision.mailbox.mailboxId, sourceMessageId: messageId, ownerUserId: decision.mailbox.userId, sender: fromAddr, headers: payload.headers, status, folderId, spamVerdict: spamAnalysis?.verdict, spamAnalysisError });} catch (error) { console.error("Auto-draft scheduling failed", error); }diff --git a/src/lib/email/webhooks.ts b/src/lib/email/webhooks.tsindex 01063aa..5af496b 100644--- a/src/lib/email/webhooks.ts+++ b/src/lib/email/webhooks.ts@@ -3,6 +3,7 @@ import { getDb } from "@/db";import type { AppDatabase } from "@/db";import { webhookDeliveries, webhooks } from "@/db/schema";import { newId } from "@/lib/ids";+import { isPublicHttpsUrl, PUBLIC_HTTPS_URL_MESSAGE } from "@/lib/security/public-url";export type WebhookEventType = "message.inbound" | "message.outbound" | "message.failed";@@ -98,6 +99,8 @@ async function attemptDelivery(let error: string | null = null;try {+ // Hooks saved before URL validation existed must not become an SSRF path.+ if (!isPublicHttpsUrl(hook.url)) throw new Error(PUBLIC_HTTPS_URL_MESSAGE);const signature = await signPayload(hook.secret, delivery.payload);const res = await fetch(hook.url, {method: "POST",diff --git a/src/lib/remote-images/fetch.ts b/src/lib/remote-images/fetch.tsindex 0464054..793cdc1 100644--- a/src/lib/remote-images/fetch.ts+++ b/src/lib/remote-images/fetch.ts@@ -44,7 +44,7 @@ function invalidUrl(message = "Invalid remote image URL"): never {throw new RemoteImageError(message, 400, "invalid_url");}-function isIpLiteral(hostname: string): boolean {+export function isIpLiteral(hostname: string): boolean {return hostname.startsWith("[") || /^\d{1,3}(?:\.\d{1,3}){3}$/.test(hostname);}@@ -58,7 +58,7 @@ function embedsNonPublicIpv4(host: string): boolean {return false;}-function isForbiddenHostname(hostname: string): boolean {+export function isForbiddenHostname(hostname: string): boolean {const host = hostname.toLowerCase().replace(/\.$/, "");if (embedsNonPublicIpv4(host)) return true;if (WILDCARD_DNS_SUFFIXES.some((suffix) => host === suffix || host.endsWith(`.${suffix}`))) return true;diff --git a/src/lib/validators.ts b/src/lib/validators.tsindex 1140cbc..d4bd29b 100644--- a/src/lib/validators.ts+++ b/src/lib/validators.ts@@ -1,4 +1,5 @@import { z } from "zod";+import { isPublicHttpsUrl, PUBLIC_HTTPS_URL_MESSAGE } from "@/lib/security/public-url";import { getEmailAddress, splitEmailAddressList } from "@/lib/email/address";import { DEFAULT_FOLDER_COLOR, FOLDER_COLOR_VALUES } from "@/lib/folders/colors";import { MAX_FOLLOW_UP_DAYS } from "@/lib/follow-ups/follow-up-utils";@@ -339,7 +340,7 @@ export const domainRoutingRuleSchema = z});export const webhookSchema = z.object({- url: z.string().url().max(2048),+ url: z.string().url().max(2048).refine(isPublicHttpsUrl, PUBLIC_HTTPS_URL_MESSAGE),description: z.string().trim().max(200).optional(),events: z.array(z.enum(["message.inbound", "message.outbound", "message.failed"]))@@ -349,7 +350,7 @@ export const webhookSchema = z.object({});export const webhookUpdateSchema = z.object({- url: z.string().url().max(2048).optional(),+ url: z.string().url().max(2048).refine(isPublicHttpsUrl, PUBLIC_HTTPS_URL_MESSAGE).optional(),description: z.string().trim().max(200).nullish(),events: z.array(z.enum(["message.inbound", "message.outbound", "message.failed"]))