libmime 2.0.3 → 2.1.3

package/.eslintrc.js

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

package/CHANGELOG.md

@@ -1,5 +1,21 @@
 # Changelog
 
+## v2.1.3 2016-12-08
+
+  * Revert dot as a special symbol
+
+## v2.1.2 2016-11-21
+
+  * Quote special symbols as defined in RFC (surajwy)
+
+## v2.1.1 2016-11-15
+
+  * Fixed issue with special symbols in attachment filenames
+
+## 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

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

@@ -184,7 +184,15 @@ var libmime = module.exports = {
         fromCharset = match[1].split('*').shift();
 
         encoding = (match[2] || 'Q').toString().toUpperCase();
-        str = (match[3] || '').replace(/_/g, ' ').replace(/ $/, '=20');
+        str = (match[3] || '');
+
+        if (encoding === 'Q') {
+            // remove spaces between = and hex char, this might indicate invalidly applied line splitting
+            str = str.replace(/=\s+([0-9a-fA-F])/, '=$1');
+        }
+
+        // convert all underscores to spaces
+        str = str.replace(/_/g, ' ').replace(/ $/, '=20');
 
         if (encoding === 'B') {
             return libcharset.decode(libbase64.decode(str), fromCharset);
@@ -229,14 +237,40 @@ 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 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;
+            }).
+
+        // find QP words that can be joined
+        replace(/(=\?([^?]+)\?[Qq]\?[^?]+\?=)\s*(?==\?([^?]+)\?[Qq]\?[^?]+\?=)/g,
+            function (match, left, chLeft, chRight) {
+                // only mark QP 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__(=\?([^?]+)\?[QqBb]\?)?/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 +327,8 @@ var libmime = module.exports = {
 
     /**
      * Joins parsed header value together as 'value; param1=value1; param2=value2'
-     *
+     * PS: We are following RFC 822 for the list of special characters that we need to keep in quotes.
+     *      Refer: https://www.w3.org/Protocols/rfc1341/4_Content-Type.html
      * @param {Object} structured Parsed header value
      * @return {String} joined header value
      */
@@ -305,13 +340,13 @@ 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) || encodedParam.key.substr(-1) === '*') {
+                    if (!/[\s"\\;:\/=\(\),<>@\[\]\?]|^[\-']|'$/.test(encodedParam.value) || encodedParam.key.substr(-1) === '*') {
                         paramsArray.push(encodedParam.key + '=' + encodedParam.value);
                     } else {
                         paramsArray.push(encodedParam.key + '=' + JSON.stringify(encodedParam.value));
                     }
                 });
-            } else if (/[\s'"\\;\/=]|^\-/.test(value)) {
+            } else if (/[\s'"\\;:\/=\(\),<>@\[\]\?]|^\-/.test(value)) {
                 paramsArray.push(param + '=' + JSON.stringify(value));
             } else {
                 paramsArray.push(param + '=' + value);

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "libmime",
   "description": "Encode and decode quoted printable and base64 strings",
-  "version": "2.0.3",
+  "version": "2.1.3",
   "main": "lib/libmime",
   "homepage": "https://github.com/andris9/libmime",
   "repository": {
@@ -16,19 +16,19 @@
   ],
   "author": "Andris Reinman <andris@kreata.ee>",
   "scripts": {
-    "test": "grunt"
+    "test": "grunt mochaTest"
   },
   "dependencies": {
-    "iconv-lite": "0.4.13",
+    "iconv-lite": "0.4.15",
     "libbase64": "0.1.0",
     "libqp": "1.1.0"
   },
   "devDependencies": {
     "chai": "^3.5.0",
-    "grunt": "^0.4.5",
-    "grunt-cli": "^0.1.13",
-    "grunt-eslint": "^18.0.0",
-    "grunt-mocha-test": "^0.12.7",
-    "mocha": "^2.4.5"
+    "grunt": "^1.0.1",
+    "grunt-cli": "^1.2.0",
+    "grunt-eslint": "^19.0.0",
+    "grunt-mocha-test": "^0.13.2",
+    "mocha": "^3.2.0"
   }
 }