Filename can be a nested path

sebdeckers · sebdeckers · commit 04f974614ddb · 2017-06-11T09:47:28.000+08:00
diff --git a/lib/form_data.js b/lib/form_data.js
@@ -211,18 +211,21 @@ FormData.prototype._getContentDisposition = function(value, options) {
 
   var contentDisposition;
 
-  // custom filename takes precedence
+  // custom filepath or filename take precedence
   // fs- and request- streams have path property
   // formidable and the browser add a name property.
-  var filename = options.filename || value.name || value.path;
+  var filename = options.filepath || options.filename || value.name || value.path;
 
   // or try http response
   if (!filename && value.readable && value.hasOwnProperty('httpVersion')) {
     filename = value.client._httpMessage.path;
   }
 
   if (filename) {
-    contentDisposition = 'filename="' + path.basename(filename) + '"';
+    if (!options.filepath) {
+      filename = path.basename(filename);
+    }
+    contentDisposition = 'filename="' + filename + '"';
   }
 
   return contentDisposition;
diff --git a/test/integration/test-custom-filename.js b/test/integration/test-custom-filename.js
@@ -35,6 +35,10 @@ var server = http.createServer(function(req, res) {
     assert.strictEqual(files['custom_filename'].name, options.filename, 'Expects custom filename');
     assert.strictEqual(files['custom_filename'].type, mime.lookup(knownFile), 'Expects original content-type');
 
+    assert('custom_filepath' in files);
+    assert.strictEqual(files['custom_filepath'].name, common.dir.fixture + '/' + options.filename, 'Expects custom filename');
+    assert.strictEqual(files['custom_filepath'].type, mime.lookup(knownFile), 'Expects original content-type');
+
     assert('unknown_with_filename' in files);
     assert.strictEqual(files['unknown_with_filename'].name, options.filename, 'Expects custom filename');
     assert.strictEqual(files['unknown_with_filename'].type, mime.lookup(options.filename), 'Expects filename-derived content-type');
@@ -67,6 +71,8 @@ server.listen(common.port, function() {
   form.append('unknown_with_filename', fs.createReadStream(unknownFile), options.filename);
   // Filename only with unknown file
   form.append('unknown_with_filename_as_object', fs.createReadStream(unknownFile), {filename: options.filename});
+  // Filename with nested path
+  form.append('custom_filepath', fs.createReadStream(knownFile), {filepath: common.dir.fixture + '/' + options.filename});
   // No options or implicit file type from extension on name property.
   var customNameStream = fs.createReadStream(unknownFile);
   customNameStream.name = options.filename;
