Email for professionals and teams
Update loading remote content #125
Hieu Nguyen (Jack)baabe856ba0a
diff --git a/drizzle/migrations/0062_add_remote_content_settings.sql b/drizzle/migrations/0062_add_remote_content_settings.sqlnew file mode 100644index 0000000..0597b1e--- /dev/null+++ b/drizzle/migrations/0062_add_remote_content_settings.sql@@ -0,0 +1,2 @@+ALTER TABLE `users` ADD `remote_content_mode` text DEFAULT 'allow' NOT NULL;--> statement-breakpoint+ALTER TABLE `contacts` ADD `remote_content_allowed` integer DEFAULT false NOT NULL;diff --git a/drizzle/migrations/meta/_journal.json b/drizzle/migrations/meta/_journal.jsonindex a227b8e..365e49f 100644--- a/drizzle/migrations/meta/_journal.json+++ b/drizzle/migrations/meta/_journal.json@@ -379,6 +379,13 @@"when": 1788850802023,"tag": "0061_add_message_reply_to","breakpoints": true+ },+ {+ "idx": 54,+ "version": "6",+ "when": 1788850803023,+ "tag": "0062_add_remote_content_settings",+ "breakpoints": true}]}diff --git a/src/app/(dashboard)/inbox/[messageId]/page.tsx b/src/app/(dashboard)/inbox/[messageId]/page.tsxindex 5868ad4..e2d7804 100644--- a/src/app/(dashboard)/inbox/[messageId]/page.tsx+++ b/src/app/(dashboard)/inbox/[messageId]/page.tsx@@ -40,6 +40,8 @@ import {} from "./utils";import { extractCloudAttachments } from "./cloud-attachment-utils";import { EmailHtmlRenderer } from "@/components/messages/email-html-renderer";+import { getEmailAddress } from "@/lib/email/address";+import { useRemoteContent } from "@/components/messages/use-remote-content";import clsx from "clsx";import { useAssistantOpen } from "@/components/agent/assistant-open-state";import { useMessageContentScroll } from "./use-message-content-scroll";@@ -57,6 +59,10 @@ export default function MessageDetailPage() {const [detailsOpen, setDetailsOpen] = useState(false);const [latestMessagesFirst] = useLatestMessagesFirst();const { enabled: showFullRecipientAddresses } = useShowFullRecipientAddresses();+ const remote = useRemoteContent(+ data?.message ? getEmailAddress(data.message.fromAddr) : undefined,+ data?.message?.status === "spam",+ );const { visible: messageListVisible } = useMessageListVisibility();usePageLoading(loading);const thread = useMessageThread(messageId, data?.message?.threadId);@@ -293,13 +299,13 @@ export default function MessageDetailPage() {{scheduledAt && <div className="px-4 sm:px-0 sm:pl-10"><ScheduledSendBanner messageId={message.id} scheduledAt={scheduledAt} /></div>}<div className="prose max-w-none px-4 text-neutral-900 sm:px-0 sm:pl-16">{htmlBody ? (- <EmailHtmlRenderer key={message.id} className="mx-auto" html={htmlBody} />+ <EmailHtmlRenderer key={message.id} className="mx-auto" html={htmlBody} autoAllowRemote={remote.autoAllow} onAllowRemote={remote.allowSender} />) : (<pre className="whitespace-pre-wrap text-sm text mx-auto">{cloudAttachmentResult.content}</pre>)}- {quotedHtml && <QuotedEmailToggle html={quotedHtml} />}+ {quotedHtml && <QuotedEmailToggle html={quotedHtml} autoAllowRemote={remote.autoAllow} onAllowRemote={remote.allowSender} />}{bodyDisplay.quotedContent.map((quotedContent) => (<PreviousMessagekey={`${quotedContent.dateLine}-${quotedContent.content.slice(0, 24)}`}diff --git a/src/app/(settings)/settings/inbox/page.tsx b/src/app/(settings)/settings/inbox/page.tsxindex 1b4bac2..5bd6d4b 100644--- a/src/app/(settings)/settings/inbox/page.tsx+++ b/src/app/(settings)/settings/inbox/page.tsx@@ -1,6 +1,7 @@import { getServerTranslator } from "@/lib/i18n/server";import { AppearanceSettings } from "@/components/settings/appearance-settings";import { InboxThreadingSettings } from "@/components/settings/inbox-threading-settings";+import { RemoteContentSettings } from "@/components/settings/remote-content-settings";import { RecipientAddressSettings } from "@/components/settings/recipient-address-settings";import { InboxReadingLayoutSettings } from "@/components/settings/inbox-reading-layout-settings";import { InboxShortcutsSettings } from "@/components/settings/inbox-shortcuts-settings";@@ -81,6 +82,13 @@ export default async function SettingsInboxPage() {</div><SpamFilterSettings /></div>+ <div className="py-6 first:pt-0 last:pb-0">+ <div className="mb-4">+ <h3 className="text-base font-semibold text-neutral-900">{t("settingsPage.inbox.remoteContent")}</h3>+ <p className="mt-1 text-sm text-neutral-500">{t("settingsPage.inbox.remoteContentDescription")}</p>+ </div>+ <RemoteContentSettings />+ </div><div className="py-6 first:pt-0 last:pb-0"><div className="mb-4"><h3 className="text-base font-semibold text-neutral-900">{t("settingsPage.inbox.cleanup")}</h3>diff --git a/src/app/api/settings/remote-content/route.ts b/src/app/api/settings/remote-content/route.tsnew file mode 100644index 0000000..1858aa6--- /dev/null+++ b/src/app/api/settings/remote-content/route.ts@@ -0,0 +1,63 @@+import { and, eq } from "drizzle-orm";+import { NextResponse } from "next/server";+import { ZodError } from "zod";+import { getDb } from "@/db";+import { contacts, users } from "@/db/schema";+import { requireSessionUser } from "@/lib/api/auth";+import { getEnv } from "@/lib/cloudflare";+import { getContactId } from "@/lib/contacts/utils";+import { trustRemoteContentSenderSchema, updateRemoteContentSettingsSchema } from "@/lib/validators";++// `?sender=` also reports whether the user has already allowed remote content from that address.+export async function GET(request: Request) {+ const env = getEnv();+ const auth = await requireSessionUser(env, request);+ if (auth.error) return auth.error;+ const mode = auth.user.remoteContentMode;+ const sender = new URL(request.url).searchParams.get("sender")?.trim().toLowerCase();+ if (!sender || mode !== "new_sender") return NextResponse.json({ mode });+ const [contact] = await getDb(env)+ .select({ allowed: contacts.remoteContentAllowed, source: contacts.source })+ .from(contacts)+ .where(and(eq(contacts.userId, auth.user.id), eq(contacts.email, sender)))+ .limit(1);+ // Someone the user has written to or added is not a new sender.+ const known = !!contact && (contact.allowed || contact.source !== "inbound");+ return NextResponse.json({ mode, senderAllowed: known });+}++export async function PATCH(request: Request) {+ const env = getEnv();+ const auth = await requireSessionUser(env, request);+ if (auth.error) return auth.error;++ let mode;+ try {+ ({ mode } = updateRemoteContentSettingsSchema.parse(await request.json()));+ } catch (error) {+ return NextResponse.json({ error: error instanceof ZodError ? error.flatten() : "Invalid request" }, { status: 400 });+ }++ await getDb(env).update(users).set({ remoteContentMode: mode }).where(eq(users.id, auth.user.id));+ return NextResponse.json({ mode });+}++// Remembers that the user allowed remote content from this sender.+export async function POST(request: Request) {+ const env = getEnv();+ const auth = await requireSessionUser(env, request);+ if (auth.error) return auth.error;++ let sender: string;+ try {+ ({ sender } = trustRemoteContentSenderSchema.parse(await request.json()));+ } catch (error) {+ return NextResponse.json({ error: error instanceof ZodError ? error.flatten() : "Invalid request" }, { status: 400 });+ }++ await getDb(env)+ .insert(contacts)+ .values({ id: getContactId(auth.user.id, sender), userId: auth.user.id, email: sender, source: "inbound", remoteContentAllowed: true })+ .onConflictDoUpdate({ target: [contacts.userId, contacts.email], set: { remoteContentAllowed: true } });+ return NextResponse.json({ senderAllowed: true });+}diff --git a/src/components/messages/conversation-thread.tsx b/src/components/messages/conversation-thread.tsxindex 8cef679..03c6dd3 100644--- a/src/components/messages/conversation-thread.tsx+++ b/src/components/messages/conversation-thread.tsx@@ -7,6 +7,7 @@ import { ContactAvatar } from "@/components/contacts/contact-avatar";import { QuotedEmailToggle } from "@/components/messages/quoted-email-toggle";import { runSingleMessageAction } from "@/components/message-actions/utils";import { EmailHtmlRenderer } from "./email-html-renderer";+import { useRemoteContent } from "./use-remote-content";import { getMessageBodyDisplay, resolveInlineAttachmentUrls } from "@/app/(dashboard)/inbox/[messageId]/utils";import { useLanguage } from "@/components/language-provider";@@ -127,6 +128,7 @@ export function ConversationMessageCard({const expanded = locallyExpanded;const sender = getConversationSender(message, currentAccountName);const senderEmail = getConversationSenderEmail(message);+ const remote = useRemoteContent(senderEmail, message.status === "spam");const recipients = getConversationRecipients(message, showFullRecipientAddresses ? "full" : "address");// const href = `${getMessageBackHref(message.direction, message.status)}/${message.id}`;const outbound = message.direction === "outbound";@@ -214,11 +216,11 @@ export function ConversationMessageCard({{expanded && body && (<div className="pb-4 pt-2 sm:pl-16">{body.html ? (- <EmailHtmlRenderer html={body.html} />+ <EmailHtmlRenderer html={body.html} autoAllowRemote={remote.autoAllow} onAllowRemote={remote.allowSender} />) : (<pre className="whitespace-pre-wrap font-sans text-sm text-neutral-900">{body.text}</pre>)}- {body.quotedHtml && <QuotedEmailToggle html={body.quotedHtml} />}+ {body.quotedHtml && <QuotedEmailToggle html={body.quotedHtml} autoAllowRemote={remote.autoAllow} onAllowRemote={remote.allowSender} />}{attachments.length > 0 && (<ul className="mt-4 flex flex-wrap gap-2">{attachments.map((attachment) => (diff --git a/src/components/messages/email-html-renderer.tsx b/src/components/messages/email-html-renderer.tsxindex e89c3e1..8892d91 100644--- a/src/components/messages/email-html-renderer.tsx+++ b/src/components/messages/email-html-renderer.tsx@@ -16,15 +16,19 @@ const BASE_STYLE = `.email-quote-content { display:flow-root; }`;-export function EmailHtmlRenderer({ html, className, preserveLeadingQuote = false }: {+export function EmailHtmlRenderer({ html, className, preserveLeadingQuote = false, autoAllowRemote = false, onAllowRemote }: {html: string; className?: string; preserveLeadingQuote?: boolean;+ /** Load remote content without a click; the reader can still block it. */+ autoAllowRemote?: boolean;+ /** Called when the reader chooses to load remote content. */+ onAllowRemote?: () => void;}) {const { t } = useLanguage();const quoteToggleLabel = t("message.quote.toggle");const host = useRef<HTMLDivElement>(null);- const [allowedSource, setAllowedSource] = useState<string | null>(null);+ const [choice, setChoice] = useState<{ source: string; allow: boolean } | null>(null);const [hasRemote, setHasRemote] = useState(false);- const allowRemote = allowedSource === html;+ const allowRemote = choice?.source === html ? choice.allow : autoAllowRemote;// Mail is authored for white paper. Under the dark theme it is inverted// (images inverted back) instead of glaring as a white slab.useEffect(() => {@@ -68,7 +72,10 @@ export function EmailHtmlRenderer({ html, className, preserveLeadingQuote = falsreturn <div className={`min-w-0 max-w-full ${className ?? ""}`}>{hasRemote && <div className="mb-2 flex justify-end"><button type="button" aria-pressed={allowRemote} className="rounded px-2 py-1 text-xs text-blue-600 hover:bg-blue-50"- onClick={() => setAllowedSource(allowRemote ? null : html)}>+ onClick={() => {+ if (!allowRemote) onAllowRemote?.();+ setChoice({ source: html, allow: !allowRemote });+ }}>{allowRemote ? t("message.blockRemote") : t("message.allowRemote")}</button></div>}diff --git a/src/components/messages/quoted-email-toggle-types.d.ts b/src/components/messages/quoted-email-toggle-types.d.tsindex 284e957..0627b4e 100644--- a/src/components/messages/quoted-email-toggle-types.d.ts+++ b/src/components/messages/quoted-email-toggle-types.d.ts@@ -1,3 +1,5 @@export type QuotedEmailToggleProps = {html: string;+ autoAllowRemote?: boolean;+ onAllowRemote?: () => void;};diff --git a/src/components/messages/quoted-email-toggle.tsx b/src/components/messages/quoted-email-toggle.tsxindex 71d3b94..540e77d 100644--- a/src/components/messages/quoted-email-toggle.tsx+++ b/src/components/messages/quoted-email-toggle.tsx@@ -2,12 +2,12 @@ import { useLanguage } from "@/components/language-provider";import type { QuotedEmailToggleProps } from "./quoted-email-toggle-types";import { EmailHtmlRenderer } from "./email-html-renderer";-export function QuotedEmailToggle({ html }: QuotedEmailToggleProps) {+export function QuotedEmailToggle({ html, autoAllowRemote, onAllowRemote }: QuotedEmailToggleProps) {const { t } = useLanguage();return (<details className="email-quote-toggle"><summary aria-label={t("message.quote.toggle")} title={t("message.quote.title")} />- <EmailHtmlRenderer html={html} preserveLeadingQuote />+ <EmailHtmlRenderer html={html} preserveLeadingQuote autoAllowRemote={autoAllowRemote} onAllowRemote={onAllowRemote} /></details>);}diff --git a/src/components/messages/use-remote-content-utils.ts b/src/components/messages/use-remote-content-utils.tsnew file mode 100644index 0000000..0e7fc6c--- /dev/null+++ b/src/components/messages/use-remote-content-utils.ts@@ -0,0 +1,51 @@+import { authFetch } from "@/lib/auth/client";++export type RemoteContentMode = "ask" | "new_sender" | "allow";++export type RemoteContentPolicy = {+ mode: RemoteContentMode;+ /** Only reported for `new_sender`, and only when a sender was asked about. */+ senderAllowed?: boolean;+};++export const REMOTE_CONTENT_CHANGE_EVENT = "mailflare:remote-content-changed";++const ENDPOINT = "/api/settings/remote-content";++/** Spam never loads remote content on its own, whatever the setting. */+export function shouldAutoLoadRemote(policy: RemoteContentPolicy | null, spam: boolean): boolean {+ if (!policy || spam) return false;+ if (policy.mode === "allow") return true;+ return policy.mode === "new_sender" && policy.senderAllowed === true;+}++async function readPolicy(response: Response, fallback: string): Promise<RemoteContentPolicy> {+ const data = (await response.json()) as Partial<RemoteContentPolicy> & { error?: string };+ if (!response.ok || !data.mode) throw new Error(typeof data.error === "string" ? data.error : fallback);+ return { mode: data.mode, senderAllowed: data.senderAllowed };+}++export async function loadRemoteContentPolicy(sender?: string): Promise<RemoteContentPolicy> {+ const query = sender ? `?sender=${encodeURIComponent(sender)}` : "";+ return readPolicy(await authFetch(`${ENDPOINT}${query}`), "Failed to load remote content settings");+}++export async function updateRemoteContentMode(mode: RemoteContentMode): Promise<RemoteContentMode> {+ const response = await authFetch(ENDPOINT, {+ method: "PATCH",+ headers: { "Content-Type": "application/json" },+ body: JSON.stringify({ mode }),+ });+ const updated = await readPolicy(response, "Failed to update remote content settings");+ window.dispatchEvent(new Event(REMOTE_CONTENT_CHANGE_EVENT));+ return updated.mode;+}++export async function allowRemoteContentFromSender(sender: string): Promise<void> {+ const response = await authFetch(ENDPOINT, {+ method: "POST",+ headers: { "Content-Type": "application/json" },+ body: JSON.stringify({ sender }),+ });+ if (!response.ok) throw new Error("Failed to remember sender");+}diff --git a/src/components/messages/use-remote-content.ts b/src/components/messages/use-remote-content.tsnew file mode 100644index 0000000..46d8085--- /dev/null+++ b/src/components/messages/use-remote-content.ts@@ -0,0 +1,42 @@+"use client";++import { useCallback, useEffect, useState } from "react";+import {+ REMOTE_CONTENT_CHANGE_EVENT,+ allowRemoteContentFromSender,+ loadRemoteContentPolicy,+ shouldAutoLoadRemote,+ type RemoteContentPolicy,+} from "./use-remote-content-utils";++/**+ * Whether a message's remote content loads without a click, per the user's+ * setting. `allowSender` remembers a sender once the user allows their content.+ * Nothing loads until the setting has been read.+ */+export function useRemoteContent(sender: string | undefined, spam: boolean) {+ const [policy, setPolicy] = useState<RemoteContentPolicy | null>(null);+ const address = sender?.trim().toLowerCase();++ useEffect(() => {+ let cancelled = false;+ const load = () => {+ loadRemoteContentPolicy(address)+ .then((loaded) => { if (!cancelled) setPolicy(loaded); })+ .catch(() => { if (!cancelled) setPolicy(null); });+ };+ load();+ window.addEventListener(REMOTE_CONTENT_CHANGE_EVENT, load);+ return () => {+ cancelled = true;+ window.removeEventListener(REMOTE_CONTENT_CHANGE_EVENT, load);+ };+ }, [address]);++ const allowSender = useCallback(() => {+ if (!address || spam || policy?.mode !== "new_sender") return;+ void allowRemoteContentFromSender(address).catch(() => undefined);+ }, [address, spam, policy?.mode]);++ return { autoAllow: shouldAutoLoadRemote(policy, spam), allowSender };+}diff --git a/src/components/settings/remote-content-settings.tsx b/src/components/settings/remote-content-settings.tsxnew file mode 100644index 0000000..cd3c1dd--- /dev/null+++ b/src/components/settings/remote-content-settings.tsx@@ -0,0 +1,67 @@+"use client";++import { useEffect, useState } from "react";+import { useLanguage } from "@/components/language-provider";+import {+ loadRemoteContentPolicy,+ updateRemoteContentMode,+ type RemoteContentMode,+} from "@/components/messages/use-remote-content-utils";++const OPTIONS = [+ { mode: "ask", title: "settings.remoteContent.ask" },+ { mode: "new_sender", title: "settings.remoteContent.newSender" },+ { mode: "allow", title: "settings.remoteContent.allow" },+] as const;++export function RemoteContentSettings() {+ const { t } = useLanguage();+ const [mode, setMode] = useState<RemoteContentMode>("allow");+ const [loading, setLoading] = useState(true);+ const [saving, setSaving] = useState(false);+ const [error, setError] = useState<string | null>(null);++ useEffect(() => {+ let cancelled = false;+ loadRemoteContentPolicy()+ .then((policy) => { if (!cancelled) setMode(policy.mode); })+ .catch((loadError) => { if (!cancelled) setError(loadError instanceof Error ? loadError.message : t("settings.remoteContent.failed")); })+ .finally(() => { if (!cancelled) setLoading(false); });+ return () => { cancelled = true; };+ // eslint-disable-next-line react-hooks/exhaustive-deps+ }, []);++ const choose = (next: RemoteContentMode) => {+ const previous = mode;+ setMode(next);+ setSaving(true);+ setError(null);+ updateRemoteContentMode(next)+ .then(setMode)+ .catch((updateError) => {+ setMode(previous);+ setError(updateError instanceof Error ? updateError.message : t("settings.remoteContent.failed"));+ })+ .finally(() => setSaving(false));+ };++ return (+ <div>+ <div role="radiogroup" aria-label={t("settingsPage.inbox.remoteContent")} className="space-y-3">+ {OPTIONS.map((option) => (+ <label key={option.mode} className="flex cursor-pointer items-center gap-3 rounded-xl bg-neutral-50 p-4">+ <input+ type="radio"+ name="remote-content-mode"+ checked={mode === option.mode}+ disabled={loading || saving}+ onChange={() => choose(option.mode)}+ />+ <span className="flex-1 text-sm font-medium text-neutral-900">{t(option.title)}</span>+ </label>+ ))}+ </div>+ {error && <p role="alert" className="mt-2 px-4 text-sm text-red-600">{error}</p>}+ </div>+ );+}diff --git a/src/db/schema/index.ts b/src/db/schema/index.tsindex 3a7faf5..66d2c6b 100644--- a/src/db/schema/index.ts+++ b/src/db/schema/index.ts@@ -27,6 +27,8 @@ export const users = sqliteTable("users", {trashRetentionDays: integer("trash_retention_days"),// Off shows the mailbox only. On shows Name <mailbox> on To, Cc, and Bcc.showFullRecipientAddresses: integer("show_full_recipient_addresses", { mode: "boolean" }).notNull().default(false),+ // When the reader loads remote images and styles without being asked: always ask, only for senders not yet allowed, or always.+ remoteContentMode: text("remote_content_mode", { enum: ["ask", "new_sender", "allow"] }).notNull().default("allow"),// TOTP second factor. The secret is written at enrolment and only counts// once the user has proven a code from their authenticator.totpSecret: text("totp_secret"),@@ -170,6 +172,8 @@ export const contacts = sqliteTable(.notNull().default("inbound"),blocked: integer("blocked", { mode: "boolean" }).notNull().default(false),+ // Set when the user allows remote content from this sender; "new_sender" mode loads it without asking afterwards.+ remoteContentAllowed: integer("remote_content_allowed", { mode: "boolean" }).notNull().default(false),lastSeenAt: integer("last_seen_at", { mode: "timestamp" }),createdAt: integer("created_at", { mode: "timestamp" }).notNull()diff --git a/src/lib/auth/types.d.ts b/src/lib/auth/types.d.tsindex 2e62f60..49cfaba 100644--- a/src/lib/auth/types.d.ts+++ b/src/lib/auth/types.d.ts@@ -18,6 +18,7 @@ export type SessionUser = {spamProtectionEnabled: boolean;trashRetentionDays: number | null;showFullRecipientAddresses: boolean;+ remoteContentMode: "ask" | "new_sender" | "allow";createdByUserId: string | null;createdAt: Date;};diff --git a/src/lib/i18n/en.json b/src/lib/i18n/en.jsonindex d579f54..e7e31ab 100644--- a/src/lib/i18n/en.json+++ b/src/lib/i18n/en.json@@ -606,6 +606,10 @@"settings.recipient.title": "Show full recipient addresses","settings.recipient.description": "On To, Cc, and Bcc, show Name <[email protected]> when the message includes a name. Off shows only the email address. This follows your sign-in, on every mailbox.","settings.recipient.failed": "Failed to update recipient address settings",+ "settings.remoteContent.ask": "Always ask for permission",+ "settings.remoteContent.newSender": "Ask permission for new senders",+ "settings.remoteContent.allow": "Allow content",+ "settings.remoteContent.failed": "Failed to update remote content settings","mcp.instructions": "Instructions for your AI agent","mcp.copyPrompt": "Copy prompt","rules.field.email": "Email address",@@ -711,6 +715,8 @@"settingsPage.inbox.handlingDescription": "Manage spam protection, clean-up and automatic replies.","settingsPage.inbox.spamProtection": "Spam protection","settingsPage.inbox.spamProtectionDescription": "Control local spam analysis for incoming messages.",+ "settingsPage.inbox.remoteContent": "Remote content",+ "settingsPage.inbox.remoteContentDescription": "Choose when messages may load remote images and styles. Loading them tells the sender you opened the message. Spam always asks first.","settingsPage.inbox.cleanup": "Trash and Spam clean-up","settingsPage.inbox.cleanupDescription": "Choose how long deleted and spam messages are kept.","settingsPage.inbox.autoReply": "Automatic response",diff --git a/src/lib/validators.ts b/src/lib/validators.tsindex 77bd4a6..801b876 100644--- a/src/lib/validators.ts+++ b/src/lib/validators.ts@@ -239,6 +239,14 @@ export const updateTrashRetentionSettingsSchema = z.object({days: z.number().int().min(1).max(365).nullable(),});+export const updateRemoteContentSettingsSchema = z.object({+ mode: z.enum(["ask", "new_sender", "allow"]),+});++export const trustRemoteContentSenderSchema = z.object({+ sender: z.string().trim().toLowerCase().email().max(320),+});+export const updateRecipientAddressSettingsSchema = z.object({enabled: z.boolean(),});