Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2025-10-31 02:55:58 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix: #9041, remove Topics.thumbs.resizeAndUpload()

Browse Source
This commit is contained in:
Julian Lam
2020-12-03 13:51:47 -05:00
parent 708b1c338f
commit 43dc3e3e48
1 changed files with 0 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files

76
src/topics/thumbs.js
View File

@@ -3,27 +3,14 @@
var nconf = require('nconf'); var nconf = require('nconf');
var path = require('path'); var path = require('path');
var fs = require('fs');
var request = require('request');
var mime = require('mime');
var validator = require('validator');
var util = require('util');
const db = require('../database'); const db = require('../database');
var meta = require('../meta');
var image = require('../image');
var file = require('../file'); var file = require('../file');
var plugins = require('../plugins'); var plugins = require('../plugins');
const Thumbs = {}; const Thumbs = {};
module.exports = Thumbs; module.exports = Thumbs;
const getHead = util.promisify(request.head);
function pipeToFile(source, destination, callback) {
request(source).pipe(fs.createWriteStream(destination)).on('close', callback);
}
const pipeToFileAsync = util.promisify(pipeToFile);
Thumbs.exists = async function (tid, path) { Thumbs.exists = async function (tid, path) {
// TODO: tests // TODO: tests
@@ -80,66 +67,3 @@ Thumbs.delete = async function (tid, relativePath) {
await file.delete(absolutePath); await file.delete(absolutePath);
} }
}; };
Thumbs.resizeAndUpload = async function (data) {
const allowedExtensions = file.allowedExtensions();
// Handle protocol-relative URLs
if (data.thumb && data.thumb.startsWith('//')) {
data.thumb = `${nconf.get('secure') ? 'https' : 'http'}:${data.thumb}`;
}
// Only continue if passed in thumbnail exists and is a URL. A system path means an upload is not necessary.
if (!data.thumb || !validator.isURL(data.thumb)) {
return;
}
var pathToUpload;
const res = await getHead(data.thumb);
try {
const type = res.headers['content-type'];
if (!type.match(/image./)) {
throw new Error('[[error:invalid-file]]');
}
var extension = path.extname(data.thumb);
if (!extension) {
extension = '.' + mime.getExtension(type);
}
if (!allowedExtensions.includes(extension)) {
throw new Error('[[error:invalid-file]]');
}
const filename = Date.now() + '-topic-thumb' + extension;
const folder = 'files';
pathToUpload = path.join(nconf.get('upload_path'), folder, filename);
await pipeToFileAsync(data.thumb, pathToUpload);
await image.isFileTypeAllowed(pathToUpload);
await image.checkDimensions(pathToUpload);
await image.resizeImage({
path: pathToUpload,
width: meta.config.topicThumbSize,
height: meta.config.topicThumbSize,
});
if (!plugins.hooks.hasListeners('filter:uploadImage')) {
data.thumb = '/assets/uploads/' + folder + '/' + filename;
return;
}
const uploadedFile = await plugins.hooks.fire('filter:uploadImage', {
image: { path: pathToUpload, name: '' },
uid: data.uid,
folder: folder,
});
file.delete(pathToUpload);
data.thumb = uploadedFile.url;
} catch (err) {
file.delete(pathToUpload);
throw err;
}
};