Email for professionals and teams
fix(security): give Resend mail a bounded header map (#224)
Hieu Nguyen (Jack)7b6530a31c2c
diff --git a/src/lib/email/provider-intake.ts b/src/lib/email/provider-intake.tsindex 272134d..0d26d9b 100644--- a/src/lib/email/provider-intake.ts+++ b/src/lib/email/provider-intake.ts@@ -4,7 +4,7 @@ import { domains } from "@/db/schema";import { normalizeEmailAddress } from "@/lib/email/address";import { inboundAttachmentLimitReasonFromRaw } from "@/lib/email/inbound-attachments";import { intakeIncomingMail } from "@/lib/email/intake";-import { readSesTrace } from "@/lib/email/provider-trace";+import { readHeaderMap, readSesTrace } from "@/lib/email/provider-trace";import type { ProviderVerdicts } from "@/lib/spam/types";export const MAX_PROVIDER_MESSAGE_BYTES = 25 * 1024 * 1024;@@ -27,6 +27,8 @@ export async function intakeProviderMail(const verdicts = input.verdicts ?? trace.verdicts;if (verdicts?.virus?.toUpperCase() === "FAIL") return { delivered: 0, dropped: "Message failed the virus scan" };+ // Providers that give no header map (Resend) still get the plain headers read from the message.+ const headers = input.headers ?? readHeaderMap(input.raw);const db = getDb(env);let delivered = 0;for (const recipient of [...new Set(input.recipients.map(normalizeEmailAddress).filter(Boolean))]) {@@ -35,7 +37,7 @@ export async function intakeProviderMail(if (!domain) continue;const result = await intakeIncomingMail(env,- { from: normalizeEmailAddress(input.from), to: recipient, raw: input.raw, headers: input.headers ?? {}, verdicts, senderIp: trace.senderIp },+ { from: normalizeEmailAddress(input.from), to: recipient, raw: input.raw, headers, verdicts, senderIp: trace.senderIp },{ forward: async () => false },);if (result.action === "store") delivered += 1;diff --git a/src/lib/email/provider-trace.ts b/src/lib/email/provider-trace.tsindex 7aa1fc6..b6085a6 100644--- a/src/lib/email/provider-trace.ts+++ b/src/lib/email/provider-trace.ts@@ -51,3 +51,23 @@ export function readSesTrace(raw: ArrayBuffer): ProviderTrace {const senderIp = received ? extractSenderIp({ received }) ?? undefined : undefined;return { verdicts: Object.keys(verdicts).length ? verdicts : undefined, senderIp };}++/** Headers a provider has not vouched for: nothing the sender wrote here may count as authentication. */+const UNTRUSTED_PROVIDER_HEADERS = new Set(["authentication-results", "received-spf", "arc-authentication-results", "received", "return-path", "x-ses-receipt", "x-ses-spam-verdict", "x-ses-virus-verdict", "x-ses-dkim-signature"]);+const MAX_HEADER_ENTRIES = 200;+const MAX_HEADER_VALUE = 2000;++/**+ * A bounded header map (lower-case names, first value wins) for providers that do not hand one over,+ * so auto-reply suppression and spam analysis can see Auto-Submitted, Precedence, List-Id and similar.+ */+export function readHeaderMap(raw: ArrayBuffer): Record<string, string> {+ const map: Record<string, string> = {};+ let count = 0;+ for (const header of readHeaderLines(raw)) {+ if (UNTRUSTED_PROVIDER_HEADERS.has(header.name) || header.name in map) continue;+ map[header.name] = header.value.slice(0, MAX_HEADER_VALUE);+ if (++count >= MAX_HEADER_ENTRIES) break;+ }+ return map;+}