@bobfrankston/rmfmail 1.2.270 → 1.2.274

package/client/app.bundle.js

@@ -56,6 +56,7 @@ __export(api_client_exports, {
   flagSenderOrDomain: () => flagSenderOrDomain,
   formatJsonc: () => formatJsonc,
   getAccounts: () => getAccounts,
+  getAllowlist: () => getAllowlist,
   getAttachment: () => getAttachment,
   getAutocompleteSettings: () => getAutocompleteSettings,
   getCalendarEvents: () => getCalendarEvents,
@@ -350,6 +351,9 @@ function addUserDictWords(words) {
 function removeUserDictWord(word) {
   return ipc().removeUserDictWord?.(word) ?? Promise.resolve([]);
 }
+function getAllowlist() {
+  return ipc().getAllowlist?.() ?? Promise.resolve({ senders: [], domains: [], recipients: [], flaggedSenders: [], flaggedDomains: [] });
+}
 function flagSenderOrDomain(type, value) {
   return ipc().flagSenderOrDomain?.(type, value) ?? Promise.resolve({ flagged: false });
 }
@@ -1310,6 +1314,61 @@ var init_message_state = __esm({
   }
 });
 
+// client/lib/approved-senders.js
+var approved_senders_exports = {};
+__export(approved_senders_exports, {
+  approvedCounts: () => approvedCounts,
+  isSenderApproved: () => isSenderApproved,
+  noteApprovedLocally: () => noteApprovedLocally,
+  refreshApprovedSenders: () => refreshApprovedSenders
+});
+async function refreshApprovedSenders() {
+  try {
+    const list = await getAllowlist();
+    senders = new Set((list.senders || []).map(norm));
+    domains = new Set((list.domains || []).map(norm));
+    loaded = true;
+  } catch (e) {
+    console.warn("[approved-senders] refresh failed:", e?.message || e);
+  }
+}
+function isSenderApproved(address) {
+  if (!loaded)
+    return false;
+  const a = norm(address);
+  if (!a)
+    return false;
+  if (senders.has(a))
+    return true;
+  const d = domainOf(a);
+  return !!d && domains.has(d);
+}
+function noteApprovedLocally(type, value) {
+  const v = norm(value);
+  if (!v)
+    return;
+  if (type === "sender")
+    senders.add(v);
+  else
+    domains.add(v);
+  loaded = true;
+}
+function approvedCounts() {
+  return { senders: senders.size, domains: domains.size, loaded };
+}
+var senders, domains, loaded, norm, domainOf;
+var init_approved_senders = __esm({
+  "client/lib/approved-senders.js"() {
+    "use strict";
+    init_api_client();
+    senders = /* @__PURE__ */ new Set();
+    domains = /* @__PURE__ */ new Set();
+    loaded = false;
+    norm = (s) => (s || "").trim().toLowerCase();
+    domainOf = (addr) => norm(addr).split("@").pop() || "";
+  }
+});
+
 // packages/mailx-types/contact-rules.js
 var init_contact_rules = __esm({
   "packages/mailx-types/contact-rules.js"() {
@@ -1382,9 +1441,20 @@ function displayNameClaimsOtherAddress(name, address) {
   const m = n.match(/[A-Za-z0-9._%+-]+@[A-Za-z0-9.-]+\.[A-Za-z]{2,}/g);
   if (!m)
     return null;
+  const realDomain = real.split("@").pop() || "";
   for (const claimed of m) {
-    if (claimed.toLowerCase() !== real)
-      return claimed;
+    if (claimed.toLowerCase() === real)
+      continue;
+    const claimedDomain = claimed.toLowerCase().split("@").pop() || "";
+    if (claimedDomain && realDomain) {
+      if (claimedDomain === realDomain)
+        continue;
+      if (claimedDomain.endsWith("." + realDomain))
+        continue;
+      if (realDomain.endsWith("." + claimedDomain))
+        continue;
+    }
+    return claimed;
   }
   return null;
 }
@@ -2682,6 +2752,36 @@ async function showMessage(accountId, uid, folderId, specialUse, isRetry = false
           items.push({ label: "", action: () => {
           }, separator: true });
         }
+        if (el === fromEl && msg.from?.address) {
+          const addr = String(msg.from.address);
+          const dom = addr.split("@").pop() || "";
+          const claimed = displayNameClaimsOtherAddress(String(msg.from.name || ""), addr);
+          if (claimed && !isSenderApproved(addr)) {
+            const approve = async (type, value) => {
+              noteApprovedLocally(type, value);
+              try {
+                await allowRemoteContent(type, value);
+                await refreshApprovedSenders();
+                document.dispatchEvent(new CustomEvent("mailx-allowlist-changed"));
+                const st = document.getElementById("status-sync");
+                if (st)
+                  st.textContent = `Marked valid: ${value}`;
+              } catch (e2) {
+                const st = document.getElementById("status-sync");
+                if (st) {
+                  st.textContent = `Couldn't save "${value}" to the allowlist \u2014 ${e2?.message || e2}`;
+                  st.style.color = "oklch(0.65 0.2 25)";
+                }
+                console.error("[allowlist] approve failed:", e2);
+              }
+            };
+            items.push({ label: `\u2713 Mark ${addr} as a valid sender`, action: () => void approve("sender", addr) });
+            if (dom)
+              items.push({ label: `\u2713 Trust all senders at ${dom}`, action: () => void approve("domain", dom) });
+            items.push({ label: "", action: () => {
+            }, separator: true });
+          }
+        }
         if (omitted > 0) {
           items.push({
             label: `\u2026 ${omitted} more recipients \u2014 copy the whole list`,
@@ -3271,7 +3371,7 @@ ${escapeText(reputationBlind)}"` : ""}>${reputationText}</div>` : "") + `<div cl
 }
 function formatAddr(addr) {
   const { text, claimed } = formatSender(addr);
-  if (!claimed)
+  if (!claimed || isSenderApproved(addr.address))
     return text;
   return `${text} \u2014 display name claims ${claimed}`;
 }
@@ -4096,6 +4196,7 @@ var init_message_viewer = __esm({
   "client/components/message-viewer.js"() {
     "use strict";
     init_api_client();
+    init_approved_senders();
     init_context_menu();
     init_message_state();
     init_message_list();
@@ -5519,6 +5620,7 @@ var init_message_list = __esm({
     init_folder_picker();
     init_fold_text();
     init_mailx_types();
+    init_approved_senders();
     currentSpecialUse = "";
     lastClickedRow = null;
     loading = false;
@@ -5633,7 +5735,7 @@ var init_message_list = __esm({
           from.textContent = msg.to.map((a) => a.name || a.address).join(", ");
         } else {
           const fromName2 = msg.from.name || msg.from.address;
-          const fromClaim = displayNameClaimsOtherAddress(msg.from.name || "", msg.from.address || "");
+          const fromClaim = isSenderApproved(msg.from.address || "") ? null : displayNameClaimsOtherAddress(msg.from.name || "", msg.from.address || "");
           from.textContent = fromClaim ? `${fromName2} \u2014 actually ${msg.from.address}` : fromName2;
           if (fromClaim) {
             from.classList.add("ml-from-spoofed");
@@ -9891,12 +9993,12 @@ async function openCompose(mode, overrideMsg, overrideAccountId) {
   }
   if (msg && (mode === "editAsNew" || mode === "forward") && Array.isArray(msg.attachments) && msg.attachments.length) {
     const msgAccountId = current?.accountId || accountId;
-    const loaded = [];
+    const loaded2 = [];
     for (const att of msg.attachments) {
       try {
         const data = await getAttachment(msgAccountId, msg.uid, att.id, msg.folderId);
         if (data?.content) {
-          loaded.push({
+          loaded2.push({
             filename: data.filename || att.filename || "attachment",
             mimeType: data.contentType || att.contentType || "application/octet-stream",
             dataBase64: data.content
@@ -9906,7 +10008,7 @@ async function openCompose(mode, overrideMsg, overrideAccountId) {
         console.error(`[compose] ${mode}: failed to load attachment ${att.id}: ${e?.message || e}`);
       }
     }
-    if (loaded.length) init.attachments = loaded;
+    if (loaded2.length) init.attachments = loaded2;
   }
   if (preferWindow && !frame) {
     try {
@@ -12368,6 +12470,19 @@ function applyThreadFilter() {
     console.error("pending mailto pickup failed:", e?.message || e);
   }
 })();
+(async () => {
+  try {
+    const { refreshApprovedSenders: refreshApprovedSenders2 } = await Promise.resolve().then(() => (init_approved_senders(), approved_senders_exports));
+    await refreshApprovedSenders2();
+    document.dispatchEvent(new CustomEvent("mailx-allowlist-changed"));
+  } catch (e) {
+    console.warn("approved-sender index load failed:", e?.message || e);
+  }
+})();
+document.addEventListener("mailx-allowlist-changed", () => {
+  void Promise.resolve().then(() => (init_message_list(), message_list_exports)).then((m) => m.reloadCurrentFolder?.()).catch(() => {
+  });
+});
 (async () => {
   try {
     const { consumePendingShare: consumePendingShare2 } = await Promise.resolve().then(() => (init_api_client(), api_client_exports));
@@ -13619,12 +13734,12 @@ document.addEventListener("mailx-popout-message", (async (e) => {
       draftId: msg.mailxDraftId || ""
     };
     if (Array.isArray(msg.attachments) && msg.attachments.length) {
-      const loaded = [];
+      const loaded2 = [];
       for (const att of msg.attachments) {
         try {
           const data = await getAttachment(accountId, msg.uid, att.id, msg.folderId);
           if (data?.content) {
-            loaded.push({
+            loaded2.push({
               filename: data.filename || att.filename || "attachment",
               mimeType: data.contentType || att.contentType || "application/octet-stream",
               dataBase64: data.content
@@ -13634,7 +13749,7 @@ document.addEventListener("mailx-popout-message", (async (e) => {
           console.error(`[compose] edit draft: failed to load attachment ${att.id} ("${att.filename}"): ${e2?.message || e2}`);
         }
       }
-      if (loaded.length) init.attachments = loaded;
+      if (loaded2.length) init.attachments = loaded2;
     }
     handOffComposeInit(showComposeOverlay(msg.subject ? `Edit: ${msg.subject}` : "Edit draft"), init);
     return;