spamscanner 7.0.11 → 7.0.12

package/dist/esm/index.js

@@ -1264,7 +1264,7 @@ var NAMED = [
   ",itilde=129,iukcy=456,iuml=ef,jcirc=135,jcy=439,jfr=1d527,jmath=237,jopf=1d55b,jscr=1d4bf,jsercy=458",
   ",jukcy=454,kappa=3ba,kappav=3f0,kcedil=137,kcy=43a,kfr=1d528,kgreen=138,khcy=445,kjcy=45c,kopf=1d55c",
   ",kscr=1d4c0,lAarr=21da,lArr=21d0,lAtail=291b,lBarr=290e,lE=2266,lEg=2a8b,lHar=2962,lacute=13a,laempt",
-  "yv=29b4,lagran=2112,lambda=3bb,lang=2329,langd=2991,langle=27e8,lap=2a85,laquo=ab,larr=2190,larrb=21",
+  "yv=29b4,lagran=2112,lambda=3bb,lang=27e8,langd=2991,langle=27e8,lap=2a85,laquo=ab,larr=2190,larrb=21",
   "e4,larrbfs=291f,larrfs=291d,larrhk=21a9,larrlp=21ab,larrpl=2939,larrsim=2973,larrtl=21a2,lat=2aab,la",
   "tail=2919,late=2aad,lates=2aad.fe00,lbarr=290c,lbbrk=2772,lbrace=7b,lbrack=5b,lbrke=298b,lbrksld=298",
   "f,lbrkslu=298d,lcaron=13e,lcedil=13c,lceil=2308,lcub=7b,lcy=43b,ldca=2936,ldquo=201c,ldquor=201e,ldr",
@@ -1322,7 +1322,7 @@ var NAMED = [
   "line=2312,profsurf=2313,prop=221d,propto=221d,prsim=227e,prurel=22b0,pscr=1d4c5,psi=3c8,puncsp=2008,",
   "qfr=1d52e,qint=2a0c,qopf=1d562,qprime=2057,qscr=1d4c6,quaternions=210d,quatint=2a16,quest=3f,questeq",
   "=225f,quot=22,rAarr=21db,rArr=21d2,rAtail=291c,rBarr=290f,rHar=2964,race=223d.331,racute=155,radic=2",
-  "21a,raemptyv=29b3,rang=232a,rangd=2992,range=29a5,rangle=27e9,raquo=bb,rarr=2192,rarrap=2975,rarrb=2",
+  "21a,raemptyv=29b3,rang=27e9,rangd=2992,range=29a5,rangle=27e9,raquo=bb,rarr=2192,rarrap=2975,rarrb=2",
   "1e5,rarrbfs=2920,rarrc=2933,rarrfs=291e,rarrhk=21aa,rarrlp=21ac,rarrpl=2945,rarrsim=2974,rarrtl=21a3",
   ",rarrw=219d,ratail=291a,ratio=2236,rationals=211a,rbarr=290d,rbbrk=2773,rbrace=7d,rbrack=5d,rbrke=29",
   "8c,rbrksld=298e,rbrkslu=2990,rcaron=159,rcedil=157,rceil=2309,rcub=7d,rcy=440,rdca=2937,rdldhar=2969",
@@ -2265,6 +2265,34 @@ function continuesName(text, index) {
 var FILE_TLDS = /* @__PURE__ */ new Set(["ai", "app", "md", "mov", "pm", "ps", "py", "rs", "sh", "so", "zip"]);
 var LINK_FILE_TLDS = /* @__PURE__ */ new Set(["md", "mov", "pm", "ps", "py", "rs", "sh", "so", "zip"]);
 var CLICK_TRACKERS = ["sendgrid.net", "list-manage.com", "mandrillapp.com", "awstrack.me", "pstmrk.it", "hubspotlinks.com", "rs6.net", "klclick.com", "mjt.lu", "exacttarget.com", "convertkit-mail.com", "convertkit-mail2.com", "kit-mail3.com", "sendibt2.com", "sendibt3.com", "createsend1.com", "cmail20.com", "clicks.mlsend.com", "acemlnb.com", "link.mail.beehiiv.com", "bhclick.com", "safelinks.protection.outlook.com", "urldefense.com", "urldefense.proofpoint.com", "mimecast.com", "mimecastprotect.com", "cudasvc.com", "secure-web.cisco.com"];
+var MAX_URL_HOST = 4096;
+var AUTHORITY_END = /[/\\?#]/g;
+var IGNORED_IN_HOST = /[\u00AD\u034F\u180B-\u180D\u180F\u200B\u2060\u2064\uFE00-\uFE0F\uFEFF]|\uD82F[\uDCA0-\uDCA3]|\uDB40[\uDD00-\uDDEF]/g;
+function boundedUrl(address2) {
+  const text = String(address2).replaceAll(/[\t\n\r]/g, "");
+  const colon = text.indexOf(":");
+  let start = colon === -1 ? 0 : colon + 1;
+  while (start < text.length && (text[start] === "/" || text[start] === "\\")) {
+    start++;
+  }
+  AUTHORITY_END.lastIndex = start;
+  const end = AUTHORITY_END.exec(text)?.index ?? text.length;
+  const file = /^[\0- ]*file:/i.test(text);
+  const at = file ? start : Math.max(start, text.lastIndexOf("@", end - 1) + 1);
+  const bracket = text.lastIndexOf("]", end - 1);
+  const port = text.lastIndexOf(":", end - 1);
+  let host = text.slice(at, !file && port > Math.max(at - 1, bracket) ? port : end);
+  if (host.length > MAX_URL_HOST && host.includes("%")) {
+    try {
+      host = decodeURIComponent(host);
+    } catch {
+    }
+  }
+  if (host.length > MAX_URL_HOST && host.replaceAll(IGNORED_IN_HOST, "").length > MAX_URL_HOST) {
+    throw new TypeError("Invalid URL: host too long");
+  }
+  return new URL(text);
+}
 var isUnder = (host, domain) => host === domain || host.endsWith(`.${domain}`);
 function isClickTracker(url) {
   const host = url.hostname.toLowerCase();
@@ -2293,7 +2321,7 @@ var MAX_GATEWAYS = 16;
 function unwrapLink(address2) {
   let url;
   try {
-    url = new URL(address2);
+    url = boundedUrl(address2);
   } catch {
     return null;
   }
@@ -2304,7 +2332,7 @@ function unwrapLink(address2) {
     }
     let next;
     try {
-      next = new URL(target);
+      next = boundedUrl(target);
     } catch {
       break;
     }
@@ -2582,7 +2610,7 @@ function extractLinks(text, html, { maxLength = 5e5, bareHosts: bareHosts2 = fal
     }
     let url;
     try {
-      url = new URL(href);
+      url = boundedUrl(href);
     } catch {
       return;
     }
@@ -2907,7 +2935,7 @@ function isDeceptiveLink(link, { from } = {}) {
   }
   let shownUrl;
   try {
-    shownUrl = new URL(/^https?:\/\//i.test(link.text) ? link.text : `http://${link.text}`);
+    shownUrl = boundedUrl(/^https?:\/\//i.test(link.text) ? link.text : `http://${link.text}`);
   } catch {
     return false;
   }
@@ -4154,7 +4182,7 @@ async function parseWithin(raw, parse = parseMessage, deadline = Date.now() + PA
   }
 }
 async function expandAttachments(attachments = [], errors = [], parse = parseMessage, gets = {}) {
-  const { unopened = [], mails = [] } = Array.isArray(gets) ? { unopened: gets } : gets;
+  const { unopened = [], mails = [] } = Array.isArray(gets) ? { unopened: gets } : gets ?? {};
   const all = [];
   const deadline = Date.now() + PARSE_TIMEOUT;
   let budget = MAX_NESTED_BYTES;
@@ -4222,6 +4250,11 @@ import { isIP } from "node:net";
 import { domainToASCII } from "node:url";
 import { getPublicSuffix } from "tldts";
 var LOOKUP_LABEL = /^[a-z\d_-]{1,63}$/;
+var LABEL_SEPARATOR = /[.\u3002\uFF0E\uFF61]/g;
+function lastLabels(name) {
+  const separators = [...name.matchAll(LABEL_SEPARATOR)];
+  return separators.length < 128 ? 0 : separators.at(-128).index + 1;
+}
 function lookupName(host) {
   if (typeof host !== "string") {
     return null;
@@ -4232,6 +4265,7 @@ function lookupName(host) {
   }
   let name = host.slice(0, end).toLowerCase();
   if (/[\u0080-\u{10FFFF}]/u.test(name)) {
+    name = name.slice(lastLabels(name));
     name = domainToASCII(name) || name;
   }
   if (isIP(name.replaceAll(/^\[|]$/g, "")) !== 0) {
@@ -4571,7 +4605,7 @@ function asciiHostname(value) {
     return null;
   }
   const lower = value.normalize("NFKC").toLowerCase().replace(/\.$/, "");
-  if (lower === "" || /[\0-,/:-^`{-\u007F]/.test(lower)) {
+  if (lower === "" || lower.length > 1024 || /[\0-,/:-^`{-\u007F]/.test(lower)) {
     return null;
   }
   const ascii = domainToASCII2(lower);
@@ -4753,8 +4787,8 @@ function trustReputation(result, trusted = []) {
   for (const value of result.checkedValues.filter((item) => allowed.has(item))) {
     const signers = allowed.get(value);
     const counts = (entry) => Boolean(entry) && (signers === null || signers.some((signer) => vouches(normalizeEntry(entry), signer)));
-    const detail = result.details[value];
-    const listed = result.allowlisted[value] || (detail?.isAllowlisted ? detail.allowlistValue : null);
+    const detail = Object.hasOwn(result.details, value) ? result.details[value] : void 0;
+    const listed = Object.hasOwn(result.allowlisted, value) && result.allowlisted[value] || (detail?.isAllowlisted ? detail.allowlistValue : null);
     if (counts(listed) && !out.isAllowlisted) {
       out.isAllowlisted = true;
       out.allowlistValue = listed;
@@ -5661,7 +5695,8 @@ var MAX_EMBEDDED_LENGTH = 10 * 1024 * 1024;
 var MAX_ATTACHED = 100;
 var MAX_ATTACHED_BYTES = 50 * 1024 * 1024;
 var MAX_READ_TIME = 5e3;
-var MAX_SHOWN_BYTES = 4 * 1024 * 1024;
+var MAX_CARD_BYTES = 4 * 1024 * 1024;
+var MAX_SHOWN_BYTES = 1024 * 1024;
 function isHostCode2(code) {
   return code >= 97 && code <= 122 || code >= 65 && code <= 90 || code >= 48 && code <= 57 || code === 45 || code === 46;
 }
@@ -5690,7 +5725,7 @@ function urlOf(value) {
     return null;
   }
   try {
-    return new URL(href);
+    return boundedUrl(href);
   } catch {
     return null;
   }
@@ -5780,7 +5815,13 @@ function* attributesOf(html) {
     TAG_START.lastIndex = Math.max(i, match.index + 1);
   }
 }
-function linksOf(name, value, add, embed) {
+var MAX_VALUE2 = 1024 * 1024;
+var LONG_VALUE = 64 * 1024;
+function linksOf(name, value, { add, embed, cut }) {
+  if (value.length > MAX_VALUE2) {
+    cut();
+    value = value.slice(0, MAX_VALUE2);
+  }
   const decoded = decodeEntities(value, { attribute: true });
   switch (name) {
     case "srcdoc": {
@@ -5821,7 +5862,7 @@ function linksOf(name, value, add, embed) {
 }
 var MAX_LENIENT_VALUE = 4096;
 var UNQUOTED_END = /* @__PURE__ */ new Set(["<", ">", '"', "'", "`", "="]);
-function lenientLinks(html, add, done, embed) {
+function lenientLinks(html, done, reader) {
   LENIENT.lastIndex = 0;
   let match;
   while (!done() && (match = LENIENT.exec(html)) !== null) {
@@ -5837,8 +5878,8 @@ function lenientLinks(html, add, done, embed) {
       }
       if (end < html.length && html[end] !== quote) {
         const close = html.indexOf(quote, end);
-        if (close !== -1 && close - i <= MAX_LENIENT_VALUE) {
-          linksOf(name, html.slice(i, close), add, embed);
+        if (close !== -1 && close - i <= MAX_LENIENT_VALUE && !reader.spend(close - i)) {
+          linksOf(name, html.slice(i, close), reader);
         }
       }
     } else {
@@ -5846,7 +5887,10 @@ function lenientLinks(html, add, done, embed) {
         end++;
       }
     }
-    linksOf(name, html.slice(i, end), add, embed);
+    if (reader.spend(end - i)) {
+      break;
+    }
+    linksOf(name, html.slice(i, end), reader);
   }
 }
 function endsLink2(text, i) {
@@ -6017,8 +6061,17 @@ function* chunksOf(html) {
         cutStart = false;
         continue;
       }
-      yield { text: html.slice(start, end), cutStart, cutEnd: true };
-      start = end - CHUNK_OVERLAP;
+      let hard = end;
+      while (hard > start + CHUNK_OVERLAP + 1 && /[\dA-Za-z#]/.test(html[hard - 1])) {
+        hard--;
+      }
+      if (hard < end && html[hard - 1] === "&" && hard - 1 > start + CHUNK_OVERLAP) {
+        hard--;
+      } else {
+        hard = end;
+      }
+      yield { text: html.slice(start, hard), cutStart, cutEnd: true };
+      start = hard - CHUNK_OVERLAP;
       cutStart = true;
       continue;
     }
@@ -6188,27 +6241,14 @@ function quotedPrintableValues(text) {
   }
   return out.join("\n");
 }
-function hasQuotedPrintable(text) {
-  const unfolded = text.replaceAll(FOLD, "");
-  if (!/quoted-printable/i.test(unfolded)) {
-    return false;
-  }
-  return unfolded.split(LINE_BREAK).some((line) => {
-    const colon = valueColon(line);
-    return colon !== -1 && QUOTED_PRINTABLE.test(line.slice(0, colon));
-  });
-}
-function shownText(text, full = true) {
+function shownText(text) {
   const unfolded = text.replaceAll(FOLD, "");
   const shown = /* @__PURE__ */ new Set([text, readEscapes(unfolded)]);
-  let decoded = unfolded;
-  if (full) {
-    decoded = quotedPrintableValues(unfolded);
-    if (decoded !== unfolded) {
-      shown.add(readEscapes(decoded));
-      if (unfolded !== text) {
-        shown.add(quotedPrintableValues(text));
-      }
+  const decoded = quotedPrintableValues(unfolded);
+  if (decoded !== unfolded) {
+    shown.add(readEscapes(decoded));
+    if (unfolded !== text) {
+      shown.add(quotedPrintableValues(text));
     }
   }
   if (/\\[^nN,;\\]/.test(decoded)) {
@@ -6313,59 +6353,73 @@ function charsetOf(attachment) {
   const charset = headers && typeof headers.get === "function" ? headers.get("content-type")?.params?.charset : null;
   return typeof charset === "string" ? charset.toLowerCase() : "";
 }
-function documentsOf(attachments, until) {
-  const documents = [];
+function kindOf(attachment) {
+  const { content } = attachment ?? {};
+  if (!Buffer7.isBuffer(content) || content.length === 0) {
+    return null;
+  }
+  const type = typeof attachment.contentType === "string" ? attachment.contentType.toLowerCase() : "";
+  const extensions = extensionsOf(attachment);
+  const has = (set) => [...extensions].some((name) => set.has(name));
+  if (MESSAGE_TYPES.has(type) || extensions.has("eml") || extensions.has("u8msg")) {
+    return null;
+  }
+  const isHtml = HTML_TYPES.has(type) || has(HTML_EXTENSIONS);
+  const isCard = !isHtml && (CARD_TYPES.has(type) || has(CARD_EXTENSIONS));
+  const isText = isCard || !isHtml && type === "text/plain";
+  return isHtml || isText ? { isHtml, isText, isCard } : null;
+}
+function* documentsOf(attachments, state, late) {
+  const read = [];
   let bytes = 0;
   let opened = 0;
   for (const attachment of attachments) {
-    const { content } = attachment ?? {};
-    if (!Buffer7.isBuffer(content) || content.length === 0) {
-      continue;
-    }
-    const type = typeof attachment.contentType === "string" ? attachment.contentType.toLowerCase() : "";
-    const extensions = extensionsOf(attachment);
-    const has = (set) => [...extensions].some((name) => set.has(name));
-    if (MESSAGE_TYPES.has(type) || extensions.has("eml") || extensions.has("u8msg")) {
+    const kind = kindOf(attachment);
+    if (!kind) {
       continue;
     }
-    const isHtml = HTML_TYPES.has(type) || has(HTML_EXTENSIONS);
-    const isCard = !isHtml && (CARD_TYPES.has(type) || has(CARD_EXTENSIONS));
-    const isText = isCard || !isHtml && type === "text/plain";
-    if (!isHtml && !isText) {
-      continue;
-    }
-    if (!isText && ++opened > MAX_ATTACHED || bytes + content.length > MAX_ATTACHED_BYTES) {
-      documents.tooComplex = true;
-      return documents;
+    if (!kind.isText && ++opened > MAX_ATTACHED || bytes + attachment.content.length > MAX_ATTACHED_BYTES) {
+      state.tooComplex = true;
+      break;
     }
-    if (Date.now() > until) {
-      documents.incomplete = true;
-      return documents;
+    bytes += attachment.content.length;
+    read.push({ attachment, kind });
+  }
+  for (const { attachment, kind: { isHtml, isCard } } of read) {
+    if (late()) {
+      state.incomplete = true;
+      return;
     }
-    bytes += content.length;
-    const text = decodeText(content, charsetOf(attachment));
+    const text = decodeText(attachment.content, charsetOf(attachment));
     if (isHtml) {
-      documents.push({ html: text });
+      yield { html: text };
       continue;
     }
     if (!isCard) {
-      documents.push({ text });
+      yield { text };
       continue;
     }
-    const readable = withoutBinaryValues(text);
-    const full = readable.length <= MAX_SHOWN_BYTES;
-    if (!full && hasQuotedPrintable(readable)) {
-      documents.tooComplex = true;
-      continue;
+    let readable = withoutBinaryValues(text.length > MAX_CARD_BYTES ? text.slice(0, MAX_CARD_BYTES) : text);
+    if (text.length > MAX_CARD_BYTES || readable.length > MAX_SHOWN_BYTES) {
+      state.tooComplex = true;
+      readable = readable.slice(0, MAX_SHOWN_BYTES);
+    }
+    if (late()) {
+      state.incomplete = true;
+      return;
+    }
+    yield { text: shownText(readable) };
+    if (late()) {
+      state.incomplete = true;
+      return;
     }
-    documents.push({ text: shownText(readable, full) });
     const html = htmlDescriptions(readable);
     if (html !== "") {
-      documents.push({ html });
+      yield { html };
     }
   }
-  return documents;
 }
+var LATE_EVERY = 1024;
 function carriedLinkHosts(mail, {
   mails = [],
   attachments = [],
@@ -6378,40 +6432,45 @@ function carriedLinkHosts(mail, {
   const seenBare = /* @__PURE__ */ new Set();
   const seenLoose = /* @__PURE__ */ new Set();
   let more = false;
-  let tooComplex = false;
-  const done = () => more;
-  const looseDone = () => more || loose.size > maxHosts;
+  let full = false;
+  const domains = /* @__PURE__ */ new Set();
+  const state = { tooComplex: false, incomplete: false };
+  const until = Date.now() + MAX_READ_TIME;
+  const late = () => {
+    if (!state.incomplete && Date.now() > until) {
+      state.incomplete = true;
+    }
+    return state.incomplete;
+  };
+  let calls = 0;
+  const done = () => full || state.incomplete || ++calls % LATE_EVERY === 0 && late();
+  const looseDone = () => done() || loose.size > maxHosts;
   const addLoose = (host) => {
     if (!looseDone()) {
       loose.add(host);
     }
   };
-  const until = Date.now() + MAX_READ_TIME;
-  let incomplete = false;
-  const late = () => {
-    if (!incomplete && Date.now() > until) {
-      incomplete = true;
-    }
-    return incomplete;
-  };
-  const carried = documentsOf(attachments, until);
-  tooComplex = Boolean(carried.tooComplex);
-  incomplete = Boolean(carried.incomplete);
-  const queue = [mail, ...mails, ...carried].map((document) => ({ document, depth: 0 }));
+  const queue = [mail, ...mails].map((document) => ({ document, depth: 0 }));
+  const carried = documentsOf(attachments, state, late);
   let depth = 0;
   let embedded = 0;
   let embeddedLength = 0;
+  const embeddedSeen = /* @__PURE__ */ new Set();
   const embed = (html) => {
+    if (html === "" || embeddedSeen.has(html)) {
+      return;
+    }
     if (depth >= MAX_EMBED_DEPTH || embedded >= MAX_EMBEDDED || embeddedLength + html.length > MAX_EMBEDDED_LENGTH) {
-      tooComplex = true;
+      state.tooComplex = true;
       return;
     }
+    embeddedSeen.add(html);
     embedded++;
     embeddedLength += html.length;
     queue.push({ document: { html }, depth: depth + 1 });
   };
   const add = (value) => {
-    if (more || typeof value !== "string" || value === "" || seen.has(value)) {
+    if (full || typeof value !== "string" || value === "" || seen.has(value)) {
       return;
     }
     if (seen.size < MAX_SEEN) {
@@ -6426,34 +6485,64 @@ function carriedLinkHosts(mail, {
     }
     const found = hostsOf(value);
     if (found.unresolved) {
-      tooComplex = true;
+      state.tooComplex = true;
     }
     for (const host of found) {
       if (hosts.has(host)) {
         continue;
       }
-      if (hosts.size >= maxHosts) {
-        more = true;
+      const domain = registrableDomain(host);
+      if (hosts.size < maxHosts || !domains.has(domain) && domains.size < maxHosts) {
+        hosts.add(host);
+        domains.add(domain);
+        continue;
+      }
+      more = true;
+      if (domains.size >= maxHosts) {
+        full = true;
         return;
       }
-      hosts.add(host);
     }
   };
-  const readText = (source, { cutStart = false, cutEnd = false } = {}) => {
+  let spent = 0;
+  const spend = (length) => {
+    spent += length;
+    if (spent < LONG_VALUE) {
+      return false;
+    }
+    spent = 0;
+    return late();
+  };
+  const reader = {
+    add,
+    embed,
+    spend,
+    cut() {
+      state.tooComplex = true;
+    }
+  };
+  const readText = (source, { cutStart = false, cutEnd = false, exact = false } = {}) => {
     for (const match of source.matchAll(URL_START)) {
-      if (more) {
+      if (done()) {
         break;
       }
       if (cutStart && match.index === 0) {
         continue;
       }
       if (cutEnd && match.index + match[0].length === source.length) {
+        if (exact && source.length - match.index < CHUNK_OVERLAP) {
+          continue;
+        }
         const value = match[0];
         const at = /^www\./i.test(value) ? 0 : value.indexOf("//") + 2;
-        if (/[/?#\\]/.test(value.slice(at))) {
-          add(value);
-        } else if (source.length - match.index > CHUNK_OVERLAP) {
-          tooComplex = true;
+        if (!/[/?#\\]/.test(value.slice(at))) {
+          state.tooComplex = true;
+          continue;
+        }
+        add(value);
+        const url = urlOf(value);
+        if (url && isClickTracker(url)) {
+          state.tooComplex = true;
         }
         continue;
       }
@@ -6475,42 +6564,60 @@ function carriedLinkHosts(mail, {
       });
     }
   };
-  for (const element of queue) {
-    if (more || late()) {
+  for (let index = 0; ; index++) {
+    if (full || late()) {
       break;
     }
-    ({ depth } = element);
-    const { document } = element;
+    if (index >= queue.length) {
+      const next = carried.next();
+      if (next.done) {
+        break;
+      }
+      queue.push({ document: next.value, depth: 0 });
+    }
+    ({ depth } = queue[index]);
+    const { document } = queue[index];
     const html = withoutNul(typeof document?.html === "string" ? document.html : "");
     const text = withoutNul(typeof document?.text === "string" ? document.text : "");
     for (const [name, value] of attributesOf(html)) {
-      if (more) {
+      if (done()) {
         break;
       }
-      if (LINK_ATTRIBUTES.has(name)) {
-        linksOf(name, value, add, embed);
+      if (!LINK_ATTRIBUTES.has(name)) {
+        continue;
       }
+      if (spend(value.length)) {
+        break;
+      }
+      linksOf(name, value, reader);
     }
-    lenientLinks(html, add, done, embed);
+    lenientLinks(html, done, reader);
     for (const pattern of [CSS_URL, CSS_IMPORT]) {
       for (const [, link] of html.matchAll(pattern)) {
-        if (more) {
+        if (done() || spend(link.length)) {
           break;
         }
-        add(decodeEntities(link, { attribute: true }));
+        if (link.length > MAX_VALUE2) {
+          state.tooComplex = true;
+        }
+        add(decodeEntities(link.slice(0, MAX_VALUE2), { attribute: true }));
       }
     }
-    if (!more) {
-      readText(text);
+    for (const chunk2 of chunksOf(text)) {
+      if (full || late()) {
+        break;
+      }
+      readText(chunk2.text, { ...chunk2, exact: true });
     }
     for (const chunk2 of chunksOf(html)) {
-      if (more || late()) {
+      if (full || late()) {
         break;
       }
-      readText(decodeEntities(chunk2.text), chunk2);
+      const decoded = decodeEntities(chunk2.text);
+      readText(decoded, { ...chunk2, exact: decoded.endsWith(chunk2.text.slice(-CHUNK_OVERLAP)) });
     }
   }
-  if (!more && !incomplete) {
+  if (!more && !state.incomplete) {
     for (const name of loose) {
       if (hosts.size >= maxHosts) {
         break;
@@ -6524,8 +6631,8 @@ function carriedLinkHosts(mail, {
   return {
     hosts: [...hosts],
     more,
-    tooComplex,
-    incomplete
+    tooComplex: state.tooComplex,
+    incomplete: state.incomplete
   };
 }
 
@@ -8171,7 +8278,7 @@ function scoreResults(results, options) {
 var package_default = {
   name: "spamscanner",
   description: "Spam, phishing and malware filter for email in any language: a trainable classifier, link and attachment checks, SPF/DKIM/DMARC, and an optional AI second opinion from any LLM, including local Ollama models. Works as a library, CLI, Postfix milter or HTTP API.",
-  version: "7.0.11",
+  version: "7.0.12",
   author: "Forward Email (https://forwardemail.net)",
   bin: {
     spamscanner: "./dist/esm/cli.js"
@@ -8436,9 +8543,12 @@ function rewriteMessage(source, headers = [], options = {}) {
     }
   }
   const added = headers.map(([name, value]) => foldHeader(name, Buffer9.from(String(value), "utf8").toString("latin1"), newline));
-  const mbox = kept.length > 0 && kept[0][0].startsWith("From ") ? kept.shift() : [];
+  const mbox = kept.length > 0 && kept[0][0].startsWith("From ") ? kept.shift().slice(0, 1) : [];
+  if (kept.length > 0 && /^[ \t]/.test(kept[0][0])) {
+    kept.shift();
+  }
   const head = [...mbox, ...added, ...kept.map((field) => field.join(newline))].join(newline);
-  return Buffer9.concat([Buffer9.from(head === "" && header === "" ? newline : `${head}${newline}${newline}`, "latin1"), body]);
+  return Buffer9.concat([Buffer9.from(head === "" ? newline : `${head}${newline}${newline}`, "latin1"), body]);
 }
 
 // src/train.js
@@ -8787,7 +8897,12 @@ import net2 from "node:net";
 var MAX_MESSAGE_SIZE = 25 * 1024 * 1024;
 var MAX_CONNECTIONS = 200;
 function serializeResult(result, options = {}) {
-  const { mail, tokens, ...rest } = result;
+  const {
+    mail,
+    tokens,
+    attached,
+    ...rest
+  } = result;
   const output = {
     ...rest,
     results: { ...result.results }
@@ -9448,6 +9563,7 @@ function reply(code, text, headers = [], body = null) {
   lines2.push(...headers.map(([name, value]) => `${name}: ${value}`), "", "");
   return body === null ? Buffer13.from(lines2.join("\r\n")) : Buffer13.concat([Buffer13.from(lines2.join("\r\n")), body]);
 }
+var oneLine2 = (text) => String(text ?? "").replaceAll(/[\p{Cc}\u061C\u200E\u200F\u2028\u2029\u202A-\u202E\u2066-\u2069]+/gu, " ");
 function report(result) {
   const lines2 = [
     `Spam detection software, running on the system "spamscanner", has ${result.isSpam ? "identified this incoming email as possible spam" : "scanned this incoming email"}.`,
@@ -9456,7 +9572,7 @@ function report(result) {
     "",
     " pts rule name              description",
     "---- ---------------------- --------------------------------------------------",
-    ...result.tests.map((test) => `${test.score.toFixed(1).padStart(4)} ${test.name.padEnd(22)} ${test.description}`)
+    ...result.tests.map((test) => `${test.score.toFixed(1).padStart(4)} ${oneLine2(test.name).padEnd(22)} ${oneLine2(test.description)}`)
   ];
   return `${lines2.join("\r\n")}\r
 `;
@@ -10091,7 +10207,7 @@ var SpamScanner = class {
   // (`from`: the sender's domain; `carried`: the link hosts of the whole
   //  message and of what it carries, see carriedLinkHosts)
   async checkLinks(links, config, hosts = [], options = {}) {
-    const { from = "", carried = null } = typeof options === "string" ? { from: options } : options;
+    const { from = "", carried = null } = typeof options === "string" ? { from: options } : options ?? {};
     const phishing = [];
     const homographs = [];
     const seenHosts = /* @__PURE__ */ new Set();
@@ -10151,15 +10267,15 @@ var SpamScanner = class {
     for (const host of carriedHosts) {
       seenHosts.add(host);
     }
-    const ordered = [.../* @__PURE__ */ new Set([...[...found.filter((link) => link.text), ...found.filter((link) => !link.text), ...bare].map((link) => lookupName(destination(link))).filter(Boolean), ...carriedHosts])];
+    const own = [...found.filter((link) => link.text), ...found.filter((link) => !link.text), ...bare].map((link) => lookupName(destination(link))).filter(Boolean);
     const firsts = /* @__PURE__ */ new Map();
-    for (const host of ordered) {
+    for (const host of [...own, ...carriedHosts]) {
       const domain = registrableDomain(host);
       if (!firsts.has(domain)) {
         firsts.set(domain, host);
       }
     }
-    const checked = [.../* @__PURE__ */ new Set([...firsts.values(), ...ordered])].slice(0, config.phishing.maxHosts);
+    const checked = [.../* @__PURE__ */ new Set([...firsts.values(), ...own, ...carriedHosts])].slice(0, config.phishing.maxHosts);
     const domains = [...new Set(checked.map((host) => registrableDomain(host)))];
     const blocked = [];
     let answered = 0;