Skip to content

Node.js based forum software built for the modern web

fix: dont return category if user doesnt have find privilege in getSelectedCategory

Barış Soner Uşaklı5a9d7f742c1c
diff --git a/src/controllers/admin/categories.js b/src/controllers/admin/categories.js
index 332951e386..8158c66f8e 100644
--- a/src/controllers/admin/categories.js
+++ b/src/controllers/admin/categories.js
@@ -20,7 +20,7 @@ categoriesController.get = async function (req, res, next) {
const [categoryData, parent, selectedData] = await Promise.all([
categories.getCategories([req.params.category_id]),
categories.getParents([req.params.category_id]),
- helpers.getSelectedCategory(req.params.category_id),
+ helpers.getSelectedCategory(req.params.category_id, req.uid),
]);
const category = categoryData[0];
@@ -144,7 +144,7 @@ categoriesController.buildBreadCrumbs = buildBreadcrumbs;
categoriesController.getAnalytics = async function (req, res) {
const [analyticsData, { selectedCategory }] = await Promise.all([
analytics.getCategoryAnalytics(req.params.category_id),
- helpers.getSelectedCategory(req.params.category_id),
+ helpers.getSelectedCategory(req.params.category_id, req.uid),
]);
res.render('admin/manage/category-analytics', {
@@ -160,7 +160,7 @@ categoriesController.getFederation = async function (req, res) {
db.getSortedSetMembers(`cid:${cid}:following`),
db.getSortedSetMembers(`followRequests:cid.${cid}`),
activitypub.notes.getCategoryFollowers(cid),
- helpers.getSelectedCategory(cid),
+ helpers.getSelectedCategory(cid, req.uid),
]);
const following = [..._following, ...pending].map(entry => ({
diff --git a/src/controllers/helpers.js b/src/controllers/helpers.js
index d9540da4d2..e7b3c3605e 100644
--- a/src/controllers/helpers.js
+++ b/src/controllers/helpers.js
@@ -274,7 +274,7 @@ async function getCategoryData(cids, uid, selectedCid, states, privilege) {
helpers.getVisibleCategories({
cids, uid, states, privilege, showLinks: false,
}),
- helpers.getSelectedCategory(selectedCid),
+ helpers.getSelectedCategory(selectedCid, uid),
]);
const categoriesData = categories.buildForSelectCategories(visibleCategories, ['disabledClass']);
@@ -345,11 +345,26 @@ helpers.getVisibleCategories = async function (params) {
});
};
-helpers.getSelectedCategory = async function (cids) {
+helpers.getSelectedCategory = async function (cids, uid) {
if (cids && !Array.isArray(cids)) {
cids = [cids];
}
+ if (uid === undefined) {
+ const als = require('../als');
+ const store = als.getStore();
+ const e = new Error('').stack.split('\n')[3].trim();
+ if (store) {
+ winston.warn(`helpers.getSelectedCategory called without uid, getting it from async local storage. This is not recommended and may break in future versions. Pass in a uid explicitly. Called ${e}`);
+ } else {
+ winston.warn(`helpers.getSelectedCategory called without uid and no async local storage found, falling back to uid:0. Pass in a uid explicitly. Called ${e}`);
+ }
+ uid = store && store.uid ? store.uid : 0;
+ }
+
cids = cids && cids.map(cid => parseInt(cid, 10));
+ if (cids && cids.length) {
+ cids = await privileges.categories.filterCids('find', cids, uid);
+ }
const selectedCategories = await categories.getCategoriesData(cids);
let selectedCategory = null;
const selectedCids = selectedCategories.map(c => c && c.cid).filter(Boolean);
diff --git a/src/controllers/mods.js b/src/controllers/mods.js
index e6cf621057..b7392c7ff2 100644
--- a/src/controllers/mods.js
+++ b/src/controllers/mods.js
@@ -90,7 +90,7 @@ modsController.flags.list = async function (req, res) {
query: req.query,
}),
analytics.getDailyStatsForSet('analytics:flags', Date.now(), 30),
- helpers.getSelectedCategory(validFilters.cid),
+ helpers.getSelectedCategory(validFilters.cid, req.uid),
]);
// Send back information for userFilter module
@@ -221,7 +221,7 @@ modsController.postQueue = async function (req, res, next) {
user.isAdministrator(req.uid),
user.isGlobalModerator(req.uid),
user.getModeratedCids(req.uid),
- helpers.getSelectedCategory(cid),
+ helpers.getSelectedCategory(cid, req.uid),
Promise.all(['global', 'admin'].map(async type => privileges[type].get(req.uid))),
]);
_privileges = { ..._privileges[0], ..._privileges[1] };
diff --git a/src/controllers/recent.js b/src/controllers/recent.js
index bc3f4126d7..7db4036a51 100644
--- a/src/controllers/recent.js
+++ b/src/controllers/recent.js
@@ -35,7 +35,7 @@ recentController.getData = async function (req, url, sort, selectedTerm = 'allti
const [settings, categoryData, tagData, rssToken, canPost, isPrivileged] = await Promise.all([
user.getSettings(req.uid),
- helpers.getSelectedCategory(cid),
+ helpers.getSelectedCategory(cid, req.uid),
helpers.getSelectedTag(tag),
user.auth.getFeedToken(req.uid),
privileges.categories.canPostTopic(req.uid),
diff --git a/src/controllers/tags.js b/src/controllers/tags.js
index 01d5477154..5ede56cb3f 100644
--- a/src/controllers/tags.js
+++ b/src/controllers/tags.js
@@ -32,7 +32,7 @@ tagsController.getTag = async function (req, res) {
const [settings, cids, categoryData, canPost, isPrivileged, rssToken, isFollowing] = await Promise.all([
user.getSettings(req.uid),
cid || categories.getCidsByPrivilege('categories:cid', req.uid, 'topics:read'),
- helpers.getSelectedCategory(cid),
+ helpers.getSelectedCategory(cid, req.uid),
privileges.categories.canPostTopic(req.uid),
user.isPrivileged(req.uid),
user.auth.getFeedToken(req.uid),
diff --git a/src/controllers/unread.js b/src/controllers/unread.js
index e55e0f5e96..5121547ce5 100644
--- a/src/controllers/unread.js
+++ b/src/controllers/unread.js
@@ -19,7 +19,7 @@ unreadController.get = async function (req, res) {
const filter = req.query.filter || '';
const [categoryData, tagData, userSettings, canPost, isPrivileged] = await Promise.all([
- helpers.getSelectedCategory(cid),
+ helpers.getSelectedCategory(cid, req.uid),
helpers.getSelectedTag(tag),
user.getSettings(req.uid),
privileges.categories.canPostTopic(req.uid),
diff --git a/test/controllers.js b/test/controllers.js
index 28cf152703..613815bf26 100644
--- a/test/controllers.js
+++ b/test/controllers.js
@@ -1983,6 +1983,20 @@ describe('Controllers', () => {
});
});
+ describe('controllers helpers' , () => {
+ const controllerHelpers = require('../src/controllers/helpers');
+ it('should filter cids with no find privilege', async () => {
+ const category1 = await categories.create({ name: 'category1' });
+ const category2 = await categories.create({ name: 'category2' });
+ await privileges.categories.rescind(['groups:find'], category1.cid, 'registered-users');
+ const { selectedCids, selectedCategory } = await controllerHelpers.getSelectedCategory([
+ category1.cid, category2.cid,
+ ], fooUid);
+ assert.deepStrictEqual(selectedCids, [category2.cid]);
+ assert.strictEqual(selectedCategory.cid, category2.cid);
+ });
+ });
+
after((done) => {
const analytics = require('../src/analytics');
analytics.writeData(done);