Update to multer 1.3.1 and automatically clean uploaded files (#4704)

* Update to multer 1.3.1 and automatically clean uploaded files

* Fix typo in bindBodyParser

* Add missing next() (thanks @ttsirkia!)

admin/server/app/createDynamicRouter.js

@@ -1,6 +1,7 @@
 var bodyParser = require('body-parser');
 var express = require('express');
-var multer = require('multer');
+
+var uploads = require('../../../lib/uploads');
 
 module.exports = function createDynamicRouter (keystone) {
 	// ensure keystone nav has been initialised
@@ -17,7 +18,7 @@ module.exports = function createDynamicRouter (keystone) {
 	// Use bodyParser and multer to parse request bodies and file uploads
 	router.use(bodyParser.json({}));
 	router.use(bodyParser.urlencoded({ extended: true }));
-	router.use(multer({ includeEmptyFields: true }));
+	uploads.configure(router);
 
 	// Bind the request to the keystone instance
 	router.use(function (req, res, next) {

index.js

@@ -38,6 +38,7 @@ var Keystone = function () {
 		'module root': moduleRoot,
 		'frame guard': 'sameorigin',
 		'cache admin bundles': true,
+		'handle uploads': true,
 	};
 	this._redirects = {};
 

lib/uploads.js

@@ -0,0 +1,41 @@
+var fs = require('fs');
+var multer = require('multer');
+var os = require('os');
+
+function handleUploadedFiles (req, res, next) {
+	if (!req.files || !Array.isArray(req.files)) return next();
+	var originalFiles = req.files;
+	var files = {};
+	originalFiles.forEach(function (i) {
+		if (i.fieldname in files) {
+			var tmp = files[i.fieldname];
+			files[i.fieldname] = [tmp];
+		}
+		if (Array.isArray(files[i.fieldname])) {
+			files[i.fieldname].push(i);
+		} else {
+			files[i.fieldname] = i;
+		}
+	});
+	req.files = files;
+	var cleanup = function () {
+		originalFiles.forEach(function (i) {
+			if (i.path) {
+				fs.unlink(i.path, function () {});
+			}
+		});
+	};
+	res.on('close', cleanup);
+	res.on('finish', cleanup);
+	next();
+};
+
+exports.handleUploadedFiles = handleUploadedFiles;
+
+exports.configure = function (app, options) {
+	var upload = multer(options || {
+		dest: os.tmpdir(),
+	});
+	app.use(upload.any());
+	app.use(handleUploadedFiles);
+};

package.json

@@ -62,7 +62,7 @@
     "moment": "^2.19.3",
     "mongoose": "^4.13.14",
     "morgan": "^1.9.0",
-    "multer": "^0.1.8",
+    "multer": "^1.3.1",
     "numeral": "^2.0.6",
     "object-assign": "^4.1.1",
     "qs": "^6.5.2",

server/bindBodyParser.js

@@ -1,7 +1,8 @@
-var multer = require('multer');
 var bodyParser = require('body-parser');
 
-module.exports = function bindIPRestrictions (keystone, app) {
+var uploads = require('../lib/uploads');
+
+module.exports = function bindBodyParser (keystone, app) {
 	// Set up body options and cookie parser
 	var bodyParserParams = {};
 	if (keystone.get('file limit')) {
@@ -10,7 +11,7 @@ module.exports = function bindIPRestrictions (keystone, app) {
 	app.use(bodyParser.json(bodyParserParams));
 	bodyParserParams.extended = true;
 	app.use(bodyParser.urlencoded(bodyParserParams));
-	app.use(multer({
-		includeEmptyFields: true,
-	}));
+	if (keystone.get('handle uploads')) {
+		uploads.configure(app, keystone.get('multer options'));
+	}
 };