Node.js based forum software built for the modern web
fix: deleting a group left public chat rooms restricted to its name (#14902)
palmoni57c232f6a1eab
diff --git a/src/groups/delete.js b/src/groups/delete.jsindex e737f3480c..ec27ecae18 100644--- a/src/groups/delete.js+++ b/src/groups/delete.js@@ -51,9 +51,35 @@ module.exports = function (Groups) {`zset:groups:createtime`,...groupNames.map(groupName => `group:${groupName}:members`),]);+ await removeGroupsFromPublicRooms(groupNames);plugins.hooks.fire('action:groups.destroy', { groups: groupsData });};+ async function removeGroupsFromPublicRooms(groupNames) {+ const messaging = require('../messaging');+ const roomIds = await db.getSortedSetRange('chat:rooms:public', 0, -1);+ const roomData = (await messaging.getRoomsData(roomIds)).filter(+ room => room && Array.isArray(room.groups) && room.groups.some(group => groupNames.includes(group))+ );+ await Promise.all(roomData.map(async (room) => {+ const groups = room.groups.filter(group => !groupNames.includes(group));+ if (!groups.length) {+ groups.push('administrators');+ }+ await db.setObjectField(`chat:room:${room.roomId}`, 'groups', JSON.stringify(groups));++ const uids = await messaging.getUidsInRoom(room.roomId, 0, -1);+ const [isMembers, isAdmins] = await Promise.all([+ Promise.all(uids.map(uid => Groups.isMemberOfAny(uid, groups))),+ Groups.isMembers(uids, 'administrators'),+ ]);+ const uidsToRemove = uids.filter((uid, index) => !isMembers[index] && !isAdmins[index]);+ if (uidsToRemove.length) {+ await messaging.leaveRoom(uidsToRemove, room.roomId);+ }+ }));+ }+async function removeGroupsFromPostEditors(groupNames) {await Promise.all(groupNames.map(groupName => batch.processSortedSet(`group:${groupName}:editor:pids`, async (pids) => {diff --git a/test/groups.js b/test/groups.jsindex 4b648c9b5e..73538bf726 100644--- a/test/groups.js+++ b/test/groups.js@@ -660,6 +660,54 @@ describe('Groups', () => {isMember = await Groups.isMember(uid, 'registered-users');assert(isMember);});++ describe('public chat rooms restricted to the group', () => {+ const messaging = require('../src/messaging');+ let memberUid;+ let outsiderUid;++ before(async () => {+ memberUid = await User.create({ username: 'destroyed-group-member' });+ outsiderUid = await User.create({ username: 'destroyed-group-outsider' });+ });++ async function createRoomFor(groupName, groupNames) {+ await Groups.create({ name: groupName });+ await Groups.join(groupName, memberUid);+ const roomId = await messaging.newRoom(adminUid, {+ type: 'public',+ roomName: utils.generateUUID(),+ groups: groupNames,+ });+ await messaging.loadRoom(memberUid, { roomId });+ await messaging.sendMessage({ uid: memberUid, roomId, content: 'restricted history' });+ return roomId;+ }++ it('should not let a new group with the same name into the room', async () => {+ const roomId = await createRoomFor('destroyed-room-group', ['destroyed-room-group']);+ await Groups.destroy('destroyed-room-group');+ await Groups.create({ name: 'destroyed-room-group', ownerUid: outsiderUid });++ assert.strictEqual(await messaging.loadRoom(outsiderUid, { roomId }), null);+ const { groups } = await messaging.getRoomData(roomId);+ assert.deepStrictEqual(groups, ['administrators']);+ });++ it('should remove members who no longer have access', async () => {+ const roomId = await createRoomFor('destroyed-room-group-2', ['destroyed-room-group-2']);+ await Groups.destroy('destroyed-room-group-2');+ assert.strictEqual(await messaging.isUserInRoom(memberUid, roomId), false);+ });++ it('should keep the room\'s other groups', async () => {+ await Groups.create({ name: 'surviving-room-group' });+ const roomId = await createRoomFor('destroyed-room-group-3', ['destroyed-room-group-3', 'surviving-room-group']);+ await Groups.destroy('destroyed-room-group-3');+ const { groups } = await messaging.getRoomData(roomId);+ assert.deepStrictEqual(groups, ['surviving-room-group']);+ });+ });});describe('.join()', () => {