Skip to content

Node.js based forum software built for the modern web

refactor: mime type checking

Barış Soner Uşaklı5e8160a358d5
diff --git a/src/controllers/uploads.js b/src/controllers/uploads.js
index 0975998c24..0a65b40000 100644
--- a/src/controllers/uploads.js
+++ b/src/controllers/uploads.js
@@ -2,7 +2,6 @@
const path = require('path');
const { fileTypeFromFile } = require('file-type');
-const mime = require('mime').default;
const nconf = require('nconf');
const user = require('../user');
@@ -42,8 +41,8 @@ uploadsController.upload = async function (req, res, filesIterator) {
uploadsController.uploadPost = async function (req, res) {
await uploadsController.upload(req, res, async (uploadedFile) => {
- await validateUploadedFileMime(uploadedFile);
- const isImage = uploadedFile.type.match(/image./);
+ const detected = await fileTypeFromFile(uploadedFile.path);
+ const isImage = detected && detected.mime.startsWith('image/');
if (isImage) {
return await uploadAsImage(req, uploadedFile);
}
@@ -129,10 +128,12 @@ uploadsController.uploadThumb = async function (req, res) {
if (!canUpload) {
throw new Error('[[error:no-privileges]]');
}
- if (!uploadedFile.type.match(/image./)) {
+ const detected = await fileTypeFromFile(uploadedFile.path);
+ const isImage = detected && detected.mime.startsWith('image/');
+ if (!isImage) {
throw new Error('[[error:invalid-file]]');
}
- await validateUploadedFileMime(uploadedFile);
+
await image.isFileTypeAllowed(uploadedFile.path);
const dimensions = await image.checkDimensions(uploadedFile.path);
@@ -176,16 +177,7 @@ uploadsController.uploadFile = async function (uid, uploadedFile) {
throw new Error(`[[error:file-too-big, ${meta.config.maximumFileSize}]]`);
}
- const allowed = file.allowedExtensions();
- const blocked = file.blockedExtensions();
-
- const extension = path.extname(uploadedFile.name).toLowerCase();
- if (allowed.length > 0 && (!extension || extension === '.' || !allowed.includes(extension))) {
- throw new Error(`[[error:invalid-file-type, ${allowed.join(', ')}]]`);
- }
- if (blocked.length > 0 && (!extension || extension === '.' || blocked.includes(extension))) {
- throw new Error(`[[error:blocked-file-type, ${extension || 'unknown'}]]`);
- }
+ await validateFileExtension(uploadedFile);
return await saveFileToLocal(uid, 'files', uploadedFile);
};
@@ -212,28 +204,18 @@ async function saveFileToLocal(uid, folder, uploadedFile) {
return data.storedFile;
}
-const mimeAliases = new Map([
- ['application/x-zip-compressed', 'application/zip'],
- ['audio/x-wav', 'audio/wav'],
- ['video/x-msvideo', 'video/avi'],
- ['image/vnd.microsoft.icon', 'image/x-icon'],
- ['application/vnd.rar', 'application/x-rar-compressed'],
-]);
-
-function normalizeMimeType(mimeType) {
- return mimeAliases.get(mimeType) || mimeType;
-}
-
-async function validateUploadedFileMime(uploadedFile) {
+async function validateFileExtension(uploadedFile) {
const detected = await fileTypeFromFile(uploadedFile.path);
- const detectedMimeType = detected ? detected.mime : mime.getType(uploadedFile.name);
- if (
- detectedMimeType &&
- uploadedFile.type &&
- uploadedFile.type !== 'application/octet-stream' &&
- normalizeMimeType(detectedMimeType) !== normalizeMimeType(uploadedFile.type)
- ) {
- throw new Error('[[error:invalid-mime-type]]');
+ const allowed = file.allowedExtensions();
+ const blocked = file.blockedExtensions();
+
+ // if we cant detect with magic bytes fall back to file extension
+ const extension = detected ? `.${detected.ext}` : path.extname(uploadedFile.name).toLowerCase();
+ if (allowed.length > 0 && (!extension || extension === '.' || !allowed.includes(extension))) {
+ throw new Error(`[[error:invalid-file-type, ${allowed.join(', ')}]]`);
+ }
+ if (blocked.length > 0 && (!extension || extension === '.' || blocked.includes(extension))) {
+ throw new Error(`[[error:blocked-file-type, ${extension || 'unknown'}]]`);
}
}
diff --git a/test/uploads.js b/test/uploads.js
index fbb11daefa..02da8c3627 100644
--- a/test/uploads.js
+++ b/test/uploads.js
@@ -275,9 +275,9 @@ describe('Upload Controllers', () => {
assert(body && body.status && body.status.message);
});
- it('should fail to upload file if extension and mime type do not match', async () => {
+ it('should fail to upload file if extension is not allowed', async () => {
const oldValue = meta.config.allowedFileExtensions;
- meta.config.allowedFileExtensions = 'png,jpg,bmp,html';
+ meta.config.allowedFileExtensions = 'png,jpg,bmp';
try {
const uploadEndPoint = `${nconf.get('url')}/api/post/upload`;
@@ -298,7 +298,7 @@ describe('Upload Controllers', () => {
const body = await response.json();
assert.strictEqual(response.status, 500);
- assert.strictEqual(body?.status?.message, 'Invalid MIME type');
+ assert.strictEqual(body?.status?.message, 'Invalid file type. Allowed types are: .png, .jpg, .bmp, .jpeg');
} finally {
meta.config.allowedFileExtensions = oldValue;
}