pdfjs-dist 2.0.487 → 2.1.266

package/lib/display/content_disposition.js

@@ -2,7 +2,7 @@
  * @licstart The following is the entire license notice for the
  * Javascript code in this page
  *
- * Copyright 2017 Mozilla Foundation
+ * Copyright 2018 Mozilla Foundation
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,17 +19,25 @@
  * @licend The above is the entire license notice for the
  * Javascript code in this page
  */
-'use strict';
+"use strict";
 
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
+exports.getFilenameFromContentDispositionHeader = getFilenameFromContentDispositionHeader;
 
-var _slicedToArray = function () { function sliceIterator(arr, i) { var _arr = []; var _n = true; var _d = false; var _e = undefined; try { for (var _i = arr[Symbol.iterator](), _s; !(_n = (_s = _i.next()).done); _n = true) { _arr.push(_s.value); if (i && _arr.length === i) break; } } catch (err) { _d = true; _e = err; } finally { try { if (!_n && _i["return"]) _i["return"](); } finally { if (_d) throw _e; } } return _arr; } return function (arr, i) { if (Array.isArray(arr)) { return arr; } else if (Symbol.iterator in Object(arr)) { return sliceIterator(arr, i); } else { throw new TypeError("Invalid attempt to destructure non-iterable instance"); } }; }();
+function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _nonIterableRest(); }
+
+function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance"); }
+
+function _iterableToArrayLimit(arr, i) { var _arr = []; var _n = true; var _d = false; var _e = undefined; try { for (var _i = arr[Symbol.iterator](), _s; !(_n = (_s = _i.next()).done); _n = true) { _arr.push(_s.value); if (i && _arr.length === i) break; } } catch (err) { _d = true; _e = err; } finally { try { if (!_n && _i["return"] != null) _i["return"](); } finally { if (_d) throw _e; } } return _arr; }
+
+function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 
 function getFilenameFromContentDispositionHeader(contentDisposition) {
   var needsEncodingFixup = true;
   var tmp = toParamRegExp('filename\\*', 'i').exec(contentDisposition);
+
   if (tmp) {
     tmp = tmp[1];
     var filename = rfc2616unquote(tmp);
@@ -38,53 +46,75 @@ function getFilenameFromContentDispositionHeader(contentDisposition) {
     filename = rfc2047decode(filename);
     return fixupEncoding(filename);
   }
+
   tmp = rfc2231getparam(contentDisposition);
+
   if (tmp) {
     var _filename = rfc2047decode(tmp);
+
     return fixupEncoding(_filename);
   }
+
   tmp = toParamRegExp('filename', 'i').exec(contentDisposition);
+
   if (tmp) {
     tmp = tmp[1];
+
     var _filename2 = rfc2616unquote(tmp);
+
     _filename2 = rfc2047decode(_filename2);
     return fixupEncoding(_filename2);
   }
+
   function toParamRegExp(attributePattern, flags) {
     return new RegExp('(?:^|;)\\s*' + attributePattern + '\\s*=\\s*' + '(' + '[^";\\s][^;\\s]*' + '|' + '"(?:[^"\\\\]|\\\\"?)+"?' + ')', flags);
   }
+
   function textdecode(encoding, value) {
     if (encoding) {
-      if (!/^[^\x00-\xFF]+$/.test(value)) {
+      if (!/^[\x00-\xFF]+$/.test(value)) {
         return value;
       }
+
       try {
-        var decoder = new TextDecoder(encoding, { fatal: true });
-        var bytes = new Array(value.length);
-        for (var i = 0; i < value.length; ++i) {
-          bytes[i] = value.charCodeAt(0);
-        }
+        var decoder = new TextDecoder(encoding, {
+          fatal: true
+        });
+        var bytes = Array.from(value, function (ch) {
+          return ch.charCodeAt(0) & 0xFF;
+        });
         value = decoder.decode(new Uint8Array(bytes));
         needsEncodingFixup = false;
       } catch (e) {
         if (/^utf-?8$/i.test(encoding)) {
-          value = decodeURIComponent(escape(value));
-          needsEncodingFixup = false;
+          try {
+            value = decodeURIComponent(escape(value));
+            needsEncodingFixup = false;
+          } catch (err) {}
         }
       }
     }
+
     return value;
   }
+
   function fixupEncoding(value) {
     if (needsEncodingFixup && /[\x80-\xff]/.test(value)) {
-      return textdecode('utf-8', value);
+      value = textdecode('utf-8', value);
+
+      if (needsEncodingFixup) {
+        value = textdecode('iso-8859-1', value);
+      }
     }
+
     return value;
   }
+
   function rfc2231getparam(contentDisposition) {
     var matches = [],
-        match = void 0;
+        match;
     var iter = toParamRegExp('filename\\*((?!0\\d)\\d+)(\\*?)', 'ig');
+
     while ((match = iter.exec(contentDisposition)) !== null) {
       var _match = match,
           _match2 = _slicedToArray(_match, 4),
@@ -93,64 +123,84 @@ function getFilenameFromContentDispositionHeader(contentDisposition) {
           part = _match2[3];
 
       n = parseInt(n, 10);
+
       if (n in matches) {
         if (n === 0) {
           break;
         }
+
         continue;
       }
+
       matches[n] = [quot, part];
     }
+
     var parts = [];
-    for (var _n = 0; _n < matches.length; ++_n) {
-      if (!(_n in matches)) {
+
+    for (var n = 0; n < matches.length; ++n) {
+      if (!(n in matches)) {
         break;
       }
 
-      var _matches$_n = _slicedToArray(matches[_n], 2),
-          _quot = _matches$_n[0],
-          _part = _matches$_n[1];
+      var _matches$n = _slicedToArray(matches[n], 2),
+          quot = _matches$n[0],
+          part = _matches$n[1];
 
-      _part = rfc2616unquote(_part);
-      if (_quot) {
-        _part = unescape(_part);
-        if (_n === 0) {
-          _part = rfc5987decode(_part);
+      part = rfc2616unquote(part);
+
+      if (quot) {
+        part = unescape(part);
+
+        if (n === 0) {
+          part = rfc5987decode(part);
         }
       }
-      parts.push(_part);
+
+      parts.push(part);
     }
+
     return parts.join('');
   }
+
   function rfc2616unquote(value) {
-    if (value.charAt(0) === '"') {
+    if (value.startsWith('"')) {
       var parts = value.slice(1).split('\\"');
+
       for (var i = 0; i < parts.length; ++i) {
         var quotindex = parts[i].indexOf('"');
+
         if (quotindex !== -1) {
           parts[i] = parts[i].slice(0, quotindex);
           parts.length = i + 1;
         }
+
         parts[i] = parts[i].replace(/\\(.)/g, '$1');
       }
+
       value = parts.join('"');
     }
+
     return value;
   }
+
   function rfc5987decode(extvalue) {
     var encodingend = extvalue.indexOf('\'');
+
     if (encodingend === -1) {
       return extvalue;
     }
+
     var encoding = extvalue.slice(0, encodingend);
     var langvalue = extvalue.slice(encodingend + 1);
     var value = langvalue.replace(/^[^']*'/, '');
     return textdecode(encoding, value);
   }
+
   function rfc2047decode(value) {
-    if (value.slice(0, 2) !== '=?' || /[\x00-\x19\x80-\xff]/.test(value)) {
+    if (!value.startsWith('=?') || /[\x00-\x19\x80-\xff]/.test(value)) {
       return value;
     }
+
     return value.replace(/=\?([\w-]*)\?([QqBb])\?((?:[^?]|\?(?!=))*)\?=/g, function (_, charset, encoding, text) {
       if (encoding === 'q' || encoding === 'Q') {
         text = text.replace(/_/g, ' ');
@@ -159,13 +209,14 @@ function getFilenameFromContentDispositionHeader(contentDisposition) {
         });
         return textdecode(charset, text);
       }
+
       try {
-        return atob(text);
-      } catch (e) {
-        return text;
-      }
+        text = atob(text);
+      } catch (e) {}
+
+      return textdecode(charset, text);
     });
   }
+
   return '';
-}
-exports.getFilenameFromContentDispositionHeader = getFilenameFromContentDispositionHeader;
+}