Node.js based forum software built for the modern web
fix: post queue self approve via cid modification
Barış Soner Uşaklı7864331ea8af
diff --git a/src/posts/queue.js b/src/posts/queue.jsindex 1634cd6bd2..fc62e436e8 100644--- a/src/posts/queue.js+++ b/src/posts/queue.js@@ -483,22 +483,22 @@ module.exports = function (Posts) {}if (editData.content !== undefined) {- data.data.content = editData.content;+ data.data.content = String(editData.content);}if (editData.title !== undefined) {- data.data.title = editData.title;+ data.data.title = String(editData.title);}if (editData.cid !== undefined) {- data.data.cid = editData.cid;+ data.data.cid = String(editData.cid);}- if (editData.tags !== undefined) {- data.data.tags = editData.tags;+ if (Array.isArray(editData.tags)) {+ data.data.tags = editData.tags.map(String);}- if (editData.thumbs !== undefined) {- data.data.thumbs = editData.thumbs;+ if (Array.isArray(editData.thumbs)) {+ data.data.thumbs = editData.thumbs.map(String);}if (editData.crosspostCid !== undefined) {- data.data.crosspostCid = editData.crosspostCid;+ data.data.crosspostCid = String(editData.crosspostCid);}await db.setObjectField(`post:queue:${editData.id}`, 'data', JSON.stringify(data.data));cache.del('post-queue');@@ -526,10 +526,10 @@ module.exports = function (Posts) {} else if (data.type === 'reply') {cid = await topics.getTopicField(data.data.tid, 'cid');}- const isModerator = await user.isModerator(uid, cid);+ const isModerator = await user.isModerator(uid, String(cid));let isModeratorOfTargetCid = true;if (editData.cid) {- isModeratorOfTargetCid = await user.isModerator(uid, editData.cid);+ isModeratorOfTargetCid = await user.isModerator(uid, String(editData.cid));}return isModerator && isModeratorOfTargetCid;};diff --git a/src/privileges/categories.js b/src/privileges/categories.jsindex eccb3cd31f..0c7e1eab9d 100644--- a/src/privileges/categories.js+++ b/src/privileges/categories.js@@ -150,7 +150,7 @@ privsCategories.isAdminOrMod = async function (cid, uid) {}const [isAdmin, isMod] = await Promise.all([user.isAdministrator(uid),- user.isModerator(uid, cid),+ user.isModerator(uid, String(cid)),]);return isAdmin || isMod;};diff --git a/src/privileges/topics.js b/src/privileges/topics.jsindex a929f7bd5d..de9d1de21c 100644--- a/src/privileges/topics.js+++ b/src/privileges/topics.js@@ -225,7 +225,7 @@ privsTopics.isAdminOrMod = async function (tid, uid) {return false;}const cid = await topics.getTopicField(tid, 'cid');- return await privsCategories.isAdminOrMod(cid, uid);+ return await privsCategories.isAdminOrMod(String(cid), uid);};privsTopics.canViewDeletedScheduled = function (topic, privileges = {}, viewDeleted = false, viewScheduled = false) {diff --git a/src/topics/create.js b/src/topics/create.jsindex 6db78e8309..e0d14e483f 100644--- a/src/topics/create.js+++ b/src/topics/create.js@@ -265,7 +265,7 @@ module.exports = function (Topics) {Topics.syncBacklinks({ ...postData, content }),Topics.markAsRead([tid], uid),]);- if (utils.isNumber(postOwner) && postData.category.cid === -1) {+ if (utils.isNumber(postOwner) && postData.category?.cid === -1) {activitypub.notes.syncUserInboxes(tid, uid);}diff --git a/test/posts.js b/test/posts.jsindex 065a8a8c04..2d2e57705a 100644--- a/test/posts.js+++ b/test/posts.js@@ -1140,6 +1140,22 @@ describe('Post\'s', () => {await apiPosts.editQueuedPost({ uid: globalModUid }, { id: topicQueueId, cid: cid });});++ it('should fail to approve self post', async () => {+ const { id, queued} = await apiTopics.create({ uid: uid }, { title: 'should be queued', content: 'queued topic content', cid });+ assert.strictEqual(queued, true);++ await assert.rejects(+ apiPosts.acceptQueuedPost({ uid: uid }, { id: id }),+ { message: '[[error:no-post]]' },+ );+ await apiPosts.editQueuedPost({ uid: uid }, { id: id, cid: [2] });+ await assert.rejects(+ apiPosts.acceptQueuedPost({ uid: uid }, { id: id }),+ { message: '[[error:no-post]]' },+ );+ });+it('should prevent regular users from approving posts', async () => {// Restricted and missing queue entries respond identically (no existence oracle)await assert.rejects(diff --git a/test/privileges.js b/test/privileges.jsnew file mode 100644index 0000000000..beec1d8a0a--- /dev/null+++ b/test/privileges.js@@ -0,0 +1,39 @@+'use strict';++'use strict';++const db = require('./mocks/databasemock');++const assert = require('assert');+const categories = require('../src/categories');+const user = require('../src/user');+const groups = require('../src/groups');+const privileges = require('../src/privileges');+++describe('Privileges', () => {+ let categoryObj;+ let regularUid;+ let adminUid;++ before(async () => {+ regularUid = await user.create({ username: 'poster' });+ adminUid = await user.create({ username: 'admin' });+ await groups.join('administrators', adminUid);+ categoryObj = await categories.create({ name: 'asd' });+ });+++ it('should return false if user is not a moderator', async () => {+ assert.strictEqual(+ await privileges.categories.isAdminOrMod(categoryObj.cid, regularUid),+ false+ );++ assert.strictEqual(+ await privileges.categories.isAdminOrMod([categoryObj.cid], regularUid),+ false+ );+ });+});+