test: clear cache between runs, require middleware later in helpers

This commit is contained in:
Barış Soner Uşaklı
2021-04-18 21:38:47 -04:00
committed by Andrew Rodrigues
parent d15e27107e
commit 2ea468daa3
7 changed files with 28 additions and 22 deletions

View File

@@ -66,7 +66,7 @@ Object.assign(middleware, {
require('./render')(middleware);
require('./maintenance')(middleware);
require('./user')(middleware);
require('./uploads')(middleware);
middleware.uploads = require('./uploads');
require('./headers')(middleware);
require('./expose')(middleware);
middleware.assert = require('./assert');

View File

@@ -5,24 +5,28 @@ const meta = require('../meta');
const helpers = require('./helpers');
const user = require('../user');
console.log('----cooldown', meta.config.uploadRateLimitCooldown * 1000, new Error('a').stack);
const cache = new LRU({
maxAge: meta.config.uploadRateLimitCooldown * 1000,
});
module.exports = function (middleware) {
middleware.ratelimitUploads = helpers.try(async (req, res, next) => {
const { uid } = req;
if (!meta.config.uploadRateLimitThreshold || (uid && await user.isAdminOrGlobalMod(uid))) {
return next();
}
const count = (cache.peek(`${req.ip}:uploaded_file_count`) || 0) + req.files.files.length;
console.log('req.ip', req.ip, count, req.files.files.length, meta.config.uploadRateLimitThreshold);
if (count > meta.config.uploadRateLimitThreshold) {
return next(new Error(['[[error:upload-ratelimit-reached]]']));
}
cache.set(`${req.ip}:uploaded_file_count`, count);
next();
});
exports.clearCache = function () {
cache.reset();
};
exports.ratelimit = helpers.try(async (req, res, next) => {
const { uid } = req;
if (!meta.config.uploadRateLimitThreshold || (uid && await user.isAdminOrGlobalMod(uid))) {
return next();
}
const count = (cache.peek(`${req.ip}:uploaded_file_count`) || 0) + req.files.files.length;
console.log('req.ip', req.ip, count, req.files.files.length, meta.config.uploadRateLimitThreshold);
if (count > meta.config.uploadRateLimitThreshold) {
return next(new Error(['[[error:upload-ratelimit-reached]]']));
}
cache.set(`${req.ip}:uploaded_file_count`, count);
next();
});