proton-mail-bridge-client 2.1.38 → 2.1.40

package/dist/index.d.ts

@@ -137,6 +137,7 @@ export declare function createServer(config: ProtonMailConfig, options?: {
     deliveryQueueService: import("./services/delivery-queue-service.js").DeliveryQueueService;
     snoozeService: import("./services/snooze-service.js").SnoozeService;
     auditService: AuditService;
+    accountManager: AccountManager;
 };
 export declare function main(): Promise<void>;
 export {};

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}

package/dist/index.js

@@ -3763,15 +3763,10 @@ export function createServer(config, options = {}) {
                     }
                     // dryRun: preview without sending
                     const dryRunSend = normalizeBoolean(args.dryRun, false);
-                    // RESTRICT_OUTBOUND_TO_SELF check
-                    if (config.runtime.restrictOutboundToSelf) {
-                        const selfAddr = config.smtp.username.toLowerCase();
-                        const allR = [...to, ...(cc ?? []), ...(bcc ?? [])];
-                        const ext = allR.filter(r => r.toLowerCase() !== selfAddr);
-                        if (ext.length > 0) {
-                            throw new McpError(ErrorCode.InvalidParams, `RESTRICT_OUTBOUND_TO_SELF is enabled. Cannot send to: ${ext.join(", ")}`);
-                        }
-                    }
+                    // RESTRICT_OUTBOUND_TO_SELF check — shared helper so a self-send to
+                    // "you+tag@..." isn't wrongly rejected (see its comment in runtime-policy.ts).
+                    // `from`'s own account (if any) is the correct "self" for a multi-account send.
+                    ensureOutboundRecipientsAllowed(config.runtime, (from ? accountManager.byAddress(from)?.config.smtp.username : undefined) ?? config.smtp.username, [...to, ...(cc ?? []), ...(bcc ?? [])]);
                     if (dryRunSend) {
                         return createTextResult({ dryRun: true, wouldSendTo: { to, cc: cc ?? [], bcc: bcc ?? [] }, subject, note: "No email was sent." });
                     }
