libmime 4.1.2 → 4.2.1

package/.eslintrc

@@ -1,6 +1,7 @@
 {
     "rules": {
-        "indent": 0
+        "indent": 0,
+        "no-prototype-builtins": 0
     },
-    "extends":    "nodemailer"
+    "extends": "nodemailer"
 }

package/CHANGELOG.md

@@ -1,5 +1,18 @@
 # Changelog
 
+## v4.2.1 2019-10-28
+
+-   Replace jconv with more recent encoding-japanese
+
+## v4.2.0 2019-10-28
+
+-   Use jconv module to parse ISO-2022-JP by default
+
+## v4.1.4 2019-10-28
+
+-   decodeWords should also decode empty content part [WeiAnAn](9bbcfd2)
+-   fix decode base64 ending with = [WeiAnAn](6e656e2)
+
 ## v4.1.0 2019-05-01
 
 -   Experimental support for node-iconv

package/lib/charset.js

@@ -1,6 +1,7 @@
 'use strict';
 
 const iconv = require('iconv-lite');
+const encodingJapanese = require('encoding-japanese');
 const charsets = require('./charsets');
 
 /**
@@ -40,6 +41,26 @@ const charset = (module.exports = {
                 let decoder = new Iconv(fromCharset, 'UTF-8');
                 return decoder.convert(buf).toString();
             }
+
+            if (/^jis|^iso-?2022-?jp|^EUCJP/i.test(fromCharset)) {
+                if (typeof buf === 'string') {
+                    buf = Buffer.from(buf);
+                }
+                try {
+                    let output = encodingJapanese.convert(buf, {
+                        to: 'UNICODE',
+                        from: fromCharset,
+                        type: 'string'
+                    });
+                    if (typeof output === 'string') {
+                        output = Buffer.from(output);
+                    }
+                    return output;
+                } catch (err) {
+                    // ignore, defaults to iconv-lite on error
+                }
+            }
+
             return iconv.decode(buf, fromCharset);
         } catch (err) {
             // enforce utf-8, data loss might occur

package/lib/libmime.js

@@ -223,7 +223,12 @@ class Libmime {
             }
             str = Buffer.from(bytes);
         } else if (encoding === 'B') {
-            str = Buffer.from(str, 'base64');
+            str = Buffer.concat(
+                str
+                    .split('=')
+                    .filter(s => s !== '') // filter empty string
+                    .map(str => Buffer.from(str, 'base64'))
+            );
         } else {
             // keep as is, convert Buffer to unicode string, assume utf8
             str = Buffer.from(str);
@@ -289,7 +294,7 @@ class Libmime {
             (str || '')
                 .toString()
                 // find base64 words that can be joined
-                .replace(/(=\?([^?]+)\?[Bb]\?[^?]+[^^=]\?=)\s*(?==\?([^?]+)\?[Bb]\?[^?]+\?=)/g, (match, left, chLeft, chRight) => {
+                .replace(/(=\?([^?]+)\?[Bb]\?[^?]*\?=)\s*(?==\?([^?]+)\?[Bb]\?[^?]*\?=)/g, (match, left, chLeft, chRight) => {
                     // only mark b64 chunks to be joined if charsets match
                     if (libcharset.normalizeCharset(chLeft || '') === libcharset.normalizeCharset(chRight || '')) {
                         // set a joiner marker
@@ -298,7 +303,7 @@ class Libmime {
                     return match;
                 })
                 // find QP words that can be joined
-                .replace(/(=\?([^?]+)\?[Qq]\?[^?]+\?=)\s*(?==\?([^?]+)\?[Qq]\?[^?]+\?=)/g, (match, left, chLeft, chRight) => {
+                .replace(/(=\?([^?]+)\?[Qq]\?[^?]*\?=)\s*(?==\?([^?]+)\?[Qq]\?[^?]*\?=)/g, (match, left, chLeft, chRight) => {
                     // only mark QP chunks to be joined if charsets match
                     if (libcharset.normalizeCharset(chLeft || '') === libcharset.normalizeCharset(chRight || '')) {
                         // set a joiner marker
@@ -309,9 +314,9 @@ class Libmime {
                 // join base64 encoded words
                 .replace(/(\?=)?__\x00JOIN\x00__(=\?([^?]+)\?[QqBb]\?)?/g, '')
                 // remove spaces between mime encoded words
-                .replace(/(=\?[^?]+\?[QqBb]\?[^?]+\?=)\s+(?==\?[^?]+\?[QqBb]\?[^?]+\?=)/g, '$1')
+                .replace(/(=\?[^?]+\?[QqBb]\?[^?]*\?=)\s+(?==\?[^?]+\?[QqBb]\?[^?]*\?=)/g, '$1')
                 // decode words
-                .replace(/=\?([\w_\-*]+)\?([QqBb])\?([^?]+)\?=/g, (m, charset, encoding, text) => this.decodeWord(charset, encoding, text))
+                .replace(/=\?([\w_\-*]+)\?([QqBb])\?([^?]*)\?=/g, (m, charset, encoding, text) => this.decodeWord(charset, encoding, text))
         );
     }
 

package/package.json

@@ -1,7 +1,7 @@
 {
     "name": "libmime",
     "description": "Encode and decode quoted printable and base64 strings",
-    "version": "4.1.2",
+    "version": "4.2.1",
     "main": "lib/libmime",
     "homepage": "https://github.com/andris9/libmime",
     "repository": {
@@ -19,19 +19,20 @@
         "test": "grunt"
     },
     "dependencies": {
-        "iconv-lite": "0.4.24",
-        "libbase64": "1.0.3",
+        "encoding-japanese": "1.0.30",
+        "iconv-lite": "0.5.0",
+        "libbase64": "1.2.1",
         "libqp": "1.1.0"
     },
     "devDependencies": {
         "chai": "4.2.0",
         "eslint-config-nodemailer": "1.2.0",
-        "eslint-config-prettier": "4.3.0",
+        "eslint-config-prettier": "6.5.0",
         "grunt": "1.0.4",
         "grunt-cli": "1.3.2",
-        "grunt-eslint": "21.0.0",
+        "grunt-eslint": "22.0.0",
         "grunt-mocha-test": "0.13.3",
-        "iconv": "^2.3.4",
-        "mocha": "6.1.4"
+        "iconv": "2.3.5",
+        "mocha": "6.2.2"
     }
 }