Node.js based forum software built for the modern web
fix(uploads): normalize cross-platform MIME type aliases before validation
Julian Lam385b32af3287
diff --git a/src/controllers/uploads.js b/src/controllers/uploads.jsindex 8aea5aa7fa..d1876b80fd 100644--- a/src/controllers/uploads.js+++ b/src/controllers/uploads.js@@ -212,10 +212,23 @@ 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'],+]);++function normalizeMimeType(mimeType) {+ return mimeAliases.get(mimeType) || mimeType;+}+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) {+ if (detectedMimeType && uploadedFile.type &&+ normalizeMimeType(detectedMimeType) !== normalizeMimeType(uploadedFile.type)+ ) {throw new Error('[[error:invalid-mime-type]]');}}