Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2025-10-31 19:15:58 +01:00
Code Issues Packages Projects Releases Wiki Activity

improve helpers.isUserAllowedTo

Browse Source 
ability to pass in an array of privileges and a single cid
This commit is contained in:
barisusakli
2016-09-15 14:01:56 +03:00
parent a42d8c5be2
commit 07852862f5
3 changed files with 75 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

59
src/privileges/helpers.js
View File

@@ -16,9 +16,19 @@ helpers.some = function(tasks, callback) {
});
};
helpers.isUserAllowedTo = function(privilege, uid, cids, callback) {
helpers.isUserAllowedTo = function(privilege, uid, cid, callback) {
if (Array.isArray(privilege) && !Array.isArray(cid)) {
isUserAllowedToPrivileges(privilege, uid, cid, callback);
} else if (Array.isArray(cid) && !Array.isArray(privilege)) {
isUserAllowedToCids(privilege, uid, cid, callback);
} else {
return callback(new Error('[[error:invalid-data]]'));
}
};
function isUserAllowedToCids(privilege, uid, cids, callback) {
if (parseInt(uid, 10) === 0) {
return isGuestAllowedTo(privilege, cids, callback);
return isGuestAllowedToCids(privilege, cids, callback);
}
var userKeys = [], groupKeys = [];
@@ -46,7 +56,40 @@ helpers.isUserAllowedTo = function(privilege, uid, cids, callback) {
callback(null, result);
});
};
}
function isUserAllowedToPrivileges(privileges, uid, cid, callback) {
if (parseInt(uid, 10) === 0) {
return isGuestAllowedToPrivileges(privileges, cid, callback);
}
var userKeys = [], groupKeys = [];
for (var i=0; i<privileges.length; ++i) {
userKeys.push('cid:' + cid + ':privileges:' + privileges[i]);
groupKeys.push('cid:' + cid + ':privileges:groups:' + privileges[i]);
}
async.parallel({
hasUserPrivilege: function(next) {
groups.isMemberOfGroups(uid, userKeys, next);
},
hasGroupPrivilege: function(next) {
groups.isMemberOfGroupsList(uid, groupKeys, next);
}
}, function(err, results) {
if (err) {
return callback(err);
}
var result = [];
for (var i=0; i<privileges.length; ++i) {
result.push(results.hasUserPrivilege[i] || results.hasGroupPrivilege[i]);
}
callback(null, result);
});
}
helpers.isUsersAllowedTo = function(privilege, uids, cid, callback) {
async.parallel({
@@ -70,7 +113,7 @@ helpers.isUsersAllowedTo = function(privilege, uids, cid, callback) {
});
};
function isGuestAllowedTo(privilege, cids, callback) {
function isGuestAllowedToCids(privilege, cids, callback) {
var groupKeys = [];
for (var i=0; i<cids.length; ++i) {
groupKeys.push('cid:' + cids[i] + ':privileges:groups:' + privilege);
@@ -79,5 +122,13 @@ function isGuestAllowedTo(privilege, cids, callback) {
groups.isMemberOfGroups('guests', groupKeys, callback);
}
function isGuestAllowedToPrivileges(privileges, cid, callback) {
var groupKeys = [];
for (var i=0; i<privileges.length; ++i) {
groupKeys.push('cid:' + cid + ':privileges:groups:' + privileges[i]);
}
groups.isMemberOfGroups('guests', groupKeys, callback);
}
module.exports = helpers;