Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2025-10-26 08:36:12 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix: privileges added by plugins (#9802)

Browse Source 
* fix: privileges added by plugins

when copying a categories privileges, privileges added by plugins will be copied as well
when purging a category privileges added by plugins will be purged as well
show plugin privileges in privileges.<categories/admin/global>.get
show plugin privileges in privileges.<categories/admin/global>.userPrivileges
show plugin privileges in privileges.<categories/admin/global>.groupPrivileges

* fix: typo
This commit is contained in:
Barış Soner Uşaklı
2021-09-11 16:43:48 -04:00
committed by GitHub
parent 506035b5f7
commit 3ecbb624d8
7 changed files with 62 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/api/categories.js
View File

@@ -71,16 +71,19 @@ categoriesAPI.setPrivilege = async (caller, data) => {
throw new Error('[[error:invalid-data]]');
}
if (parseInt(data.cid, 10) === 0) {
const adminPrivs = privs.filter(priv => privileges.admin.privilegeList.includes(priv));
const globalPrivs = privs.filter(priv => privileges.global.privilegeList.includes(priv));
const adminPrivList = await privileges.admin.getPrivilegeList();
const adminPrivs = privs.filter(priv => adminPrivList.includes(priv));
if (adminPrivs.length) {
await privileges.admin[type](adminPrivs, data.member);
}
const globalPrivList = await privileges.global.getPrivilegeList();
const globalPrivs = privs.filter(priv => globalPrivList.includes(priv));
if (globalPrivs.length) {
await privileges.global[type](globalPrivs, data.member);
}
} else {
const categoryPrivs = privs.filter(priv => privileges.categories.privilegeList.includes(priv));
const categoryPrivList = await privileges.categories.getPrivilegeList();
const categoryPrivs = privs.filter(priv => categoryPrivList.includes(priv));
await privileges.categories[type](categoryPrivs, data.cid, data.member);
}

5
src/categories/create.js
View File

@@ -203,9 +203,10 @@ module.exports = function (Categories) {
group = group || '';
let privsToCopy;
if (group) {
privsToCopy = privileges.categories.groupPrivilegeList.slice(...filter);
const groupPrivilegeList = await privileges.categories.getGroupPrivilegeList();
privsToCopy = groupPrivilegeList.slice(...filter);
} else {
const privs = privileges.categories.privilegeList.slice();
const privs = await privileges.categories.getPrivilegeList();
const halfIdx = privs.length / 2;
privsToCopy = privs.slice(0, halfIdx).slice(...filter).concat(privs.slice(halfIdx).slice(...filter));
}

3
src/categories/delete.js
View File

@@ -48,7 +48,8 @@ module.exports = function (Categories) {
`cid:${cid}:tag:whitelist`,
`category:${cid}`,
]);
await groups.destroy(privileges.categories.privilegeList.map(privilege => `cid:${cid}:privileges:${privilege}`));
const privilegeList = await privileges.categories.getPrivilegeList();
await groups.destroy(privilegeList.map(privilege => `cid:${cid}:privileges:${privilege}`));
}
async function removeFromParent(cid) {

5
src/controllers/admin/admins-mods.js
View File

@@ -19,10 +19,11 @@ AdminsMods.get = async function (req, res, next) {
if (!selectedCategory) {
return next();
}
const [admins, globalMods, moderators] = await Promise.all([
const [admins, globalMods, moderators, categoryPrivList] = await Promise.all([
groups.get('administrators', { uid: req.uid }),
groups.get('Global Moderators', { uid: req.uid }),
getModeratorsOfCategories(selectedCategory),
privileges.categories.getUserPrivilegeList(),
]);
res.render('admin/manage/admins-mods', {
@@ -30,7 +31,7 @@ AdminsMods.get = async function (req, res, next) {
globalMods: globalMods,
categoryMods: [moderators],
selectedCategory: selectedCategory,
allPrivileges: privileges.categories.userPrivilegeList,
allPrivileges: categoryPrivList,
});
};

21
src/privileges/admin.js
View File

@@ -37,6 +37,16 @@ privsAdmin.groupPrivilegeList = privsAdmin.userPrivilegeList.map(privilege => `g
privsAdmin.privilegeList = privsAdmin.userPrivilegeList.concat(privsAdmin.groupPrivilegeList);
privsAdmin.getUserPrivilegeList = async () => await plugins.hooks.fire('filter:privileges.admin.list', privsAdmin.userPrivilegeList.slice());
privsAdmin.getGroupPrivilegeList = async () => await plugins.hooks.fire('filter:privileges.admin.groups.list', privsAdmin.groupPrivilegeList.slice());
privsAdmin.getPrivilegeList = async () => {
const [user, group] = await Promise.all([
privsAdmin.getUserPrivilegeList(),
privsAdmin.getGroupPrivilegeList(),
]);
return user.concat(group);
};
// Mapping for a page route (via direct match or regexp) to a privilege
privsAdmin.routeMap = {
dashboard: 'admin:dashboard',
@@ -159,13 +169,14 @@ privsAdmin.list = async function (uid) {
};
privsAdmin.get = async function (uid) {
const userPrivilegeList = await privsAdmin.getUserPrivilegeList();
const [userPrivileges, isAdministrator] = await Promise.all([
helpers.isAllowedTo(privsAdmin.userPrivilegeList, uid, 0),
helpers.isAllowedTo(userPrivilegeList, uid, 0),
user.isAdministrator(uid),
]);
const combined = userPrivileges.map(allowed => allowed || isAdministrator);
const privData = _.zipObject(privsAdmin.userPrivilegeList, combined);
const privData = _.zipObject(userPrivilegeList, combined);
privData.superadmin = isAdministrator;
return await plugins.hooks.fire('filter:privileges.admin.get', privData);
@@ -200,9 +211,11 @@ privsAdmin.rescind = async function (privileges, groupName) {
};
privsAdmin.userPrivileges = async function (uid) {
return await helpers.userOrGroupPrivileges(0, uid, privsAdmin.userPrivilegeList);
const userPrivilegeList = await privsAdmin.getUserPrivilegeList();
return await helpers.userOrGroupPrivileges(0, uid, userPrivilegeList);
};
privsAdmin.groupPrivileges = async function (groupName) {
return await helpers.userOrGroupPrivileges(0, groupName, privsAdmin.groupPrivilegeList);
const groupPrivilegeList = await privsAdmin.getGroupPrivilegeList();
return await helpers.userOrGroupPrivileges(0, groupName, groupPrivilegeList);
};

16
src/privileges/categories.js
View File

@@ -54,6 +54,16 @@ privsCategories.groupPrivilegeList = privsCategories.userPrivilegeList.map(privi
privsCategories.privilegeList = privsCategories.userPrivilegeList.concat(privsCategories.groupPrivilegeList);
privsCategories.getUserPrivilegeList = async () => await plugins.hooks.fire('filter:privileges.list', privsCategories.userPrivilegeList.slice());
privsCategories.getGroupPrivilegeList = async () => await plugins.hooks.fire('filter:privileges.groups.list', privsCategories.groupPrivilegeList.slice());
privsCategories.getPrivilegeList = async () => {
const [user, group] = await Promise.all([
privsCategories.getUserPrivilegeList(),
privsCategories.getGroupPrivilegeList(),
]);
return user.concat(group);
};
// Method used in admin/category controller to show all users/groups with privs in that given cid
privsCategories.list = async function (cid) {
const labels = await utils.promiseParallel({
@@ -210,9 +220,11 @@ privsCategories.canMoveAllTopics = async function (currentCid, targetCid, uid) {
};
privsCategories.userPrivileges = async function (cid, uid) {
return await helpers.userOrGroupPrivileges(cid, uid, privsCategories.userPrivilegeList);
const userPrivilegeList = await privsCategories.getUserPrivilegeList();
return await helpers.userOrGroupPrivileges(cid, uid, userPrivilegeList);
};
privsCategories.groupPrivileges = async function (cid, groupName) {
return await helpers.userOrGroupPrivileges(cid, groupName, privsCategories.groupPrivilegeList);
const groupPrivilegeList = await privsCategories.getGroupPrivilegeList();
return await helpers.userOrGroupPrivileges(cid, groupName, groupPrivilegeList);
};

21
src/privileges/global.js
View File

@@ -51,6 +51,16 @@ privsGlobal.groupPrivilegeList = privsGlobal.userPrivilegeList.map(privilege =>
privsGlobal.privilegeList = privsGlobal.userPrivilegeList.concat(privsGlobal.groupPrivilegeList);
privsGlobal.getUserPrivilegeList = async () => await plugins.hooks.fire('filter:privileges.global.list', privsGlobal.userPrivilegeList.slice());
privsGlobal.getGroupPrivilegeList = async () => await plugins.hooks.fire('filter:privileges.global.groups.list', privsGlobal.groupPrivilegeList.slice());
privsGlobal.getPrivilegeList = async () => {
const [user, group] = await Promise.all([
privsGlobal.getUserPrivilegeList(),
privsGlobal.getGroupPrivilegeList(),
]);
return user.concat(group);
};
privsGlobal.list = async function () {
async function getLabels() {
return await utils.promiseParallel({
@@ -77,13 +87,14 @@ privsGlobal.list = async function () {
};
privsGlobal.get = async function (uid) {
const userPrivilegeList = await privsGlobal.getUserPrivilegeList();
const [userPrivileges, isAdministrator] = await Promise.all([
helpers.isAllowedTo(privsGlobal.userPrivilegeList, uid, 0),
helpers.isAllowedTo(userPrivilegeList, uid, 0),
user.isAdministrator(uid),
]);
const combined = userPrivileges.map(allowed => allowed || isAdministrator);
const privData = _.zipObject(privsGlobal.userPrivilegeList, combined);
const privData = _.zipObject(userPrivilegeList, combined);
return await plugins.hooks.fire('filter:privileges.global.get', privData);
};
@@ -122,9 +133,11 @@ privsGlobal.rescind = async function (privileges, groupName) {
};
privsGlobal.userPrivileges = async function (uid) {
return await helpers.userOrGroupPrivileges(0, uid, privsGlobal.userPrivilegeList);
const userPrivilegeList = await privsGlobal.getUserPrivilegeList();
return await helpers.userOrGroupPrivileges(0, uid, userPrivilegeList);
};
privsGlobal.groupPrivileges = async function (groupName) {
return await helpers.userOrGroupPrivileges(0, groupName, privsGlobal.groupPrivilegeList);
const groupPrivilegeList = await privsGlobal.getGroupPrivilegeList();
return await helpers.userOrGroupPrivileges(0, groupName, groupPrivilegeList);
};