Node.js based forum software built for the modern web
fix: update privileges.posts.get so it checks topic for
Barış Soner Uşaklı2c1a747ea2ca
diff --git a/install/package.json b/install/package.jsonindex 0b7ab8e746..73441ff0e6 100644--- a/install/package.json+++ b/install/package.json@@ -102,7 +102,7 @@"multer": "2.2.0","nconf": "0.13.0","nodebb-plugin-2factor": "8.0.1",- "nodebb-plugin-composer-default": "11.0.7",+ "nodebb-plugin-composer-default": "11.0.8","nodebb-plugin-dbsearch": "7.0.0","nodebb-plugin-emoji": "6.0.14","nodebb-plugin-emoji-android": "4.1.1",diff --git a/src/api/posts.js b/src/api/posts.jsindex a9affbe2bd..ffca718e9f 100644--- a/src/api/posts.js+++ b/src/api/posts.js@@ -45,9 +45,11 @@ postsAPI.get = async function (caller, data) {};postsAPI.getIndex = async (caller, { pid, sort }) => {- const tid = await posts.getPostField(pid, 'tid');- const topicPrivileges = await privileges.topics.get(tid, caller.uid);- if (!topicPrivileges.read || !topicPrivileges['topics:read']) {+ const [[userPrivilege], tid] = await Promise.all([+ privileges.posts.get([pid], caller.uid),+ posts.getPostField(pid, 'tid'),+ ]);+ if (!userPrivilege.read || !userPrivilege['topics:read'] || userPrivilege.disabled) {return null;}@@ -55,14 +57,13 @@ postsAPI.getIndex = async (caller, { pid, sort }) => {};postsAPI.getSummary = async (caller, { pid }) => {- const tid = await posts.getPostField(pid, 'tid');- const topicPrivileges = await privileges.topics.get(tid, caller.uid);- if (!topicPrivileges.read || !topicPrivileges['topics:read']) {+ const [userPrivilege] = await privileges.posts.get([pid], caller.uid);+ if (!userPrivilege.read || !userPrivilege['topics:read'] || userPrivilege.disabled) {return null;}const postsData = await posts.getPostSummaryByPids([pid], caller.uid, { stripTags: false });- posts.modifyPostByPrivilege(postsData[0], topicPrivileges);+ posts.modifyPostByPrivilege(postsData[0], userPrivilege);return postsData[0];};diff --git a/src/controllers/errors.js b/src/controllers/errors.jsindex e33719b09f..5c7de56b9b 100644--- a/src/controllers/errors.js+++ b/src/controllers/errors.js@@ -104,6 +104,8 @@ exports.handleErrors = async function handleErrors(err, req, res, next) { // esldata.cases[err.code](err, req, res, defaultHandler);} else if (err.message && err.message.startsWith('[[error:no-') && err.message !== '[[error:no-privileges]]') {notFoundHandler();+ } else if (err.message === '[[error:no-privileges]]') {+ await helpers.notAllowed(req, res, err.message);} else if (err.message && err.message.startsWith('Failed to lookup view')) {notBuiltHandler();} else {diff --git a/src/privileges/categories.js b/src/privileges/categories.jsindex d85f891d95..36e4f775fe 100644--- a/src/privileges/categories.js+++ b/src/privileges/categories.js@@ -97,10 +97,11 @@ privsCategories.get = async function (cid, uid) {'topics:tag', 'read', 'posts:view_deleted',];- let [userPrivileges, isAdministrator, isModerator] = await Promise.all([+ let [userPrivileges, isAdministrator, isModerator, disabled] = await Promise.all([helpers.isAllowedTo(privs, uid, cid),user.isAdministrator(uid),user.isModerator(uid, cid),+ categories.getCategoryField(cid, 'disabled'),]);if (utils.isNumber(cid)) {@@ -115,7 +116,9 @@ privsCategories.get = async function (cid, uid) {uid: uid,editable: isAdminOrMod,view_deleted: isAdminOrMod || privData['posts:view_deleted'],+ view_scheduled : isAdministrator || privData['topics:schedule'],isAdminOrMod: isAdminOrMod,+ disabled,});};diff --git a/src/privileges/posts.js b/src/privileges/posts.jsindex e0f65011c1..5bf66303c3 100644--- a/src/privileges/posts.js+++ b/src/privileges/posts.js@@ -22,15 +22,19 @@ privsPosts.get = async function (pids, uid) {if (!Array.isArray(pids) || !pids.length) {return [];}- const cids = await posts.getCidsByPids(pids);- const uniqueCids = _.uniq(cids);+ const postData = await posts.getPostsFields(pids, ['tid']);+ const uniqTids = _.uniq(postData.map(p => p && p.tid).filter(Boolean));+ const topicData = await topics.getTopicsFields(uniqTids, ['cid', 'uid', 'deleted', 'scheduled']);+ const tidToTopic = _.zipObject(uniqTids, topicData);+ const uniqueCids = _.uniq(topicData.map(t => t && t.cid).filter(Boolean));const results = await utils.promiseParallel({isAdmin: user.isAdministrator(uid),isModerator: user.isModerator(uid, uniqueCids),isOwner: posts.isOwner(pids, uid),- 'topics:read': helpers.isAllowedTo('topics:read', uid, uniqueCids),read: helpers.isAllowedTo('read', uid, uniqueCids),+ 'topics:read': helpers.isAllowedTo('topics:read', uid, uniqueCids),+ 'topics:schedule': helpers.isAllowedTo('topics:schedule', uid, uniqueCids),'posts:edit': helpers.isAllowedTo('posts:edit', uid, uniqueCids),'posts:history': helpers.isAllowedTo('posts:history', uid, uniqueCids),'posts:view_deleted': helpers.isAllowedTo('posts:view_deleted', uid, uniqueCids),@@ -39,24 +43,33 @@ privsPosts.get = async function (pids, uid) {const isModerator = _.zipObject(uniqueCids, results.isModerator);const privData = {};- privData['topics:read'] = _.zipObject(uniqueCids, results['topics:read']);privData.read = _.zipObject(uniqueCids, results.read);+ privData['topics:read'] = _.zipObject(uniqueCids, results['topics:read']);+ privData['topics:schedule'] = _.zipObject(uniqueCids, results['topics:schedule']);privData['posts:edit'] = _.zipObject(uniqueCids, results['posts:edit']);privData['posts:history'] = _.zipObject(uniqueCids, results['posts:history']);privData['posts:view_deleted'] = _.zipObject(uniqueCids, results['posts:view_deleted']);privData.disabled = _.zipObject(uniqueCids, results.categoryData.map(c => c && c.disabled));- const privileges = cids.map((cid, i) => {+ const privileges = postData.map((post, i) => {+ const topic = tidToTopic[post.tid] || {};+ const { cid } = topic;+ const isTopicOwner = String(topic.uid) === String(uid);const isAdminOrMod = results.isAdmin || isModerator[cid];const editable = (privData['posts:edit'][cid] && (results.isOwner[i] || results.isModerator[i])) || results.isAdmin;const viewDeletedPosts = results.isOwner[i] || privData['posts:view_deleted'][cid] || results.isAdmin;const viewHistory = results.isOwner[i] || privData['posts:history'][cid] || results.isAdmin;+ const canViewDeletedScheduled = privsTopics.canViewDeletedScheduled(topic, {+ view_deleted: results.isAdmin || isTopicOwner || privData['posts:view_deleted'][cid],+ view_scheduled: results.isAdmin || privData['topics:schedule'][cid],+ });+return {editable: editable,move: isAdminOrMod,isAdminOrMod: isAdminOrMod,- 'topics:read': privData['topics:read'][cid] || results.isAdmin,+ 'topics:read': results.isAdmin || (privData['topics:read'][cid] && canViewDeletedScheduled),read: privData.read[cid] || results.isAdmin,'posts:history': viewHistory,'posts:view_deleted': viewDeletedPosts,@@ -131,7 +144,9 @@ privsPosts.canEdit = async function (pid, uid) {postData: posts.getPostFields(pid, ['tid', 'timestamp', 'deleted', 'deleterUid']),userData: user.getUserFields(uid, ['reputation']),});-+ if (!results.postData.tid) {+ return { flag: false, message: '[[error:no-post]]' };+ }results.isMod = results.isMod[0];if (results.isAdmin) {return { flag: true };diff --git a/src/privileges/topics.js b/src/privileges/topics.jsindex 4d2a41cd99..640734e89e 100644--- a/src/privileges/topics.js+++ b/src/privileges/topics.js@@ -75,7 +75,7 @@ privsTopics.get = async function (tid, uid) {editable: editable,deletable: deletable,canMoveOwnTopic: canMoveOwnTopic,- view_deleted: isAdminOrMod || isOwner || privData['posts:view_deleted'],+ view_deleted: isAdministrator || isOwner || privData['posts:view_deleted'],view_scheduled: privData['topics:schedule'] || isAdministrator,isAdminOrMod: isAdminOrMod,disabled: disabled,diff --git a/src/socket.io/posts.js b/src/socket.io/posts.jsindex b20fbe9b97..b1130faca1 100644--- a/src/socket.io/posts.js+++ b/src/socket.io/posts.js@@ -48,8 +48,8 @@ SocketPosts.getPostTimestampByIndex = async function (socket, data) {pid = await db.getSortedSetRange(`tid:${data.tid}:posts`, data.index - 1, data.index - 1);}pid = Array.isArray(pid) ? pid[0] : pid;- const topicPrivileges = await privileges.topics.get(data.tid, socket.uid);- if (!topicPrivileges['topics:read']) {+ const [postPrivileges] = await privileges.posts.get([pid], socket.uid);+ if (!postPrivileges.read || !postPrivileges['topics:read'] || postPrivileges.disabled) {throw new Error('[[error:no-privileges]]');}@@ -63,10 +63,6 @@ SocketPosts.getPostSummaryByPid = async function (socket, data) {return await api.posts.getSummary(socket, { pid });};-SocketPosts.getCategory = async function (socket, pid) {- return await posts.getCidByPid(pid);-};-SocketPosts.getPidIndex = async function (socket, data) {sockets.warnDeprecated(socket, 'GET /api/v3/posts/:pid/index');diff --git a/test/posts.js b/test/posts.jsindex e7d500c6a2..dcf2430364 100644--- a/test/posts.js+++ b/test/posts.js@@ -797,7 +797,7 @@ describe('Post\'s', () => {});});- describe('socket methods', () => {+ describe('socket/api methods', () => {let pid;before((done) => {topics.reply({@@ -891,13 +891,8 @@ describe('Post\'s', () => {assert(summary);});- it('should get post category', async () => {- const postCid = await socketPosts.getCategory({ uid: voterUid }, pid);- assert.equal(cid, postCid);- });-it('should get pid index', async () => {- const index = await socketPosts.getPidIndex({ uid: voterUid }, { pid: pid, tid: topicData.tid, topicPostSort: 'oldest_to_newest' });+ const index = await socketPosts.getPidIndex({ uid: voterUid }, { pid: pid, topicPostSort: 'oldest_to_newest' });assert.equal(index, 4);});@@ -916,6 +911,43 @@ describe('Post\'s', () => {const index = await apiPosts.getIndex({ uid: voterUid }, { pid: postData.pid, sort: 'newest_to_oldest' });assert.equal(index, 1);});++ describe('deleted topic posts', () => {+ let tid;+ let pidInDeletedTopic;+ before(async () => {+ const { topicData } = await topics.post({+ uid: globalModUid,+ cid,+ title: 'just a topic for deleted tests',+ content: `post content in deleted topic`,+ deleted: 1,+ });+ tid = topicData.tid;+ pidInDeletedTopic = topicData.mainPid;+ });++ it('should not get post if the topic is deleted', async () => {+ const results = await Promise.all([+ apiPosts.get({ uid: voterUid }, { pid: pidInDeletedTopic }),+ apiPosts.getIndex({ uid: voterUid }, { pid: pidInDeletedTopic, sort: 'oldest_to_newest' }),+ apiPosts.getRaw({ uid: voterUid }, { pid: pidInDeletedTopic }),+ apiPosts.getSummary({ uid: voterUid }, { pid: pidInDeletedTopic }),+ ]);+ assert.deepStrictEqual(results, [null, null, null, null]);+ });++ it('should get post if called by globalMod', async () => {+ const results = await Promise.all([+ apiPosts.get({ uid: globalModUid }, { pid: pidInDeletedTopic }),+ apiPosts.getIndex({ uid: globalModUid }, { pid: pidInDeletedTopic, sort: 'oldest_to_newest' }),+ apiPosts.getRaw({ uid: globalModUid }, { pid: pidInDeletedTopic }),+ apiPosts.getSummary({ uid: globalModUid }, { pid: pidInDeletedTopic }),+ ]);+ assert(results.every(result => result !== null));+ });+ });+});describe('filterPidsByCid', () => {