Node.js based forum software built for the modern web
fix(api): require admin:admins-mods to modify administrators group membership
Julian Lam9ddaec724f33
diff --git a/src/api/groups.js b/src/api/groups.jsindex 0574ab3f47..9cad47d436 100644--- a/src/api/groups.js+++ b/src/api/groups.js@@ -11,6 +11,15 @@ const tx = require('../translator');const groupsAPI = module.exports;+async function adminGroupCheck(caller, groupName) {+ if (groupName === 'administrators') {+ const isAdminsModsAdmin = await privileges.admin.can('admin:admins-mods', caller.uid);+ if (!isAdminsModsAdmin) {+ throw new Error('[[error:no-privileges]]');+ }+ }+}+groupsAPI.list = async (caller, data) => {const canView = await privileges.global.can('view:groups', caller.uid);if (!canView) {@@ -143,6 +152,8 @@ groupsAPI.join = async function (caller, data) {throw new Error('[[error:not-allowed]]');}+ await adminGroupCheck(caller, groupName);+const [groupData, userExists] = await Promise.all([groups.getGroupData(groupName),user.exists(data.uid),@@ -217,6 +228,10 @@ groupsAPI.leave = async function (caller, data) {throw new Error('[[error:cant-remove-self-as-admin]]');}+ if (!isSelf) {+ await adminGroupCheck(caller, groupName);+ }+const [groupData, isCallerOwner, userExists, isMember] = await Promise.all([groups.getGroupData(groupName),isOwner(caller, groupName, false),@@ -264,6 +279,11 @@ groupsAPI.grant = async (caller, data) => {const groupName = await groups.getGroupNameByGroupSlug(data.slug);await isOwner(caller, groupName);+ const isMember = await groups.isMember(data.uid, groupName);+ if (!isMember) {+ throw new Error('[[error:group-not-member]]');+ }+await groups.ownership.grant(data.uid, groupName);logGroupEvent(caller, 'group-owner-grant', {groupName: groupName,@@ -275,6 +295,11 @@ groupsAPI.rescind = async (caller, data) => {const groupName = await groups.getGroupNameByGroupSlug(data.slug);await isOwner(caller, groupName);+ const isMember = await groups.isMember(data.uid, groupName);+ if (!isMember) {+ throw new Error('[[error:group-not-member]]');+ }+await groups.ownership.rescind(data.uid, groupName);logGroupEvent(caller, 'group-owner-rescind', {groupName,diff --git a/test/groups.js b/test/groups.jsindex 02432cff8c..46161140f5 100644--- a/test/groups.js+++ b/test/groups.js@@ -775,6 +775,31 @@ describe('Groups', () => {meta.config.allowPrivateGroups = oldValue;});+ it('should fail to join administrators group with only admin:groups privilege', async () => {+ const privileges = require('../src/privileges');+ const uid = await User.create({ username: utils.generateUUID().slice(0, 8) });+ // Grant only admin:groups (not admin:admins-mods)+ await privileges.admin.give(['admin:groups'], uid);+ const hasGroupsPriv = await privileges.admin.can('admin:groups', uid);+ const hasAdminsModsPriv = await privileges.admin.can('admin:admins-mods', uid);+ assert.strictEqual(hasGroupsPriv, true, 'user should have admin:groups');+ assert.strictEqual(hasAdminsModsPriv, false, 'user should NOT have admin:admins-mods');++ // Should fail to join administrators group+ await assert.rejects(+ apiGroups.join({ uid: uid }, { slug: 'administrators', uid: uid }),+ { message: '[[error:no-privileges]]' }+ );+ assert.strictEqual(await Groups.isMember(uid, 'administrators'), false);++ // Should also fail to add another user to administrators group+ const uid2 = await User.create({ username: utils.generateUUID().slice(0, 8) });+ await assert.rejects(+ apiGroups.join({ uid: uid }, { slug: 'administrators', uid: uid2 }),+ { message: '[[error:no-privileges]]' }+ );+ });+it('should fail to add user to group if calling uid is non-self and non-admin', async () => {const uid1 = await User.create({ username: utils.generateUUID().slice(0, 8) });const uid2 = await User.create({ username: utils.generateUUID().slice(0, 8) });@@ -1056,6 +1081,25 @@ describe('Groups', () => {assert(!isMember);});+ it('should fail to kick user from administrators with only admin:groups privilege', async () => {+ const privileges = require('../src/privileges');+ const uid = await User.create({ username: utils.generateUUID().slice(0, 8) });+ // Grant only admin:groups (not admin:admins-mods)+ await privileges.admin.give(['admin:groups'], uid);+ // Add target user to administrators first (via admin)+ const targetUid = await User.create({ username: utils.generateUUID().slice(0, 8) });+ await Groups.join('administrators', targetUid);+ assert(await Groups.isMember(targetUid, 'administrators'));++ // Should fail to kick target from administrators+ await assert.rejects(+ apiGroups.leave({ uid: uid }, { slug: 'administrators', uid: targetUid }),+ { message: '[[error:no-privileges]]' }+ );+ // Target should still be in administrators+ assert(await Groups.isMember(targetUid, 'administrators'));+ });+it('should fail to create group with invalid data', async () => {await assert.rejects(apiGroups.create({ uid: 0 }, {}),