Node.js based forum software built for the modern web
fix: #14428, dont log ip in chats/posts/user login/events
Barış Soner Uşaklı455b9f597617
diff --git a/src/events.js b/src/events.jsindex df67223e46..140a9f2064 100644--- a/src/events.js+++ b/src/events.js@@ -8,6 +8,7 @@ const batch = require('./batch');const user = require('./user');const utils = require('./utils');const plugins = require('./plugins');+const meta = require('./meta');const events = module.exports;@@ -94,6 +95,10 @@ events.log = async function (data) {if (data.hasOwnProperty('uid') && data.uid) {setKeys.push(`events:time:uid:${data.uid}`);}+ if (!meta.config.logIPs) {+ delete data.ip;+ }+await Promise.all([db.sortedSetsAdd(setKeys, data.timestamp, eid),db.setObject(`event:${eid}`, data),diff --git a/src/messaging/create.js b/src/messaging/create.jsindex 23728fd9ee..437c62d4be 100644--- a/src/messaging/create.js+++ b/src/messaging/create.js@@ -68,7 +68,7 @@ module.exports = function (Messaging) {message.type = data.type;}- if (data.ip) {+ if (data.ip && meta.config.logIPs) {message.ip = data.ip;}diff --git a/src/posts/create.js b/src/posts/create.jsindex b218ad3b99..da4596e75d 100644--- a/src/posts/create.js+++ b/src/posts/create.js@@ -33,7 +33,7 @@ module.exports = function (Posts) {if (data.toPid) {postData.toPid = data.toPid;}- if (data.ip && meta.config.trackIpPerPost) {+ if (data.ip && meta.config.logIPs && meta.config.trackIpPerPost) {postData.ip = data.ip;}if (data.handle && !parseInt(uid, 10)) {diff --git a/src/user/admin.js b/src/user/admin.jsindex 89c89196de..fe88681190 100644--- a/src/user/admin.js+++ b/src/user/admin.js@@ -8,12 +8,13 @@ const { AsyncParser } = require('@json2csv/node');const { baseDir } = require('../constants').paths;const db = require('../database');+const meta = require('../meta');const plugins = require('../plugins');const batch = require('../batch');module.exports = function (User) {User.logIP = async function (uid, ip) {- if (!(parseInt(uid, 10) > 0)) {+ if (!(parseInt(uid, 10) > 0) || !meta.config.logIPs) {return;}const now = Date.now();