From 472e6b5206b3f9e6c66a4e67ed3d3fafa59cbacd Mon Sep 17 00:00:00 2001 From: barisusakli Date: Sat, 17 May 2014 18:59:34 -0400 Subject: [PATCH] privilege cleanup --- src/posts.js | 4 ++-- src/privileges/categories.js | 14 ------------ src/privileges/helpers.js | 35 +++++++++++++++------------- src/privileges/posts.js | 4 ++-- src/privileges/topics.js | 44 ------------------------------------ src/socket.io/categories.js | 2 +- src/socket.io/posts.js | 2 +- src/topics.js | 2 +- src/topics/create.js | 4 ++-- src/topics/unread.js | 2 +- 10 files changed, 29 insertions(+), 84 deletions(-) diff --git a/src/posts.js b/src/posts.js index 6581882f97..f8bfc22828 100644 --- a/src/posts.js +++ b/src/posts.js @@ -164,7 +164,7 @@ var db = require('./database'), } async.filter(pids, function(pid, next) { - privileges.posts.canRead(pid, callerUid, function(err, canRead) { + privileges.posts.can('read', pid, callerUid, function(err, canRead) { next(!err && canRead); }); }, function(pids) { @@ -216,7 +216,7 @@ var db = require('./database'), } async.filter(pids, function(pid, next) { - privileges.posts.canRead(pid, uid, function(err, canRead) { + privileges.posts.can('read', pid, uid, function(err, canRead) { next(!err && canRead); }); }, function(pids) { diff --git a/src/privileges/categories.js b/src/privileges/categories.js index 8f0d25de5d..8de9702958 100644 --- a/src/privileges/categories.js +++ b/src/privileges/categories.js @@ -58,20 +58,6 @@ module.exports = function(privileges) { ], callback); }; - privileges.categories.canRead = function(cid, uid, callback) { - helpers.some([ - function(next) { - helpers.allowedTo('read', uid, cid, next); - }, - function(next) { - user.isModerator(uid, cid, next); - }, - function(next) { - user.isAdministrator(uid, next); - } - ], callback); - }; - privileges.categories.canMoveAllTopics = function(currentCid, targetCid, uid, callback) { async.parallel({ isAdministrator: function(next) { diff --git a/src/privileges/helpers.js b/src/privileges/helpers.js index 9c4ec535a0..642cf36b26 100644 --- a/src/privileges/helpers.js +++ b/src/privileges/helpers.js @@ -30,22 +30,8 @@ helpers.allowedTo = function(privilege, uid, cid, callback) { return callback(null, false); } - // Guests handling if (parseInt(uid, 10) === 0) { - return async.parallel([ - function(next) { - groups.exists('cid:' + cid + ':privileges:' + privilege, function(err, exists) { - next(err, !err ? !exists : false); - }); - }, - function(next) { - helpers.isMember(groups.isMember, 'cid:' + cid + ':privileges:groups:' + privilege, 'guests', function(err, isMember) { - next(err, privilege !== 'find' && privilege !== 'read' ? isMember === true : isMember !== false); - }); - } - ], function(err, results) { - callback(err, results[0] && (results[1] || results[1] === null)); - }); + return isGuestAllowedTo(privilege, cid, callback); } async.parallel({ @@ -65,6 +51,23 @@ helpers.allowedTo = function(privilege, uid, cid, callback) { }); }; +function isGuestAllowedTo(privilege, cid, callback) { + async.parallel([ + function(next) { + groups.exists('cid:' + cid + ':privileges:' + privilege, function(err, exists) { + next(err, !err ? !exists : false); + }); + }, + function(next) { + helpers.isMember(groups.isMember, 'cid:' + cid + ':privileges:groups:' + privilege, 'guests', function(err, isMember) { + next(err, privilege !== 'find' && privilege !== 'read' ? isMember === true : isMember !== false); + }); + } + ], function(err, results) { + callback(err, results[0] && (results[1] || results[1] === null)); + }); +} + helpers.isMember = function(method, group, uid, callback) { groups.exists(group, function(err, exists) { if (err) { @@ -77,7 +80,7 @@ helpers.isMember = function(method, group, uid, callback) { method(uid, group, callback); }); -} +}; helpers.hasEnoughReputationFor = function(privilege, uid, callback) { if (parseInt(meta.config['privileges:disabled'], 10)) { diff --git a/src/privileges/posts.js b/src/privileges/posts.js index d3501f218c..bd580d0144 100644 --- a/src/privileges/posts.js +++ b/src/privileges/posts.js @@ -53,13 +53,13 @@ module.exports = function(privileges) { }); }; - privileges.posts.canRead = function(pid, uid, callback) { + privileges.posts.can = function(privilege, pid, uid, callback) { posts.getCidByPid(pid, function(err, cid) { if (err) { return callback(err); } - privileges.categories.canRead(cid, uid, callback); + privileges.categories.can(privilege, cid, uid, callback); }); }; diff --git a/src/privileges/topics.js b/src/privileges/topics.js index 621baf45ca..8b36bd6c49 100644 --- a/src/privileges/topics.js +++ b/src/privileges/topics.js @@ -65,50 +65,6 @@ module.exports = function(privileges) { }); }; - privileges.topics.canRead = function(tid, uid, callback) { - topics.getTopicField(tid, 'cid', function(err, cid) { - if (err) { - return callback(err); - } - - privileges.categories.canRead(cid, uid, callback); - }); - }; - - privileges.topics.canCreate = function(cid, uid, callback) { - helpers.some([ - function(next) { - helpers.allowedTo('topics:create', uid, cid, next); - }, - function(next) { - user.isModerator(uid, cid, next); - }, - function(next) { - user.isAdministrator(uid, next); - } - ], callback); - }; - - privileges.topics.canReply = function(tid, uid, callback) { - topics.getTopicField(tid, 'cid', function(err, cid) { - if (err) { - return callback(err); - } - - helpers.some([ - function(next) { - helpers.allowedTo('topics:reply', uid, cid, next); - }, - function(next) { - user.isModerator(uid, cid, next); - }, - function(next) { - user.isAdministrator(uid, next); - } - ], callback); - }); - }; - privileges.topics.canEdit = function(tid, uid, callback) { helpers.some([ function(next) { diff --git a/src/socket.io/categories.js b/src/socket.io/categories.js index 117640793d..e6d9ca52a6 100644 --- a/src/socket.io/categories.js +++ b/src/socket.io/categories.js @@ -9,7 +9,7 @@ var async = require('async'), SocketCategories = {}; SocketCategories.getRecentReplies = function(socket, cid, callback) { - privileges.categories.canRead(cid, socket.uid, function(err, canRead) { + privileges.categories.can('read', cid, socket.uid, function(err, canRead) { if (err) { return callback(err); } diff --git a/src/socket.io/posts.js b/src/socket.io/posts.js index f2c77678b2..cd272c758a 100644 --- a/src/socket.io/posts.js +++ b/src/socket.io/posts.js @@ -129,7 +129,7 @@ function sendNotificationToPostOwner(data, uid, notification) { SocketPosts.getRawPost = function(socket, pid, callback) { async.waterfall([ function(next) { - privileges.posts.canRead(pid, socket.uid, next); + privileges.posts.can('read', pid, socket.uid, next); }, function(canRead, next) { if (!canRead) { diff --git a/src/topics.js b/src/topics.js index 0763a13a0c..45d71dfd5c 100644 --- a/src/topics.js +++ b/src/topics.js @@ -130,7 +130,7 @@ var async = require('async'), } async.filter(tids, function(tid, next) { - privileges.topics.canRead(tid, uid, function(err, canRead) { + privileges.topics.can('read', tid, uid, function(err, canRead) { next(!err && canRead); }); }, function(tids) { diff --git a/src/topics/create.js b/src/topics/create.js index e47216de08..e23c7c18b3 100644 --- a/src/topics/create.js +++ b/src/topics/create.js @@ -99,7 +99,7 @@ module.exports = function(Topics) { if (!categoryExists) { return next(new Error('[[error:no-category]]')); } - privileges.topics.canCreate(cid, uid, next); + privileges.categories.can('topics:create', cid, uid, next); }, function(canCreate, next) { if(!canCreate) { @@ -173,7 +173,7 @@ module.exports = function(Topics) { return next(new Error('[[error:topic-locked]]')); } - privileges.topics.canReply(tid, uid, next); + privileges.topics.can('topics:reply', tid, uid, next); }, function(canReply, next) { if (!canReply) { diff --git a/src/topics/unread.js b/src/topics/unread.js index 4f153cf227..7000dfc1a2 100644 --- a/src/topics/unread.js +++ b/src/topics/unread.js @@ -49,7 +49,7 @@ module.exports = function(Topics) { }); async.filter(newtids, function(tid, next) { - privileges.topics.canRead(tid, uid, function(err, canRead) { + privileges.topics.can('read', tid, uid, function(err, canRead) { next(!err && canRead); }); }, function(newtids) {