Node.js based forum software built for the modern web
fix: closes #14743, handle uid groupnames in isMember methods
Barış Soner Uşaklıc1081a0cdd3b
diff --git a/src/groups/membership.js b/src/groups/membership.jsindex 0b8fd2154f..b0bc10697c 100644--- a/src/groups/membership.js+++ b/src/groups/membership.js@@ -5,6 +5,7 @@ const _ = require('lodash');const db = require('../database');const user = require('../user');const cache = require('../cache');+const utils = require('../utils');module.exports = function (Groups) {Groups.getMembers = async function (groupName, start, stop) {@@ -24,7 +25,7 @@ module.exports = function (Groups) {};Groups.isMember = async function (uid, groupName) {- if (!uid || parseInt(uid, 10) <= 0 || !groupName) {+ if (!uid || (utils.isNumber(uid) && parseInt(uid, 10) <= 0) || !groupName) {return isMemberOfEphemeralGroup(uid, groupName);}@@ -63,7 +64,7 @@ module.exports = function (Groups) {};Groups.isMemberOfGroups = async function (uid, groups) {- if (!uid || parseInt(uid, 10) <= 0 || !groups.length) {+ if (!uid || (utils.isNumber(uid) && parseInt(uid, 10) <= 0) || !groups.length) {return groups.map(groupName => isMemberOfEphemeralGroup(uid, groupName));}const cachedData = {};@@ -83,8 +84,10 @@ module.exports = function (Groups) {};function isMemberOfEphemeralGroup(uid, groupName) {- return (groupName === 'guests' && parseInt(uid, 10) === 0) ||- (groupName === 'spiders' && parseInt(uid, 10) === -1);+ // uid can be a groupname too dont parseInt in that case+ const parsedUid = utils.isNumber(uid) ? parseInt(uid, 10) : uid;+ return (groupName === 'guests' && parsedUid === 0) ||+ (groupName === 'spiders' && parsedUid === -1);}function filterNonCached(cachedData, uid, groupName) {diff --git a/test/groups.js b/test/groups.jsindex f4ff7faae5..1b3d12f53e 100644--- a/test/groups.js+++ b/test/groups.js@@ -289,6 +289,22 @@ describe('Groups', () => {const isMembers = await Groups.isMemberOfGroups(-1, ['guests', 'registered-users', 'spiders']);assert.deepStrictEqual(isMembers, [false, false, true]);});++ it('should work for group names that start with a 0/-1', async () => {+ const groupName = '0group';+ await Groups.create({+ name: groupName,+ description: 'group that starts with a 0',+ });+ await Groups.join(['parentgroup'], groupName);+ const [member] = await db.getSortedSetRevRange(`group:parentgroup:members`, 0, -1);+ assert.strictEqual(member, groupName);+ assert.strictEqual(await Groups.isMember(groupName, 'parentgroup'), true);+ assert.deepStrictEqual(await Groups.isMemberOfGroups(groupName, ['parentgroup']), [true]);+ assert.deepStrictEqual(await Groups.isMembers([groupName], 'parentgroup'), [true]);+ assert.deepStrictEqual(await Groups.isMembers([groupName], 'guests'), [false]);+ assert.deepStrictEqual(await Groups.isMembers(['-1something'], 'spiders'), [false]);+ });});describe('.isMemberOfGroupList', () => {