libmime 2.0.0 → 2.1.0

package/.eslintrc.js

@@ -45,7 +45,8 @@ module.exports = {
         'no-bitwise': 2,
         'no-lonely-if': 2,
         'no-mixed-spaces-and-tabs': 2,
-        'no-console': 0
+        'no-console': 2,
+        'no-control-regex': 0
     },
     env: {
         es6: false,

package/CHANGELOG.md

@@ -1,5 +1,21 @@
 # Changelog
 
+## v2.1.0 2016-07-24
+
+  * Changed handling of base64 encoded mime words where multiple words are joined together if possible. This fixes issues with multi byte characters getting split into different mime words (against the RFC but occurs)
+
+## v2.0.3 2016-02-29
+
+  * Fixed an issue with rfc2231 filenames
+
+## v2.0.2 2016-02-11
+
+  * Fixed an issue with base64 mime words encoding
+
+## v2.0.1 2016-02-11
+
+  * Fix base64 mime-word encoding. Final string length was calculated invalidly
+
 ## v2.0.0 2016-01-04
 
   * Replaced jshint with eslint

package/lib/charset.js

@@ -72,7 +72,7 @@ var charset = module.exports = {
             return 'UTF-' + match[1];
         }
 
-        if ((match = charset.match(/^win[\-_]?(\d+)$/i))) {
+        if ((match = charset.match(/^win(?:dows)?[\-_]?(\d+)$/i))) {
             return 'WINDOWS-' + match[1];
         }
 

package/lib/libmime.js

@@ -105,7 +105,7 @@ var libmime = module.exports = {
 
         var encodedStr,
             toCharset = 'UTF-8',
-            i, len, parts;
+            i, len, parts, lpart, chr;
 
         if (maxLength && maxLength > 7 + toCharset.length) {
             maxLength -= (7 + toCharset.length);
@@ -123,18 +123,30 @@ var libmime = module.exports = {
             });
         } else if (mimeWordEncoding === 'B') {
             encodedStr = typeof data === 'string' ? data : libbase64.encode(data);
-            maxLength = Math.max(3, (maxLength - maxLength % 4) / 4 * 3);
+            maxLength = maxLength ? Math.max(3, (maxLength - maxLength % 4) / 4 * 3) : 0;
         }
 
-        if (maxLength && encodedStr.length > maxLength) {
+        if (maxLength && (mimeWordEncoding !== 'B' ? encodedStr : libbase64.encode(data)).length > maxLength) {
             if (mimeWordEncoding === 'Q') {
                 encodedStr = splitMimeEncodedString(encodedStr, maxLength).join('?= =?' + toCharset + '?' + mimeWordEncoding + '?');
             } else {
-
                 // RFC2047 6.3 (2) states that encoded-word must include an integral number of characters, so no chopping unicode sequences
                 parts = [];
-                for (i = 0, len = encodedStr.length; i < len; i += maxLength) {
-                    parts.push(libbase64.encode(encodedStr.substr(i, maxLength)));
+                lpart = '';
+                for (i = 0, len = encodedStr.length; i < len; i++) {
+                    chr = encodedStr.charAt(i);
+                    // check if we can add this character to the existing string
+                    // without breaking byte length limit
+                    if (Buffer.byteLength(lpart + chr) <= maxLength || i === 0) {
+                        lpart += chr;
+                    } else {
+                        // we hit the length limit, so push the existing string and start over
+                        parts.push(libbase64.encode(lpart));
+                        lpart = chr;
+                    }
+                }
+                if (lpart) {
+                    parts.push(libbase64.encode(lpart));
                 }
 
                 if (parts.length > 1) {
@@ -217,14 +229,29 @@ var libmime = module.exports = {
      * @return {String} Decoded unicode string
      */
     decodeWords: function (str) {
-        str = (str || '').toString();
-        str = str.
+        return (str || '').toString().
+
+        // find base64 words that can be joined
+        replace(/(=\?([^?]+)\?[Bb]\?[^?]+[^^=]\?=)\s*(?==\?([^?]+)\?[Bb]\?[^?]+\?=)/g,
+            function (match, left, chLeft, chRight) {
+                // only mark to b64 chunks to be joined if charsets match
+                if (libcharset.normalizeCharset(chLeft || '').toLowerCase().trim() === libcharset.normalizeCharset(chRight || '').toLowerCase().trim()) {
+                    // set a joiner marker
+                    return left + '__\x00JOIN\x00__';
+                }
+                return match;
+            }).
+
+        // join base64 encoded words
+        replace(/(\?=)?__\x00JOIN\x00__(=\?([^?]+)\?[Bb]\?)?/g, '').
+
+        // remove spaces between mime encoded words
         replace(/(=\?[^?]+\?[QqBb]\?[^?]+\?=)\s+(?==\?[^?]+\?[QqBb]\?[^?]+\?=)/g, '$1').
+
+        // decode words
         replace(/\=\?([\w_\-\*]+)\?([QqBb])\?[^\?]+\?\=/g, function (mimeWord) {
             return libmime.decodeWord(mimeWord);
         });
-
-        return str;
     },
 
     /**
@@ -293,7 +320,7 @@ var libmime = module.exports = {
             var value = structured.params[param];
             if (!libmime.isPlainText(value) || value.length >= 75) {
                 libmime.buildHeaderParam(param, value, 50).forEach(function (encodedParam) {
-                    if (!/[\s"\\;\/=]|^[\-']|'$/.test(encodedParam.value)) {
+                    if (!/[\s"\\;\/=]|^[\-']|'$/.test(encodedParam.value) || encodedParam.key.substr(-1) === '*') {
                         paramsArray.push(encodedParam.key + '=' + encodedParam.value);
                     } else {
                         paramsArray.push(encodedParam.key + '=' + JSON.stringify(encodedParam.value));

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "libmime",
   "description": "Encode and decode quoted printable and base64 strings",
-  "version": "2.0.0",
+  "version": "2.1.0",
   "main": "lib/libmime",
   "homepage": "https://github.com/andris9/libmime",
   "repository": {
@@ -16,7 +16,7 @@
   ],
   "author": "Andris Reinman <andris@kreata.ee>",
   "scripts": {
-    "test": "grunt"
+    "test": "grunt mochaTest"
   },
   "dependencies": {
     "iconv-lite": "0.4.13",
@@ -24,10 +24,11 @@
     "libqp": "1.1.0"
   },
   "devDependencies": {
-    "chai": "^3.4.1",
-    "grunt": "^0.4.5",
-    "grunt-eslint": "^17.3.1",
+    "chai": "^3.5.0",
+    "grunt": "^1.0.1",
+    "grunt-cli": "^1.2.0",
+    "grunt-eslint": "^19.0.0",
     "grunt-mocha-test": "^0.12.7",
-    "mocha": "^2.3.4"
+    "mocha": "^3.0.2"
   }
 }