@@ -3847,6 +3842,9 @@ export function createServer(config, options = {}) {
                     });
                 }
                 case "cancel_send": {
+                    // Zero policy gate: canceling a queued send mutates local delivery-queue
+                    // state, but nothing here ever checked read-only mode.
+                    ensureMailboxWriteAllowed(config.runtime);
                     // The queue id carries an account-slug prefix when the item was enqueued
                     // through a non-primary account (see send_email/schedule_draft) — resolve
                     // it back to that account's own deliveryQueueService, same as an
@@ -4002,14 +4000,9 @@ export function createServer(config, options = {}) {
                     const replyHtmlBody = includeQuoteReply && signedReply.htmlBody !== undefined
                         ? buildReplyHtml(detail, signedReply.htmlBody)
                         : signedReply.htmlBody;
-                    if (config.runtime.restrictOutboundToSelf) {
-                        const selfAddr = config.smtp.username.toLowerCase();
-                        const allR = [...to, ...cc, ...extraBcc];
-                        const ext = allR.filter(r => r.toLowerCase() !== selfAddr);
-                        if (ext.length > 0) {
-                            throw new McpError(ErrorCode.InvalidParams, `RESTRICT_OUTBOUND_TO_SELF is enabled. Cannot send to: ${ext.join(", ")}`);
-                        }
-                    }
+                    // Shared helper, and the sending account's own address as "self" —
+                    // see send_email's comment.
+                    ensureOutboundRecipientsAllowed(config.runtime, sendBundleForReply.config.smtp.username, [...to, ...cc, ...extraBcc]);
                     if (dryRunReply) {
                         return createTextResult({ dryRun: true, wouldSendTo: { to, cc, bcc: extraBcc }, subject: prefixedSubject(detail.subject, "Re:"), note: "No email was sent." }, false, [emailSource({ ...detail, id: prefixedIdFor(readBundleReply, detail.id) })]);
                     }
@@ -4087,14 +4080,9 @@ export function createServer(config, options = {}) {
                         throw new McpError(ErrorCode.InvalidParams, "Unable to infer reply recipients.");
                     }
                     const dryRunRa = normalizeBoolean(args.dryRun, false);
-                    if (config.runtime.restrictOutboundToSelf) {
-                        const selfAddr = config.smtp.username.toLowerCase();
-                        const allR = [...toRa, ...ccRa, ...extraBccRa];
-                        const ext = allR.filter(r => r.toLowerCase() !== selfAddr);
-                        if (ext.length > 0) {
-                            throw new McpError(ErrorCode.InvalidParams, `RESTRICT_OUTBOUND_TO_SELF is enabled. Cannot send to: ${ext.join(", ")}`);
-                        }
-                    }
+                    // Shared helper, and the sending account's own address as "self" —
+                    // see send_email's comment.
+                    ensureOutboundRecipientsAllowed(config.runtime, sendBundleForRa.config.smtp.username, [...toRa, ...ccRa, ...extraBccRa]);
                     if (dryRunRa) {
                         return createTextResult({ dryRun: true, wouldSendTo: { to: toRa, cc: ccRa, bcc: extraBccRa }, subject: prefixedSubject(detailRa.subject, "Re:"), note: "No email was sent." });
                     }
@@ -4189,14 +4177,9 @@ export function createServer(config, options = {}) {
                     ensureValidEmails(cc, "cc");
                     ensureValidEmails(bcc, "bcc");
                     const dryRunFwd = normalizeBoolean(args.dryRun, false);
-                    if (config.runtime.restrictOutboundToSelf) {
-                        const selfAddr = config.smtp.username.toLowerCase();
-                        const allR = [...to, ...cc, ...bcc];
-                        const ext = allR.filter(r => r.toLowerCase() !== selfAddr);
-                        if (ext.length > 0) {
-                            throw new McpError(ErrorCode.InvalidParams, `RESTRICT_OUTBOUND_TO_SELF is enabled. Cannot send to: ${ext.join(", ")}`);
-                        }
-                    }
+                    // Shared helper, and the sending account's own address as "self" —
+                    // see send_email's comment.
+                    ensureOutboundRecipientsAllowed(config.runtime, sendBundleForFwd.config.smtp.username, [...to, ...cc, ...bcc]);
                     if (dryRunFwd) {
                         return createTextResult({ dryRun: true, wouldSendTo: { to, cc, bcc }, subject: prefixedSubject(detail.subject, "Fwd:"), note: "No email was sent." });
                     }
@@ -4267,6 +4250,9 @@ export function createServer(config, options = {}) {
                     }, false, [emailSource({ ...detail, id: prefixedIdFor(readBundleFwd, detail.id) })]);
                 }
                 case "create_draft": {
+                    // Local draft write — was only gated on the remote-sync side, so
+                    // PROTONMAIL_READ_ONLY never actually stopped a local draft being created.
+                    ensureMailboxWriteAllowed(config.runtime);
                     const to = parseEmails(optionalString(args, "to"));
                     const cc = parseEmails(optionalString(args, "cc"));
                     const bcc = parseEmails(optionalString(args, "bcc"));
@@ -4338,6 +4324,8 @@ export function createServer(config, options = {}) {
                     ]);
                 }
                 case "create_reply_draft": {
+                    // Local draft write — same gap as create_draft, see its comment.
+                    ensureMailboxWriteAllowed(config.runtime);
                     // emailId carries the same "<slug>::" account prefix as everywhere else —
                     // this previously always read via the PRIMARY account's imapService
                     // regardless of that prefix, so replying to a non-primary account's email
@@ -4422,6 +4410,8 @@ export function createServer(config, options = {}) {
                     ]);
                 }
                 case "create_forward_draft": {
+                    // Local draft write — same gap as create_draft, see its comment.
+                    ensureMailboxWriteAllowed(config.runtime);
                     // Same emailId account resolution as create_reply_draft — see its comment.
                     const { bundle: createForwardReadBundle, rest: createForwardEmailIdRest } = resolveAccountForEmailId(requireString(args, "emailId"));
                     const detail = await createForwardReadBundle.imapService.getEmailById(createForwardEmailIdRest);
@@ -4568,6 +4558,8 @@ export function createServer(config, options = {}) {
                     ]);
                 }
                 case "update_draft": {
+                    // Local draft write — same gap as create_draft, see its comment.
+                    ensureMailboxWriteAllowed(config.runtime);
                     const { bundle: updateDraftBundle, rest: updateDraftIdRest } = resolveAccountForDraftId(requireString(args, "draftId"));
                     const to = args.to === undefined ? undefined : parseEmails(optionalString(args, "to"));
                     const cc = args.cc === undefined ? undefined : parseEmails(optionalString(args, "cc"));
@@ -4745,21 +4737,10 @@ export function createServer(config, options = {}) {
                     if (draft.replyTo && !isValidEmail(draft.replyTo)) {
                         throw new McpError(ErrorCode.InvalidParams, "replyTo must be a valid email address.");
                     }
-                    if (config.runtime.restrictOutboundToSelf) {
-                        const allRecipients = [...draft.to, ...draft.cc, ...draft.bcc];
-                        // Found live: with PROTONMAIL_IMAP_USERNAME set to a different
-                        // address than the account's send identity, this compared
-                        // recipients against the IMAP login instead — rejecting mail to
-                        // the real self as "external" (and, the other way round, would
-                        // let mail to that IMAP-only address through as if it were
-                        // self). Every other RESTRICT_OUTBOUND_TO_SELF check in this
-                        // file already uses smtp.username, since that's the identity
-                        // mail actually sends as; this was the one inconsistent copy.
-                        const selfAddr = config.smtp.username.toLowerCase();
-                        const external = allRecipients.filter(r => r.toLowerCase() !== selfAddr);
-                        if (external.length > 0)
-                            throw new McpError(ErrorCode.InvalidParams, "PROTONMAIL_RESTRICT_OUTBOUND_TO_SELF is enabled. All recipients must be the authenticated user.");
-                    }
+                    // Shared helper, and the sending account's own address as "self" —
+                    // see send_email's comment. isSelfAddress also fixes the IMAP-vs-SMTP
+                    // username mismatch the old inline check's comment warned about.
+                    ensureOutboundRecipientsAllowed(config.runtime, sendBundleForDraft.config.smtp.username, [...draft.to, ...draft.cc, ...draft.bcc]);
                     if (normalizeBoolean(args.dryRun, false)) {
                         return createTextResult({
                             dryRun: true,
@@ -4953,14 +4934,9 @@ export function createServer(config, options = {}) {
                     if (draft.replyTo && !isValidEmail(draft.replyTo)) {
                         throw new McpError(ErrorCode.InvalidParams, "replyTo must be a valid email address.");
                     }
-                    if (config.runtime.restrictOutboundToSelf) {
-                        const allRecipients = [...draft.to, ...draft.cc, ...draft.bcc];
-                        // Same fix as send_draft's identical check — see its comment.
-                        const selfAddr = config.smtp.username.toLowerCase();
-                        const external = allRecipients.filter((r) => r.toLowerCase() !== selfAddr);
-                        if (external.length > 0)
-                            throw new McpError(ErrorCode.InvalidParams, "PROTONMAIL_RESTRICT_OUTBOUND_TO_SELF is enabled. All recipients must be the authenticated user.");
-                    }
+                    // Shared helper, and the sending account's own address as "self" —
+                    // see send_draft's identical fix.
+                    ensureOutboundRecipientsAllowed(config.runtime, sendBundleForScheduleDraft.config.smtp.username, [...draft.to, ...draft.cc, ...draft.bcc]);
                     const queued = await withAudit(auditService, name, args, async () => sendBundleForScheduleDraft.deliveryQueueService.enqueue({
                         to: draft.to,
                         cc: draft.cc,
@@ -4990,6 +4966,8 @@ export function createServer(config, options = {}) {
                     });
                 }
                 case "delete_draft": {
+                    // Local draft write — same gap as create_draft, see its comment.
+                    ensureMailboxWriteAllowed(config.runtime);
                     const { bundle: deleteDraftBundle, rest: deleteDraftIdRest } = resolveAccountForDraftId(requireString(args, "draftId"));
                     const draft = await deleteDraftBundle.draftStore.getDraft(deleteDraftIdRest);
                     ensureDestructiveConfirmed(config.runtime, normalizeBoolean(args?.confirmed, false), "Permanently delete draft: " + draft.id);
@@ -5894,6 +5872,8 @@ export function createServer(config, options = {}) {
                     return createTextResult(filtered);
                 }
                 case "create_template": {
+                    // Local template write — same gap as create_draft, see its comment.
+                    ensureMailboxWriteAllowed(config.runtime);
                     const result = await withAudit(auditService, name, args, async () => templateService.create({
                         name: requireString(args, "name"),
                         subject: requireString(args, "subject"),
@@ -5911,6 +5891,8 @@ export function createServer(config, options = {}) {
                     return createTextResult(result);
                 }
                 case "delete_template": {
+                    // Local template write — same gap as create_draft, see its comment.
+                    ensureMailboxWriteAllowed(config.runtime);
                     const templateId = requireString(args, "id");
                     ensureDestructiveConfirmed(config.runtime, normalizeBoolean(args?.confirmed, false), "Permanently delete template: " + templateId);
                     const result = await withAudit(auditService, name, args, async () => templateService.delete(templateId));
@@ -7154,12 +7136,17 @@ export function createServer(config, options = {}) {
                         return createTextResult(result, false, result.saved.map((entry) => attachmentSource(result.emailId, entry.attachment)));
                     }
                 case "clear_cache":
+                    // Zero policy gate: this mutates local cache state, but nothing here
+                    // ever checked read-only mode.
+                    ensureMailboxWriteAllowed(config.runtime);
                     analyticsService.clearCache();
                     return createTextResult({
                         clearedAt: new Date().toISOString(),
                         ...imapService.clearCache(),
                     });
                 case "clear_index":
+                    // Zero policy gate — same gap as clear_cache, see its comment.
+                    ensureMailboxWriteAllowed(config.runtime);
                     return createTextResult({
                         clearedAt: new Date().toISOString(),
                         ...(await localIndexService.clear()),
@@ -7227,6 +7214,7 @@ export function createServer(config, options = {}) {
         deliveryQueueService,
         snoozeService,
         auditService,
+        accountManager,
     };
 }
 export async function main() {
@@ -7245,7 +7233,7 @@ export async function main() {
     // Explicitly chmod it too so the restriction actually takes effect on
     // upgrade, not only on a brand-new dataDir.
     await chmod(config.dataDir, 0o700).catch(() => { });
-    const { server, smtpService, imapService, backgroundSyncService, deliveryQueueService, snoozeService } = createServer(config, {
+    const { server, smtpService, imapService, backgroundSyncService, deliveryQueueService, snoozeService, accountManager } = createServer(config, {
         startBackgroundSync: true,
     });
     logger.info("Starting ProtonMail MCP server", "MCPServer");
@@ -7262,7 +7250,11 @@ export async function main() {
         backgroundSyncService.stop();
         deliveryQueueService.stop();
         snoozeService.stop();
-        await Promise.allSettled([imapService.disconnect(), smtpService.close()]);
+        await Promise.allSettled([
+            imapService.disconnect(),
+            smtpService.close(),
+            ...accountManager.all().map((bundle) => bundle.localIndexService.close()),
+        ]);
         process.exit(0);
     };
     process.on("SIGINT", () => {