Node.js based forum software built for the modern web
fix(uploads): replace extension-based MIME validation with content sniffing
Julian Lam668006019ba3
diff --git a/install/package.json b/install/package.jsonindex a6282b26d8..f3ade22f34 100644--- a/install/package.json+++ b/install/package.json@@ -76,6 +76,7 @@"express-useragent": "2.2.0","fetch-cookie": "3.2.0","file-loader": "6.2.0",+ "file-type": "22.0.1","fs-extra": "11.3.5","graceful-fs": "4.2.11","helmet": "8.2.0",diff --git a/src/controllers/uploads.js b/src/controllers/uploads.jsindex 0f95552e70..6e5be4fdcf 100644--- a/src/controllers/uploads.js+++ b/src/controllers/uploads.js@@ -1,6 +1,7 @@'use strict';const path = require('path');+const { fileTypeFromFile } = require('file-type');const mime = require('mime').default;const nconf = require('nconf');const validator = require('validator');@@ -48,7 +49,7 @@ uploadsController.upload = async function (req, res, filesIterator) {uploadsController.uploadPost = async function (req, res) {await uploadsController.upload(req, res, async (uploadedFile) => {- validateUploadedFileMime(uploadedFile);+ await validateUploadedFileMime(uploadedFile);const isImage = uploadedFile.type.match(/image./);if (isImage) {return await uploadAsImage(req, uploadedFile);@@ -134,7 +135,7 @@ uploadsController.uploadThumb = async function (req, res) {if (!uploadedFile.type.match(/image./)) {throw new Error('[[error:invalid-file]]');}- validateUploadedFileMime(uploadedFile);+ await validateUploadedFileMime(uploadedFile);await image.isFileTypeAllowed(uploadedFile.path);const dimensions = await image.checkDimensions(uploadedFile.path);@@ -214,8 +215,9 @@ async function saveFileToLocal(uid, folder, uploadedFile) {return data.storedFile;}-function validateUploadedFileMime(uploadedFile) {- const detectedMimeType = mime.getType(uploadedFile.name) || mime.getType(uploadedFile.path);+async function validateUploadedFileMime(uploadedFile) {+ const detected = await fileTypeFromFile(uploadedFile.path);+ const detectedMimeType = detected ? detected.mime : mime.getType(uploadedFile.name);if (detectedMimeType && uploadedFile.type && detectedMimeType !== uploadedFile.type) {throw new Error('[[error:invalid-mime-type]]');}