proton-mail-bridge-client 2.9.0 → 2.10.0

package/dist/index.js

@@ -3642,8 +3642,9 @@ function validatePortEnv(name) {
         throw new Error(`${name} must be an integer between 1 and 65535, got: ${raw}`);
     }
 }
-// One switch for the safety flags. A mode only sets the starting point: any of the individual variables that is set
-// explicitly still wins, so a mode never takes a setting away that someone chose on purpose.
+// One switch for the safety flags. A mode is a floor: the individual variables can make things stricter, never
+// looser. The Claude Desktop bundle always sends read-only and allow-sending explicitly, so a mode that an explicit
+// value could loosen would be ignored for exactly the people who pick it there.
 const SAFETY_MODES = {
     // Browse and search only: nothing is written, nothing is sent.
     "read-only": { readOnly: true },
@@ -3655,7 +3656,8 @@ const SAFETY_MODES = {
 };
 function parseSafetyModeEnv(name) {
     const raw = process.env[name]?.trim().toLowerCase();
-    if (!raw) {
+    // An unfilled "${user_config.mode}" from a host that did not substitute it is "not set", not a typo to fail on.
+    if (!raw || raw.startsWith("${")) {
         return undefined;
     }
     if (Object.hasOwn(SAFETY_MODES, raw)) {
@@ -3663,10 +3665,10 @@ function parseSafetyModeEnv(name) {
     }
     throw new Error(`${name} must be one of: ${Object.keys(SAFETY_MODES).join(", ")} (got "${raw}").`);
 }
-function parseAllowedActionsEnv(name, fallback = ALL_EMAIL_ACTIONS) {
+function parseAllowedActionsEnv(name) {
     const configured = parseListValues(process.env[name]);
     if (configured.length === 0) {
-        return [...fallback];
+        return [...ALL_EMAIL_ACTIONS];
     }
     const allowed = configured.filter((value) => ALL_EMAIL_ACTIONS.includes(value));
     if (allowed.length === 0) {
@@ -3780,14 +3782,14 @@ export function buildConfigFromEnv() {
     const debug = parseBooleanEnv("DEBUG", false);
     const mode = parseSafetyModeEnv("PROTONMAIL_MODE");
     const preset = mode ? SAFETY_MODES[mode] : {};
-    const readOnly = parseBooleanEnv("PROTONMAIL_READ_ONLY", preset.readOnly ?? false);
-    const allowSend = parseBooleanEnv("PROTONMAIL_ALLOW_SEND", preset.allowSend ?? !readOnly);
+    const readOnly = (preset.readOnly ?? false) || parseBooleanEnv("PROTONMAIL_READ_ONLY", false);
+    const allowSend = (preset.allowSend ?? true) && parseBooleanEnv("PROTONMAIL_ALLOW_SEND", !readOnly);
     const allowRemoteDraftSync = parseBooleanEnv("PROTONMAIL_ALLOW_REMOTE_DRAFT_SYNC", !readOnly);
     const autoSync = parseBooleanEnv("PROTONMAIL_AUTO_SYNC", true);
     const syncInterval = parseIntegerEnv("PROTONMAIL_SYNC_INTERVAL_MINUTES", 5, 1, 24 * 60);
     const idleWatchEnabled = parseBooleanEnv("PROTONMAIL_IDLE_WATCH", autoSync);
     const idleMaxSeconds = parseIntegerEnv("PROTONMAIL_IDLE_MAX_SECONDS", 30, 5, 300);
-    const confirmDestructive = parseBooleanEnv("PROTONMAIL_CONFIRM_DESTRUCTIVE", preset.confirmDestructive ?? false);
+    const confirmDestructive = (preset.confirmDestructive ?? false) || parseBooleanEnv("PROTONMAIL_CONFIRM_DESTRUCTIVE", false);
     const allowEmptyFolder = parseBooleanEnv("PROTONMAIL_ALLOW_EMPTY_FOLDER", false);
     const restrictOutboundToSelf = parseBooleanEnv("PROTONMAIL_RESTRICT_OUTBOUND_TO_SELF", false);
     const allowFileDownloadDir = process.env.PROTONMAIL_ALLOW_FILE_DOWNLOAD_DIR?.trim() || undefined;
@@ -3836,7 +3838,7 @@ export function buildConfigFromEnv() {
             readOnly,
             allowSend,
             allowRemoteDraftSync,
-            allowedActions: parseAllowedActionsEnv("PROTONMAIL_ALLOWED_ACTIONS", preset.allowedActions),
+            allowedActions: parseAllowedActionsEnv("PROTONMAIL_ALLOWED_ACTIONS").filter((action) => !preset.allowedActions || preset.allowedActions.includes(action)),
             startupSync: parseBooleanEnv("PROTONMAIL_STARTUP_SYNC", autoSync),
             // Comma-separated; Sent is included by default so pendingOn/digest/follow-up
             // candidates don't misreport threads that were already answered — IDLE still