From 07982a3fa2e04c72e65db617697c5cb310c23694 Mon Sep 17 00:00:00 2001 From: Ben Lubar Date: Fri, 16 Jun 2017 10:37:23 -0500 Subject: [PATCH] Fix uploading a file with no extension resulting in invalid-extension even if the file extension list is blank (allow all) --- src/controllers/uploads.js | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/src/controllers/uploads.js b/src/controllers/uploads.js index cae09a5043..ab651d1325 100644 --- a/src/controllers/uploads.js +++ b/src/controllers/uploads.js @@ -217,13 +217,10 @@ uploadsController.uploadFile = function (uid, uploadedFile, callback) { }; function saveFileToLocal(uploadedFile, callback) { - var extension = path.extname(uploadedFile.name); - if (!extension || extension === '.') { - return callback(new Error('[[error:invalid-extension]]')); - } var filename = uploadedFile.name || 'upload'; + var extension = path.extname(filename) || ''; - filename = Date.now() + '-' + validator.escape(filename.replace(path.extname(uploadedFile.name) || '', '')).substr(0, 255) + extension; + filename = Date.now() + '-' + validator.escape(filename.substr(0, filename.length - extension.length)).substr(0, 255) + extension; async.waterfall([ function (next) {