Node.js based forum software built for the modern web
fix: fix topic moving privileges
Barış Soner Uşaklıd5a589d2a30a
diff --git a/src/api/topics.js b/src/api/topics.jsindex afb447f5e8..c08d42c837 100644--- a/src/api/topics.js+++ b/src/api/topics.js@@ -300,29 +300,34 @@ topicsAPI.bump = async (caller, { tid }) => {topicsAPI.move = async (caller, { tid, cid }) => {const tids = Array.isArray(tid) ? tid : [tid];- const isAdminOrMod = await privileges.categories.isAdminOrMod(cid, caller.uid);+ const [isAdmin, isModOfDestination, [canCreate, canRead], uids] = await Promise.all([+ privileges.users.isAdministrator(caller.uid),+ privileges.users.isModerator(caller.uid, cid),+ privileges.categories.can(['topics:create', 'topics:read'], cid, caller.uid),+ user.getUidsFromSet('users:online', 0, -1),+ ]);- let maxOwnerPosts = 0;- if (!isAdminOrMod) {- const [canCreate, canRead] = await privileges.categories.can(['topics:create', 'topics:read'], cid, caller.uid);- if (!canCreate || !canRead) {- throw new Error('[[error:no-privileges]]');- }- maxOwnerPosts = parseInt(meta.config.movingTopicsMaxPosts, 10);- if (Number.isNaN(maxOwnerPosts)) {- maxOwnerPosts = 5;- }+ let maxOwnerPosts = parseInt(meta.config.movingTopicsMaxPosts, 10);+ if (Number.isNaN(maxOwnerPosts)) {+ maxOwnerPosts = 5;}-- const uids = await user.getUidsFromSet('users:online', 0, -1);- const cids = [parseInt(cid, 10)];+ const canCreateAndReadDestination = canCreate && canRead;+ const updateCids = [parseInt(cid, 10)];await batch.processArray(tids, async (tids) => {- await Promise.all(tids.map(async (tid) => {- const topicData = await topics.getTopicFields(tid, ['tid', 'cid', 'uid', 'mainPid', 'slug', 'deleted', 'locked', 'postcount']);- if (!isAdminOrMod) {- const isOwner = parseInt(topicData.uid, 10) === parseInt(caller.uid, 10);- if (!isOwner || topicData.locked || topicData.deleted) {+ const topicsData = await topics.getTopicsFields(tids, ['tid', 'cid', 'uid', 'mainPid', 'slug', 'deleted', 'locked', 'postcount']);+ const cids = topicsData.map(t => t && t.cid);+ const isModOfTopicCid = await privileges.users.isModerator(caller.uid, cids);++ await Promise.all(tids.map(async (tid, index) => {+ const topicData = topicsData[index];+ if (!topicData || !topicData.uid || !topicData.cid) {+ return;+ }+ const isModOfSourceAndDestination = isModOfDestination && isModOfTopicCid[index];+ if (!isAdmin && !isModOfSourceAndDestination) {+ const isOwnerOfTopic = parseInt(topicData.uid, 10) === parseInt(caller.uid, 10);+ if (!isOwnerOfTopic || !canCreateAndReadDestination || topicData.locked || topicData.deleted) {throw new Error('[[error:no-privileges]]');}if (maxOwnerPosts > 0 && topicData.postcount > maxOwnerPosts) {@@ -330,8 +335,8 @@ topicsAPI.move = async (caller, { tid, cid }) => {}}topicData.toCid = cid;- if (!cids.includes(topicData.cid)) {- cids.push(topicData.cid);+ if (!updateCids.includes(topicData.cid)) {+ updateCids.push(topicData.cid);}await topics.tools.move(tid, {cid,@@ -366,5 +371,5 @@ topicsAPI.move = async (caller, { tid, cid }) => {}));}, { batch: 10 });- await categories.onTopicsMoved(cids);+ await categories.onTopicsMoved(updateCids);};diff --git a/test/topics/tools.js b/test/topics/tools.jsindex 962863c0f8..cb4ccb5ab2 100644--- a/test/topics/tools.js+++ b/test/topics/tools.js@@ -9,6 +9,8 @@ const categories = require('../../src/categories');const groups = require('../../src/groups');const topics = require('../../src/topics');const utils = require('../../src/utils');+const api = require('../../src/api');+const privileges = require('../../src/privileges');describe('Topic tools', () => {describe('Topic moving', () => {@@ -61,6 +63,84 @@ describe('Topic tools', () => {assert(Array.isArray(tids));assert.deepStrictEqual(tids, []);});++ it('should only allow topic moving if user is a moderator of the source and destination category', async () => {+ const uid1 = await user.create({ username: utils.generateUUID().slice(0, 8) });+ const uid2 = await user.create({ username: utils.generateUUID().slice(0, 8) });+ const { topicData } = await topics.post({+ uid: uid1,+ cid: cid1,+ title: utils.generateUUID(),+ content: utils.generateUUID(),+ });+ await assert.rejects(+ api.topics.move({ uid: uid2 }, {+ cid: cid2,+ tid: topicData.tid,+ }),+ { message: '[[error:no-privileges]]' }+ );++ // making moderator on destination+ await privileges.categories.give(['moderate'], cid2, [uid2]);+ await assert.rejects(+ api.topics.move({ uid: uid2 }, {+ cid: cid2,+ tid: topicData.tid,+ }),+ { message: '[[error:no-privileges]]' }+ );++ // making moderator on source+ await privileges.categories.give(['moderate'], cid1, [uid2]);+ await api.topics.move({ uid: uid2 }, {+ cid: cid2,+ tid: topicData.tid,+ });+ assert.strictEqual(+ String(await topics.getTopicField(topicData.tid, 'cid')),+ String(cid2)+ );+ });++ it('should allow topic moving if user is a the owner of the topic', async () => {+ const uid1 = await user.create({ username: utils.generateUUID().slice(0, 8) });+ const { topicData } = await topics.post({+ uid: uid1,+ cid: cid1,+ title: utils.generateUUID(),+ content: utils.generateUUID(),+ });++ await api.topics.move({ uid: uid1 }, {+ cid: cid2,+ tid: topicData.tid,+ });++ assert.strictEqual(+ String(await topics.getTopicField(topicData.tid, 'cid')),+ String(cid2)+ );+ });++ it('should disallow topic moving if user does not have privs in destination category', async () => {+ const uid1 = await user.create({ username: utils.generateUUID().slice(0, 8) });+ await privileges.categories.rescind(['groups:topics:create'], cid2, 'registered-users');+ const { topicData } = await topics.post({+ uid: uid1,+ cid: cid1,+ title: utils.generateUUID(),+ content: utils.generateUUID(),+ });++ await assert.rejects(+ api.topics.move({ uid: uid1 }, {+ cid: cid2,+ tid: topicData.tid,+ }),+ { message: '[[error:no-privileges]]' }+ );+ });});describe('with remote categories', () => {