Skip to content

Node.js based forum software built for the modern web

refactor: show extension

Barış Soner Uşaklı8fd62b15e9bc
diff --git a/src/controllers/uploads.js b/src/controllers/uploads.js
index 7a8fb4202f..4a2e9a3f2d 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');
@@ -210,10 +209,10 @@ async function validateFileExtension(uploadedFile) {
const blocked = file.blockedExtensions();
function validateExtension(extension) {
if (allowed.length > 0 && (!extension || extension === '.' || !allowed.includes(extension))) {
- throw new Error(`[[error:invalid-file-type, ${mime.getType(extension)}, ${allowed.join(', ')}]]`);
+ throw new Error(`[[error:invalid-file-type, ${extension}, ${allowed.join(', ')}]]`);
}
if (blocked.length > 0 && (!extension || extension === '.' || blocked.includes(extension))) {
- throw new Error(`[[error:blocked-file-type, ${mime.getType(extension) || 'unknown'}]]`);
+ throw new Error(`[[error:blocked-file-type, ${extension || 'unknown'}]]`);
}
}
const extension = path.extname(uploadedFile.name).toLowerCase();
diff --git a/test/uploads.js b/test/uploads.js
index da384bd489..10caa8cdb2 100644
--- a/test/uploads.js
+++ b/test/uploads.js
@@ -298,7 +298,7 @@ describe('Upload Controllers', () => {
const body = await response.json();
assert.strictEqual(response.status, 500);
- assert.strictEqual(body?.status?.message, 'Invalid file type text/html. Allowed types are: .png, .jpg, .bmp, .jpeg');
+ assert.strictEqual(body?.status?.message, 'Invalid file type .html. Allowed types are: .png, .jpg, .bmp, .jpeg');
} finally {
meta.config.allowedFileExtensions = oldValue;
}