proton-mail-bridge-client 2.7.1 → 2.7.3

package/dist/services/simple-imap-service.js

@@ -1161,6 +1161,7 @@ export class SimpleIMAPService {
         if (fromPath === toPath) {
             throw new Error("Source and target paths are identical.");
         }
+        await this.refuseSystemFolder(fromPath, "rename");
         const response = await this.mutateFolderWithReconnectCheck(async () => {
             const client = await this.ensureConnected();
             return client.mailboxRename(fromPath, toPath);
@@ -1191,27 +1192,30 @@ export class SimpleIMAPService {
             : undefined;
         return { path: response.path, newPath: response.newPath, folder, warning };
     }
-    async deleteFolder(path) {
-        const trimmed = path?.trim();
-        if (!trimmed) {
-            throw new Error("Folder path is required.");
-        }
-        // System folders, by name (any capitalisation, with or without surrounding slashes) and by the special-use
-        // the server itself reports. Compared on the normalised name: "inbox", "INBOX/" and "/Trash" are the same
-        // folders as "INBOX" and "Trash".
+    // System folders, by name (any capitalisation, with or without surrounding slashes) and by the special-use
+    // the server itself reports. Compared on the normalised name: "inbox", "INBOX/" and "/Trash" are the same
+    // folders as "INBOX" and "Trash".
+    async refuseSystemFolder(path, verb) {
         const reservedNames = new Set([
             "inbox", "drafts", "sent", "sent mail", "trash", "deleted messages", "spam", "junk", "archive",
             "all mail", "starred", "folders", "labels",
         ]);
-        const normalized = trimmed.replace(/^\/+|\/+$/g, "").trim().toLowerCase();
+        const normalized = path.replace(/^\/+|\/+$/g, "").trim().toLowerCase();
         if (reservedNames.has(normalized)) {
-            throw new Error(`Refusing to delete reserved system folder ${trimmed}.`);
+            throw new Error(`Refusing to ${verb} reserved system folder ${path}.`);
         }
         const known = await this.getFolders().catch(() => []);
         const target = known.find((entry) => entry.path.replace(/^\/+|\/+$/g, "").toLowerCase() === normalized);
         if (target?.specialUse) {
-            throw new Error(`Refusing to delete system folder ${trimmed} (it is the server's ${target.specialUse} folder).`);
+            throw new Error(`Refusing to ${verb} system folder ${path} (it is the server's ${target.specialUse} folder).`);
+        }
+    }
+    async deleteFolder(path) {
+        const trimmed = path?.trim();
+        if (!trimmed) {
+            throw new Error("Folder path is required.");
         }
+        await this.refuseSystemFolder(trimmed, "delete");
         const response = await this.mutateFolderWithReconnectCheck(async () => {
             const client = await this.ensureConnected();
             return client.mailboxDelete(trimmed);
@@ -2133,7 +2137,7 @@ export class SimpleIMAPService {
         return status?.uidValidity?.toString();
     }
     async emptyFolder(folder) {
-        if (folder.toUpperCase() === "INBOX") {
+        if (folder.replace(/^\/+|\/+$/g, "").trim().toUpperCase() === "INBOX") {
             throw new Error("emptyFolder cannot be used on INBOX. Move messages to Trash first.");
         }
         let folderUidValidity;
@@ -3245,6 +3249,23 @@ export class SimpleIMAPService {
         const real = selectable.filter((entry) => !isVirtualMailView(entry));
         return (real.length > 0 ? real : selectable).map((entry) => entry.path);
     }
+    // True when `path` is this account's Trash folder. Moving a message there is trashing it, whatever tool does
+    // the move, so the move tools check this to apply the "trash" permission as well. A folder merely named
+    // "Trash" under another path (Folders/Trash) is a different folder.
+    async isTrashFolder(path) {
+        const normalize = (value) => value.trim().replace(/^\/+|\/+$/g, "").trim().toLowerCase();
+        const wanted = normalize(path);
+        if (wanted === "trash" || wanted === "inbox.trash") {
+            return true;
+        }
+        try {
+            return normalize(await this.resolveSpecialFolder("\\Trash", ["Trash", "INBOX.Trash"])) === wanted;
+        }
+        catch {
+            // The folder list could not be read, so it is not known whether this is the Trash folder.
+            return undefined;
+        }
+    }
     async resolveSpecialFolder(specialUse, fallbacks) {
         const folders = await this.getFolderStructure();
         const bySpecialUse = folders.find((folder) => folder.specialUse === specialUse);