@poppinss/multiparty 1.0.2 → 2.0.0

package/HISTORY.md

@@ -1,3 +1,10 @@
+unreleased
+==========
+
+  * Fix handling of unquoted values in `Content-Disposition`
+  * deps: http-errors@~1.8.1
+    - deps: toidentifier@1.0.1
+
 4.2.2 / 2020-07-27
 ==================
 

package/README.md

@@ -113,14 +113,14 @@ form.on('part', function(part) {
   // You *must* act on the part by reading it
   // NOTE: if you want to ignore it, just call "part.resume()"
 
-  if (!part.filename) {
+  if (part.filename === undefined) {
     // filename is not defined when this is a field and not a file
     console.log('got field named ' + part.name);
     // ignore field's content
     part.resume();
   }
 
-  if (part.filename) {
+  if (part.filename !== undefined) {
     // filename is defined when this is a file
     count++;
     console.log('got file named ' + part.name);

package/index.js

@@ -42,7 +42,9 @@ var Z = 122;
 var CONTENT_TYPE_RE = /^multipart\/(?:form-data|related)(?:;|$)/i;
 var CONTENT_TYPE_PARAM_RE = /;\s*([^=]+)=(?:"([^"]+)"|([^;]+))/gi;
 var FILE_EXT_RE = /(\.[_\-a-zA-Z0-9]{0,16})[\S\s]*/;
+var FILENAME_PARAM_RE = /\bfilename=(?:"(.*?)"|([!#$%&'*+.0-9A-Z^_`a-z|~-]+))($|; )/i
 var LAST_BOUNDARY_SUFFIX_LEN = 4; // --\r\n
+var NAME_PARAM_RE = /\bname=(?:"([^"]+)"|([!#$%&'*+.0-9A-Z^_`a-z|~-]+))/i
 
 exports.Form = Form;
 
@@ -458,8 +460,8 @@ Form.prototype.onParseHeaderEnd = function() {
 
   var m;
   if (this.headerField === 'content-disposition') {
-    if (m = this.headerValue.match(/\bname="([^"]+)"/i)) {
-      this.partName = m[1];
+    if (m = NAME_PARAM_RE.exec(this.headerValue)) {
+      this.partName = m[1] || m[2] || ''
     }
     this.partFilename = parseFilename(this.headerValue);
   } else if (this.headerField === 'content-transfer-encoding') {
@@ -795,7 +797,7 @@ function uploadPath(baseDir, filename) {
 }
 
 function parseFilename(headerValue) {
-  var m = headerValue.match(/\bfilename="(.*?)"($|; )/i);
+  var m = FILENAME_PARAM_RE.exec(headerValue)
   if (!m) {
     m = headerValue.match(/\bfilename\*=utf-8''(.*?)($|; )/i)
     if (m) {
@@ -805,7 +807,7 @@ function parseFilename(headerValue) {
     }
   }
 
-  var filename = m[1];
+  var filename = m[1] || m[2] || '';
   filename = filename.replace(/%22|\\"/g, '"');
   filename = filename.replace(/&#([\d]{4});/g, function(m, code) {
     return String.fromCharCode(code);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@poppinss/multiparty",
-  "version": "1.0.2",
+  "version": "2.0.0",
   "description": "multipart/form-data parser which supports streaming",
   "main": "index.js",
   "license": "MIT",
@@ -12,15 +12,15 @@
     "s3"
   ],
   "dependencies": {
-    "http-errors": "~1.8.0",
+    "http-errors": "^2.0.0",
     "safe-buffer": "5.2.1",
     "uid-safe": "2.1.5"
   },
   "devDependencies": {
-    "eslint": "^7.27.0",
-    "eslint-plugin-markdown": "^2.2.0",
+    "eslint": "^8.5.0",
+    "eslint-plugin-markdown": "2.2.1",
     "mkdirp": "^1.0.4",
-    "mocha": "^8.4.0",
+    "mocha": "^9.1.3",
     "nyc": "15.1.0",
     "pend": "1.2.0",
     "require-all": "3.0.0",
@@ -34,8 +34,10 @@
     "index.js"
   ],
   "scripts": {
-    "lint": "eslint --plugin markdown --ext js,md .",
-    "test": "mocha --reporter spec --bail --check-leaks test/"
+    "lint": "eslint .",
+    "test": "mocha --reporter spec --bail --check-leaks test/",
+    "test-ci": "nyc --reporter=lcov --reporter=text npm test",
+    "test-cov": "nyc --reporter=html --reporter=text npm test"
   },
   "directories": {
     "example": "examples",