@zone-eu/mailsplit 5.4.28 → 5.4.29

package/lib/mime-node.js

@@ -12,7 +12,7 @@ const pathlib = require('path');
 /** @typedef {import('..').PartNumberItem} PartNumberItem */
 /** @typedef {import('..').PartNumber} PartNumber */
 /** @typedef {import('..').SplitterOptions} SplitterOptions */
-/** @typedef {import('libmime').StructuredHeader} StructuredHeader */
+/** @typedef {import('libmime').ParsedHeaderValue} StructuredHeader */
 /** @typedef {import('stream').Transform | import('stream').PassThrough} ContentStream */
 /** @typedef {import('..').MimeNode} MimeNodeType */
 
@@ -51,59 +51,6 @@ function stripComments(value) {
         .join('');
 }
 
-/**
- * Lists the parameters a header value gives in RFC 2231 form (`name*=`, `name*0=` or
- * `name*0*=`). libmime decodes those while parsing the header, so the result must not
- * go through `decodeWords` as well: a value like `filename*=utf-8''a%3D%3Futf-8%3FQ%3F%3D2Eexe%3F%3D`
- * would otherwise come out as `a.exe` while a parser that decodes once sees the encoded word.
- *
- * @param {string} value Raw header value.
- * @returns {Set<string>} Lowercased parameter names.
- */
-function rfc2231ParamNames(value) {
-    let names = new Set();
-    let quote = false;
-    let escaped = false;
-    let start = 0;
-
-    /**
-     * @param {number} end End offset of the segment starting at `start`.
-     * @returns {void}
-     */
-    let addSegment = end => {
-        let segment = value.substring(start, end);
-        let eq = segment.indexOf('=');
-        if (eq < 0) {
-            return;
-        }
-        let match = segment
-            .substring(0, eq)
-            .trim()
-            .toLowerCase()
-            .match(/^(.+?)\*(\d+\*?)?$/);
-        if (match) {
-            names.add(match[1]);
-        }
-    };
-
-    for (let i = 0; i < value.length; i++) {
-        let chr = value.charAt(i);
-        if (escaped) {
-            escaped = false;
-        } else if (chr === '\\') {
-            escaped = true;
-        } else if (chr === '"') {
-            quote = !quote;
-        } else if (chr === ';' && !quote) {
-            addSegment(i);
-            start = i + 1;
-        }
-    }
-    addSegment(value.length);
-
-    return names;
-}
-
 /**
  * Parsed MIME node with mutable headers and transfer-encoding helpers.
  */
@@ -283,10 +230,15 @@ class MimeNode {
         }
 
         if (this.filename) {
-            // a parameter given in RFC 2231 form was decoded by libmime already
+            // A parameter given in RFC 2231 form was decoded by libmime already, which names
+            // it in decodedParams, and must not go through decodeWords as well:
+            // filename*=utf-8''a%3D%3Futf-8%3FQ%3F%3D2Eexe%3F%3D would otherwise come out as
+            // a.exe while a parser that decodes once sees the encoded word. A second scan of
+            // the raw header for the name used to decide this, and read `(c)filename*=` as
+            // a parameter named `(c)filename` once the comment was dropped from the real one
             let decoded = parsedContentDisposition.params.filename
-                ? rfc2231ParamNames(dispositionHeader).has('filename')
-                : rfc2231ParamNames(contentHeader).has('name');
+                ? parsedContentDisposition.decodedParams.includes('filename')
+                : parsedContentType.decodedParams.includes('name');
             if (!decoded) {
                 try {
                     this.filename = this.libmime.decodeWords(this.filename);

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@zone-eu/mailsplit",
-    "version": "5.4.28",
+    "version": "5.4.29",
     "description": "Split email messages into an object stream",
     "main": "index.js",
     "types": "index.d.ts",