merge-requests/218/head
Thomas Lynch 3 years ago
parent 1c5f14e419
commit ab8eddbcff
  1. 10
      db/posts.js
  2. 4
      helpers/files/mimetypes.js
  3. 2
      migrations/0.0.5.js
  4. 3
      schedules/tasks/ips.js
  5. 3
      socketio.js

@ -34,7 +34,7 @@ module.exports = {
} else if (typeof ip === 'string') {
query['ip.raw'] = ip;
}
if (permLevel > getconfig.ipHashPermLevel) {
if (permLevel > config.get.ipHashPermLevel) {
projection['ip.raw'] = 0;
}
return db.find(query, {
@ -58,7 +58,7 @@ module.exports = {
} else if (typeof ip === 'string') {
query['ip.raw'] = ip;
}
if (permLevel > getconfig.ipHashPermLevel) {
if (permLevel > config.get.ipHashPermLevel) {
projection['ip.raw'] = 0;
}
return db.find(query, {
@ -475,7 +475,7 @@ module.exports = {
//insert the post itself
const postMongoId = await db.insertOne(data).then(result => result.insertedId); //_id of post
const statsIp = (getconfig.statsCountAnonymizers === false && res.locals.anonymizer === true) ? null : data.ip.single;
const statsIp = (config.get.statsCountAnonymizers === false && res.locals.anonymizer === true) ? null : data.ip.single;
await Stats.updateOne(board._id, statsIp, data.thread == null);
//add backlinks to the posts this post quotes
@ -599,13 +599,13 @@ module.exports = {
}
}, {
//skip the first (board.settings.threadLimit/early404Fraction)
'$skip': Math.ceil(board.settings.threadLimit/getconfig.early404Fraction)
'$skip': Math.ceil(board.settings.threadLimit/config.get.early404Fraction)
}, {
//then any that have less than early404Replies replies get matched again
'$match': {
'sticky':0,
'replyposts': {
'$lt': getconfig.early404Replies
'$lt': config.get.early404Replies
}
}
}

@ -1,7 +1,7 @@
'use strict';
const FileType = require('file-type')
, { allowMimeNoMatch } = require(__dirname+'/../../configs/secrets.js');
, config = require(__dirname+'/../../config.js');
const image = new Set([
'image/jpeg',
@ -50,7 +50,7 @@ module.exports = {
const supposedMimeType = file.mimetype;
const realMimeType = await FileType.fromFile(file.tempFilePath);
if (!realMimeType) {
return getconfig.allowMimeNoMatch;
return config.get.allowMimeNoMatch;
}
return supposedMimeType === realMimeType.mime;
},

@ -6,7 +6,7 @@ module.exports = async(db, redis) => {
console.log('Adding bumplimit field to boards on posts');
await db.collection('boards').updateMany({}, {
'$set': {
'settings.bumpLimit': getconfig.globalLimits.bumpLimit.max,
'settings.bumpLimit': config.get.globalLimits.bumpLimit.max,
}
});
console.log('Cleared boards cache');

@ -2,6 +2,7 @@
const Mongo = require(__dirname+'/../../db/db.js')
, { Posts } = require(__dirname+'/../../db/')
, config = require(__dirname+'/../../config.js')
, { createHash, randomBytes } = require('crypto')
, timeUtils = require(__dirname+'/../../helpers/timeutils.js');
@ -9,7 +10,7 @@ module.exports = {
func: async (days) => {
const beforeDate = new Date();
beforeDate.setDate(beforeDate.getDate() - (days || getconfig.pruneIps));
beforeDate.setDate(beforeDate.getDate() - (days || config.get.pruneIps));
const beforeDateMongoId = Mongo.ObjectId.createFromTime(Math.floor(beforeDate.getTime()/1000));
const tempIpHashSecret = randomBytes(20).toString('base64');
const bulkWrites = [];

@ -2,6 +2,7 @@
const { redis: redisConfig } = require(__dirname+'/configs/secrets.js')
, hasPerms = require(__dirname+'/helpers/checks/hasperms.js')
, config = require(__dirname+'/config.js')
, roomRegex = /^(?<roomBoard>[a-z0-9]+)-(?<roomName>[a-z0-9-]+)$/i;
module.exports = {
@ -51,7 +52,7 @@ module.exports = {
}
if (room.endsWith('-raw')) {
//if its a -raw room, prioritise ipHashPermLevel
requiredAuth = Math.min(requiredAuth, getconfig.ipHashPermLevel);
requiredAuth = Math.min(requiredAuth, config.get.ipHashPermLevel);
}
if (authLevel <= requiredAuth) {
//user has perms to join

Loading…
Cancel
Save