Skip to content

Node.js based forum software built for the modern web

fix: stale group members cache after group deletion

Barış Soner Uşaklı7a1358e6dc83
diff --git a/src/groups/delete.js b/src/groups/delete.js
index 129e8dd9c2..0ded077de2 100644
--- a/src/groups/delete.js
+++ b/src/groups/delete.js
@@ -33,6 +33,7 @@ module.exports = function (Groups) {
.filter(groupName => !Groups.isPrivilegeGroup(groupName))
.map(groupName => slugify(groupName));
+ await removeGroupsFromPrivilegeGroups(groupNames);
await Promise.all([
db.deleteAll(keys),
db.sortedSetRemove([
@@ -42,18 +43,21 @@ module.exports = function (Groups) {
], groupNames),
db.sortedSetRemove('groups:visible:name', sets),
db.deleteObjectFields('groupslug:groupname', groupSlugs),
- removeGroupsFromPrivilegeGroups(groupNames),
]);
Groups.cache.reset();
- cache.del(`zset:groups:createtime`);
+ cache.del([
+ `zset:groups:createtime`,
+ ...groupNames.map(groupName => `group:${groupName}:members`),
+ ]);
plugins.hooks.fire('action:groups.destroy', { groups: groupsData });
};
async function removeGroupsFromPrivilegeGroups(groupNames) {
await batch.processSortedSet('groups:createtime', async (otherGroups) => {
- const privilegeGroups = otherGroups.filter(group => Groups.isPrivilegeGroup(group));
+ const privilegeGroups = otherGroups.filter(Groups.isPrivilegeGroup);
const keys = privilegeGroups.map(group => `group:${group}:members`);
await db.sortedSetRemove(keys, groupNames);
+ cache.del(keys);
}, {
batch: 500,
});
diff --git a/src/groups/membership.js b/src/groups/membership.js
index aa25719652..0b8fd2154f 100644
--- a/src/groups/membership.js
+++ b/src/groups/membership.js
@@ -169,7 +169,9 @@ module.exports = function (Groups) {
if (!nonCachedKeys.length) {
return isArray ? keys.map(groupName => cachedData[groupName]) : cachedData[keys[0]];
}
- const groupMembers = await db.getSortedSetsMembers(nonCachedKeys.map(name => `group:${name}:members`));
+ const groupMembers = await db.getSortedSetsMembers(
+ nonCachedKeys.map(name => `group:${name}:members`)
+ );
nonCachedKeys.forEach((groupName, index) => {
cachedData[groupName] = groupMembers[index];
diff --git a/test/groups.js b/test/groups.js
index dbf8aa4f06..78d6d8e62f 100644
--- a/test/groups.js
+++ b/test/groups.js
@@ -1131,6 +1131,34 @@ describe('Groups', () => {
assert(!exists);
});
+ it('should delete group members set from the cache after group deletion', async () => {
+ const group = await Groups.create({ name: 'cachedgroup' });
+ const memberGroup = await Groups.create({ name: 'membergroup' });
+ const cache = require('../src/cache');
+
+ assert.strictEqual(cache.get(`group:cachedgroup:members`), undefined);
+ assert.deepStrictEqual(
+ await db.getSortedSetMembers(`group:cachedgroup:members`),
+ []
+ );
+
+ await Groups.join('cachedgroup', 'membergroup');
+ assert.deepStrictEqual(
+ await db.getSortedSetMembers(`group:cachedgroup:members`),
+ ['membergroup']
+ );
+ assert.deepStrictEqual(
+ // this caches "group:cachedgroup:members"
+ await Groups.isMemberOfGroupsList(testUid, ['cachedgroup']),
+ [false]
+ );
+ // confirm it's cached
+ assert.deepStrictEqual(cache.get(`group:cachedgroup:members`), ['membergroup']);
+ await Groups.destroy('cachedgroup');
+ // confirm it's removed from cache after destroy
+ assert.strictEqual(cache.get(`group:cachedgroup:members`), undefined);
+ });
+
it('should fail to delete group if name is special', async () => {
const specialGroups = [
'administrators', 'registered-users', 'verified-users',