Node.js based forum software built for the modern web
fix: closes #14511
Barış Soner Uşaklıdd4fd54f5edf
diff --git a/src/user/admin.js b/src/user/admin.jsindex 89c89196de..01cf63fa0a 100644--- a/src/user/admin.js+++ b/src/user/admin.js@@ -85,6 +85,11 @@ module.exports = function (User) {if (Array.isArray(userIps[index])) {user.ip = userIps[index].join(',');}+ fields.forEach((field) => {+ if (user[field] !== undefined && user[field] !== null) {+ user[field] = neutralizeCsvFormula(user[field]);+ }+ });fieldsToWrapInQuotes.forEach((field) => {if (user[field]) {user[field] = `"${String(user[field])}"`;@@ -96,4 +101,10 @@ module.exports = function (User) {const json2csvAsync = new AsyncParser(opts);return await json2csvAsync.parse(usersData).promise();}++ function neutralizeCsvFormula(value) {+ const str = String(value);+ // Checks for formula triggers (=, +, -, @), even if preceded by spaces or tabs+ return (/^[\t\r ]*[=+\-@]/).test(str) ? `'${str}` : str;+ }};diff --git a/test/user.js b/test/user.jsindex 6c7ea8c235..1cbb6b0cb3 100644--- a/test/user.js+++ b/test/user.js@@ -21,6 +21,7 @@ const file = require('../src/file');const socketUser = require('../src/socket.io/user');const apiUser = require('../src/api/users');const utils = require('../src/utils');+const commonUtils = require('../public/src/utils.common');const privileges = require('../src/privileges');const request = require('../src/request');@@ -2833,6 +2834,27 @@ describe('User', () => {meta.config.minimumPasswordStrength = oldValue;});+ describe('getUsersCSV', () => {+ it('should export user csv and sanitize csv formulas', async () => {+ const suffix = Date.now();+ const usernames = [+ `+1+1-${suffix}`,+ `-2+3-${suffix}`,+ ];++ for (const username of usernames) {+ // eslint-disable-next-line no-await-in-loop+ await User.create({ username });+ }++ const csv = await User.getUsersCSV();+ usernames.forEach((username) => {+ assert(csv.includes(`'${username}`), `Expected exported CSV username to be neutralized: ${username}`);+ });+ });+ });++describe('User\'s', async () => {let files;