Node.js based forum software built for the modern web
fix: dont allow sorting by email in user search
Barış Soner Uşaklıdba251bad6fb
diff --git a/src/user/search.js b/src/user/search.jsindex fe69306b64..22f4b32b87 100644--- a/src/user/search.js+++ b/src/user/search.js@@ -11,6 +11,8 @@ const activitypub = require('../activitypub');const utils = require('../utils');module.exports = function (User) {+ const validSorts = new Set(['joindate', 'lastonline', 'postcount', 'reputation']);+const filterFnMap = {online: user => user.status !== 'offline' && (Date.now() - user.lastonline < 300000),flagged: user => parseInt(user.flags, 10) > 0,@@ -155,9 +157,9 @@ module.exports = function (User) {let filters = data.filters || [];filters = Array.isArray(filters) ? filters : [data.filters];const fields = [];-- if (data.sortBy) {- fields.push(data.sortBy);+ const sortBy = validSorts.has(data.sortBy) ? data.sortBy : null;+ if (sortBy) {+ fields.push(sortBy);}filters.forEach((filter) => {@@ -195,8 +197,8 @@ module.exports = function (User) {}});- if (data.sortBy) {- sortUsers(userData, data.sortBy, data.sortDirection);+ if (sortBy) {+ sortUsers(userData, sortBy, data.sortDirection);}return userData.map(user => user.uid);diff --git a/test/user.js b/test/user.jsindex a1e63378aa..284fe88284 100644--- a/test/user.js+++ b/test/user.js@@ -482,6 +482,22 @@ describe('User', () => {assert.equal(data.users[1].username, 'brian');assert.equal(data.users[2].username, 'bzari');});++ it('should not sort users by email', async () => {+ await User.create({ username: 'crian1', email: '[email protected]' }, { emailVerification: 'verify' });+ await User.create({ username: 'caris2', email: '[email protected]' }, { emailVerification: 'verify' });+ await User.create({ username: 'czari3', email: '[email protected]' }, { emailVerification: 'verify' });+ const data = await User.search({+ uid: testUid,+ query: 'c',+ sortBy: 'email',+ paginate: false,+ });+ // sorted by username+ assert.equal(data.users[0].username, 'caris2');+ assert.equal(data.users[1].username, 'crian1');+ assert.equal(data.users[2].username, 'czari3');+ });});describe('.delete()', () => {