Skip to content

Node.js based forum software built for the modern web

refactor: validate extensions first before processing upload

Barış Soner Uşaklı75e8771fe403
diff --git a/src/controllers/uploads.js b/src/controllers/uploads.js
index 6f60456b5a..9f5d37ae5e 100644
--- a/src/controllers/uploads.js
+++ b/src/controllers/uploads.js
@@ -26,6 +26,7 @@ uploadsController.upload = async function (req, res, filesIterator) {
const images = [];
for (const fileObj of files) {
/* eslint-disable no-await-in-loop */
+ await validateFileExtension(fileObj);
images.push(await filesIterator(fileObj));
}
@@ -119,12 +120,12 @@ uploadsController.uploadThumb = async function (req, res) {
if (!meta.config.allowTopicsThumbnail) {
return helpers.formatApiResponse(503, res, new Error('[[error:topic-thumbnails-are-disabled]]'));
}
+ const canUpload = await privileges.global.can('upload:post:image', req.uid);
+ if (!canUpload) {
+ throw new Error('[[error:no-privileges]]');
+ }
return await uploadsController.upload(req, res, async (uploadedFile) => {
- const canUpload = await privileges.global.can('upload:post:image', req.uid);
- if (!canUpload) {
- throw new Error('[[error:no-privileges]]');
- }
const detected = await fileTypeFromFile(uploadedFile.path);
const isImage = detected && detected.mime.startsWith('image/');
if (!isImage) {
@@ -174,8 +175,6 @@ uploadsController.uploadFile = async function (uid, uploadedFile) {
throw new Error(`[[error:file-too-big, ${meta.config.maximumFileSize}]]`);
}
- await validateFileExtension(uploadedFile);
-
return await saveFileToLocal(uid, 'files', uploadedFile);
};
diff --git a/src/groups/cover.js b/src/groups/cover.js
index 1eb36ffe4f..c9098ec4f7 100644
--- a/src/groups/cover.js
+++ b/src/groups/cover.js
@@ -3,8 +3,10 @@
const path = require('path');
const nconf = require('nconf');
+const { fileTypeFromFile } = require('file-type');
const db = require('../database');
+const meta = require('../meta');
const image = require('../image');
const file = require('../file');
@@ -24,13 +26,20 @@ module.exports = function (Groups) {
if (!data.imageData && !data.file && data.position) {
return await Groups.updateCoverPosition(data.groupName, data.position);
}
- const type = data.file ? data.file.type : image.mimeFromBase64(data.imageData);
- if (!type || !allowedTypes.includes(type)) {
- throw new Error('[[error:invalid-image]]');
- }
- if (!tempPath) {
- tempPath = await image.writeImageDataToTempFile(data.imageData);
+ let type;
+ if (tempPath) {
+ const detected = await fileTypeFromFile(tempPath);
+ if (!detected || !allowedTypes.includes(detected.mime)) {
+ throw new Error('[[error:invalid-image]]');
+ }
+ type = detected.mime;
+ } else {
+ const imageData = await image.validateBase64(
+ data.imageData, meta.config.maximumCoverImageSize, allowedTypes
+ );
+ tempPath = await image.writeImageDataToTempFile(imageData);
+ type = imageData.mime;
}
await deleteCover(data.groupName);
diff --git a/src/image.js b/src/image.js
index 90f6c86623..8216c9a22a 100644
--- a/src/image.js
+++ b/src/image.js
@@ -5,6 +5,7 @@ const fs = require('fs');
const path = require('path');
const crypto = require('crypto');
const winston = require('winston');
+const { fileTypeFromBuffer } = require('file-type');
const file = require('./file');
const plugins = require('./plugins');
@@ -140,25 +141,33 @@ image.convertImageToBase64 = async function (path) {
return await fs.promises.readFile(path, 'base64');
};
-image.mimeFromBase64 = function (imageData) {
- return imageData.slice(5, imageData.indexOf('base64') - 1);
-};
-
-image.extensionFromBase64 = function (imageData) {
- return file.typeToExtension(image.mimeFromBase64(imageData));
-};
+image.validateBase64 = async function (imageData, maxSize, allowedTypes) {
+ if (!imageData) {
+ throw new Error('[[error:invalid-data]]');
+ }
-image.writeImageDataToTempFile = async function (imageData) {
- const filename = crypto.createHash('md5').update(imageData).digest('hex');
+ const match = /^data:[^;,]+;base64,(.+)$/.exec(imageData);
+ if (!match) {
+ throw new Error('[[error:invalid-data]]');
+ }
+ const buffer = Buffer.from(match[1], 'base64');
- const type = image.mimeFromBase64(imageData);
- const extension = file.typeToExtension(type);
+ if (buffer.length > maxSize * 1024) {
+ throw new Error(`[[error:file-too-big, ${maxSize}]]`);
+ }
- const filepath = path.join(os.tmpdir(), filename + extension);
+ const detected = await fileTypeFromBuffer(buffer);
+ if (!detected || !allowedTypes.includes(detected.mime)) {
+ throw new Error('[[error:invalid-image]]');
+ }
- const buffer = Buffer.from(imageData.slice(imageData.indexOf('base64') + 7), 'base64');
+ return { buffer, mime: detected.mime, extension: `.${detected.ext}` };
+};
- await fs.promises.writeFile(filepath, buffer, { encoding: 'base64' });
+image.writeImageDataToTempFile = async function (imageData) {
+ const filename = crypto.createHash('md5').update(imageData.buffer).digest('hex');
+ const filepath = path.join(os.tmpdir(), filename + imageData.extension);
+ await fs.promises.writeFile(filepath, imageData.buffer, { encoding: 'base64' });
return filepath;
};
diff --git a/src/user/picture.js b/src/user/picture.js
index c379705422..eeeb70ee24 100644
--- a/src/user/picture.js
+++ b/src/user/picture.js
@@ -4,6 +4,7 @@ const winston = require('winston');
const mime = require('mime').default;
const path = require('path');
const nconf = require('nconf');
+const { fileTypeFromFile } = require('file-type');
const db = require('../database');
const file = require('../file');
@@ -44,11 +45,13 @@ module.exports = function (User) {
return await User.updateCoverPosition(data.uid, data.position);
}
- validateUpload(data, meta.config.maximumCoverImageSize, ['image/png', 'image/jpeg', 'image/bmp']);
+ const imageData = await image.validateBase64(
+ data.imageData, meta.config.maximumCoverImageSize, ['image/png', 'image/jpeg', 'image/bmp']
+ );
- picture.path = await image.writeImageDataToTempFile(data.imageData);
+ picture.path = await image.writeImageDataToTempFile(imageData);
- const extension = file.typeToExtension(image.mimeFromBase64(data.imageData));
+ const { extension } = imageData;
const filename = `${data.uid}-profilecover-${Date.now()}${extension}`;
const uploadData = await image.uploadImage(filename, `profile/uid-${data.uid}`, picture);
@@ -79,19 +82,19 @@ module.exports = function (User) {
if (userPhoto.size > meta.config.maximumProfileImageSize * 1024) {
throw new Error(`[[error:file-too-big, ${meta.config.maximumProfileImageSize}]]`);
}
-
- if (!userPhoto.type || !User.getAllowedImageTypes().includes(userPhoto.type)) {
+ const detected = await fileTypeFromFile(userPhoto.path);
+ if (!detected || !User.getAllowedImageTypes().includes(detected.mime)) {
throw new Error('[[error:invalid-image]]');
}
- const extension = file.typeToExtension(userPhoto.type);
+ const extension = detected ? `.${detected.ext}` : '';
if (!extension) {
throw new Error('[[error:invalid-image-extension]]');
}
return await storeUserUploadedPicture(data.callerUid, data.uid, {
path: userPhoto.path,
- type: userPhoto.type,
+ type: detected.mime,
extension,
});
};
@@ -107,19 +110,19 @@ module.exports = function (User) {
if (!meta.config.allowProfileImageUploads) {
throw new Error('[[error:profile-image-uploads-disabled]]');
}
-
- validateUpload(data, meta.config.maximumProfileImageSize, User.getAllowedImageTypes());
- const type = image.mimeFromBase64(data.imageData);
- const extension = file.typeToExtension(type);
+ const imageData = await image.validateBase64(
+ data.imageData, meta.config.maximumProfileImageSize, User.getAllowedImageTypes()
+ );
+ const { mime, extension } = imageData;
if (!extension) {
throw new Error('[[error:invalid-image-extension]]');
}
- picture.path = await image.writeImageDataToTempFile(data.imageData);
+ picture.path = await image.writeImageDataToTempFile(imageData);
return await storeUserUploadedPicture(data.callerUid, data.uid, {
path: picture.path,
- type,
+ type: mime,
extension,
});
} finally {
@@ -182,21 +185,6 @@ module.exports = function (User) {
}
}
- function validateUpload(data, maxSize, allowedTypes) {
- if (!data.imageData) {
- throw new Error('[[error:invalid-data]]');
- }
- const size = image.sizeFromBase64(data.imageData);
- if (size > maxSize * 1024) {
- throw new Error(`[[error:file-too-big, ${maxSize}]]`);
- }
-
- const type = image.mimeFromBase64(data.imageData);
- if (!type || !allowedTypes.includes(type)) {
- throw new Error('[[error:invalid-image]]');
- }
- }
-
async function convertToPNG(path) {
const convertToPNG = meta.config['profile:convertProfileImageToPNG'] === 1;
if (!convertToPNG) {
diff --git a/test/groups.js b/test/groups.js
index c269650b19..f4ff7faae5 100644
--- a/test/groups.js
+++ b/test/groups.js
@@ -1487,9 +1487,9 @@ describe('Groups', () => {
it('should fail to upload group cover with invalid image', (done) => {
const data = {
groupName: 'Test',
- imageData: 'data:image/svg;base64,iVBORw0KGgoAAAANSUhEUgAAABwA',
+ imageData: 'data:image/svg;base64,UklGRiIAAABXRUJQVlA4IBYAAAAwAQCdASoBAAEAAUAmJaQAA3AA/v89WAAAAA==',
};
- socketGroups.cover.update({ uid: adminUid }, data, (err, data) => {
+ socketGroups.cover.update({ uid: adminUid }, data, (err) => {
assert.equal(err.message, '[[error:invalid-image]]');
done();
});
diff --git a/test/topics/thumbs.js b/test/topics/thumbs.js
index 124228f254..534787b9f9 100644
--- a/test/topics/thumbs.js
+++ b/test/topics/thumbs.js
@@ -350,7 +350,7 @@ describe('Topic thumbs', () => {
const { response, body } = await helpers.uploadFile(`${nconf.get('url')}/api/v3/topics/${this.tid}/thumbs`, path.join(__dirname, '../files/503.html'), {}, this.jar, this.csrf);
assert.strictEqual(response.statusCode, 500);
assert(body && body.status);
- assert.strictEqual(body.status.message, 'Invalid File');
+ assert.strictEqual(body.status.message, 'Invalid file type .html. Allowed types are: .png, .jpg, .bmp, .txt, .webp, .webm, .mp4, .gif, .jpeg');
});
});
diff --git a/test/user.js b/test/user.js
index 2c8105326f..794647a9ea 100644
--- a/test/user.js
+++ b/test/user.js
@@ -1056,11 +1056,30 @@ describe('User', () => {
});
});
- it('should return error if profile image has no mime type', (done) => {
+ it('should return error if profile image has invalid data URI', async () => {
+ await assert.rejects(
+ User.uploadCroppedPicture({
+ callerUid: uid,
+ uid: uid,
+ imageData: 'data:;base64,R0lGODlhPQBEAPeoAJosM/',
+ }),
+ { message: '[[error:invalid-data]]' }
+ );
+ await assert.rejects(
+ User.uploadCroppedPicture({
+ callerUid: uid,
+ uid: uid,
+ imageData: 'not-a-data-uri',
+ }),
+ { message: '[[error:invalid-data]]' }
+ );
+ });
+
+ it('should detect the actual image type instead of trusting the data URI mime type', (done) => {
User.uploadCroppedPicture({
callerUid: uid,
uid: uid,
- imageData: 'data:image/invalid;base64,R0lGODlhPQBEAPeoAJosM/',
+ imageData: 'data:image/png;base64,UklGRiIAAABXRUJQVlA4IBYAAAAwAQCdASoBAAEAAUAmJaQAA3AA/v89WAAAAA==',
}, (err) => {
assert.equal(err.message, '[[error:invalid-image]]');
done();
@@ -1087,9 +1106,20 @@ describe('User', () => {
assert.ok(metadata.pages > 1);
});
- describe('user.uploadCroppedPicture', () => {
- const badImage = 'data:audio/mp3;base64,R0lGODlhPQBEAPeoAJosM//AwO/AwHVYZ/z595kzAP/s7P+goOXMv8+fhw/v739/f+8PD98fH/8mJl+fn/9ZWb8/PzWlwv///6wWGbImAPgTEMImIN9gUFCEm/gDALULDN8PAD6atYdCTX9gUNKlj8wZAKUsAOzZz+UMAOsJAP/Z2ccMDA8PD/95eX5NWvsJCOVNQPtfX/8zM8+QePLl38MGBr8JCP+zs9myn/8GBqwpAP/GxgwJCPny78lzYLgjAJ8vAP9fX/+MjMUcAN8zM/9wcM8ZGcATEL+QePdZWf/29uc/P9cmJu9MTDImIN+/r7+/vz8/P8VNQGNugV8AAF9fX8swMNgTAFlDOICAgPNSUnNWSMQ5MBAQEJE3QPIGAM9AQMqGcG9vb6MhJsEdGM8vLx8fH98AANIWAMuQeL8fABkTEPPQ0OM5OSYdGFl5jo+Pj/+pqcsTE78wMFNGQLYmID4dGPvd3UBAQJmTkP+8vH9QUK+vr8ZWSHpzcJMmILdwcLOGcHRQUHxwcK9PT9DQ0O/v70w5MLypoG8wKOuwsP/g4P/Q0IcwKEswKMl8aJ9fX2xjdOtGRs/Pz+Dg4GImIP8gIH0sKEAwKKmTiKZ8aB/f39Wsl+LFt8dgUE9PT5x5aHBwcP+AgP+WltdgYMyZfyywz78AAAAAAAD///8AAP9mZv///wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAKgALAAAAAA9AEQAAAj/AFEJHEiwoMGDCBMqXMiwocAbBww4nEhxoYkUpzJGrMixogkfGUNqlNixJEIDB0SqHGmyJSojM1bKZOmyop0gM3Oe2liTISKMOoPy7GnwY9CjIYcSRYm0aVKSLmE6nfq05QycVLPuhDrxBlCtYJUqNAq2bNWEBj6ZXRuyxZyDRtqwnXvkhACDV+euTeJm1Ki7A73qNWtFiF+/gA95Gly2CJLDhwEHMOUAAuOpLYDEgBxZ4GRTlC1fDnpkM+fOqD6DDj1aZpITp0dtGCDhr+fVuCu3zlg49ijaokTZTo27uG7Gjn2P+hI8+PDPERoUB318bWbfAJ5sUNFcuGRTYUqV/3ogfXp1rWlMc6awJjiAAd2fm4ogXjz56aypOoIde4OE5u/F9x199dlXnnGiHZWEYbGpsAEA3QXYnHwEFliKAgswgJ8LPeiUXGwedCAKABACCN+EA1pYIIYaFlcDhytd51sGAJbo3onOpajiihlO92KHGaUXGwWjUBChjSPiWJuOO/LYIm4v1tXfE6J4gCSJEZ7YgRYUNrkji9P55sF/ogxw5ZkSqIDaZBV6aSGYq/lGZplndkckZ98xoICbTcIJGQAZcNmdmUc210hs35nCyJ58fgmIKX5RQGOZowxaZwYA+JaoKQwswGijBV4C6SiTUmpphMspJx9unX4KaimjDv9aaXOEBteBqmuuxgEHoLX6Kqx+yXqqBANsgCtit4FWQAEkrNbpq7HSOmtwag5w57GrmlJBASEU18ADjUYb3ADTinIttsgSB1oJFfA63bduimuqKB1keqwUhoCSK374wbujvOSu4QG6UvxBRydcpKsav++Ca6G8A6Pr1x2kVMyHwsVxUALDq/krnrhPSOzXG1lUTIoffqGR7Goi2MAxbv6O2kEG56I7CSlRsEFKFVyovDJoIRTg7sugNRDGqCJzJgcKE0ywc0ELm6KBCCJo8DIPFeCWNGcyqNFE06ToAfV0HBRgxsvLThHn1oddQMrXj5DyAQgjEHSAJMWZwS3HPxT/QMbabI/iBCliMLEJKX2EEkomBAUCxRi42VDADxyTYDVogV+wSChqmKxEKCDAYFDFj4OmwbY7bDGdBhtrnTQYOigeChUmc1K3QTnAUfEgGFgAWt88hKA6aCRIXhxnQ1yg3BCayK44EWdkUQcBByEQChFXfCB776aQsG0BIlQgQgE8qO26X1h8cEUep8ngRBnOy74E9QgRgEAC8SvOfQkh7FDBDmS43PmGoIiKUUEGkMEC/PJHgxw0xH74yx/3XnaYRJgMB8obxQW6kL9QYEJ0FIFgByfIL7/IQAlvQwEpnAC7DtLNJCKUoO/w45c44GwCXiAFB/OXAATQryUxdN4LfFiwgjCNYg+kYMIEFkCKDs6PKAIJouyGWMS1FSKJOMRB/BoIxYJIUXFUxNwoIkEKPAgCBZSQHQ1A2EWDfDEUVLyADj5AChSIQW6gu10bE/JG2VnCZGfo4R4d0sdQoBAHhPjhIB94v/wRoRKQWGRHgrhGSQJxCS+0pCZbEhAAOw==';
+ it('should fail to upload a non-image file as profile image', async () => {
+ await User.create({ username: 'invalidpicture', password: '123456' });
+ const { jar, csrf_token } = await helpers.loginUser('invalidpicture', '123456');
+ const pathToHtml = path.join(__dirname, '../test/files/503.html');
+ const { response, body } = await helpers.uploadFile(
+ `${nconf.get('url')}/api/user/invalidpicture/uploadpicture`,
+ pathToHtml, { }, jar, csrf_token
+ );
+ assert.strictEqual(response.statusCode, 500);
+ assert.strictEqual(body.error, '[[error:invalid-image]]');
+ });
+
+ describe('user.uploadCroppedPicture', () => {
it('should upload cropped profile picture', async () => {
const result = await socketUser.uploadCroppedPicture({ uid: uid }, { uid: uid, imageData: goodImage });
assert(result.url);
@@ -1175,7 +1205,7 @@ describe('User', () => {
User.uploadCroppedPicture({
callerUid: uid,
uid: 1,
- imageData: badImage,
+ imageData: 'data:image/webp;base64,UklGRiIAAABXRUJQVlA4IBYAAAAwAQCdASoBAAEAAUAmJaQAA3AA/v89WAAAAA==',
}, (err) => {
assert.equal('[[error:invalid-image]]', err.message);
done();