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

closes #4810

Browse Source
This commit is contained in:
barisusakli
2016-07-01 13:01:09 +03:00
parent 376e031928
commit 795b00a3af
5 changed files with 100 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

110
src/controllers/api.js
View File

@@ -129,47 +129,93 @@ apiController.renderWidgets = function(req, res, next) {
});
};
apiController.getObject = function(req, res, next) {
apiController.getObjectByType(req.uid, req.params.type, req.params.id, function(err, results) {
if (err) {
return next(err);
apiController.getPostData = function(pid, uid, callback) {
async.parallel({
privileges: function(next) {
privileges.posts.get([pid], uid, next);
},
post: function(next) {
posts.getPostData(pid, next);
}
}, function(err, results) {
if (err || !results.post) {
return callback(err);
}
res.json(results);
});
};
var post = results.post;
var privileges = results.privileges[0];
apiController.getObjectByType = function(uid, type, id, callback) {
var methods = {
post: {
canRead: privileges.posts.can,
data: posts.getPostData
},
topic: {
canRead: privileges.topics.can,
data: topics.getTopicData
},
category: {
canRead: privileges.categories.can,
data: categories.getCategoryData
}
};
if (!methods[type]) {
if (!privileges.read || !privileges['topics:read']) {
return callback();
}
async.waterfall([
function (next) {
methods[type].canRead('read', id, uid, next);
post.ip = privileges.isAdminOrMod ? post.ip : undefined;
var selfPost = uid && uid === parseInt(post.uid, 10);
if (post.deleted && !(privileges.isAdminOrMod || selfPost)) {
post.content = '[[topic:post_is_deleted]]';
}
callback(null, post);
});
};
apiController.getTopicData = function(tid, uid, callback) {
async.parallel({
privileges: function(next) {
privileges.topics.get(tid, uid, next);
},
function (canRead, next) {
if (!canRead) {
return next(new Error('[[error:no-privileges]]'));
topic: function(next) {
topics.getTopicData(tid, next);
}
methods[type].data(id, next);
}, function(err, results) {
if (err || !results.topic) {
return callback(err);
}
], callback);
if (!results.privileges.read || !results.privileges['topics:read'] || (parseInt(results.topic.deleted, 10) && !results.privileges.view_deleted)) {
return callback();
}
callback(null, results.topic);
});
};
apiController.getCategoryData = function(cid, uid, callback) {
async.parallel({
privileges: function(next) {
privileges.categories.get(cid, uid, next);
},
category: function(next) {
categories.getCategoryData(cid, next);
}
}, function(err, results) {
if (err || !results.category) {
return callback(err);
}
if (!results.privileges.read) {
return callback();
}
callback(null, results.category);
});
};
apiController.getObject = function(req, res, next) {
var methods = {
post: apiController.getPostData,
topic: apiController.getTopicData,
category: apiController.getCategoryData
};
var method = methods[req.params.type];
if (!method) {
return next();
}
method(req.params.id, req.uid, function(err, result) {
if (err || !result) {
return next(err);
}
res.json(result);
});
};
apiController.getUserByUID = function(req, res, next) {

30
src/privileges/posts.js
View File

@@ -19,17 +19,20 @@ module.exports = function(privileges) {
return callback(null, []);
}
async.waterfall([
function(next) {
posts.getCidsByPids(pids, next);
},
function(cids, next) {
async.parallel({
isAdmin: function(next){
user.isAdministrator(uid, next);
},
isModerator: function(next) {
posts.isModerator(pids, uid, next);
},
isOwner: function(next) {
posts.isOwner(pids, uid, next);
isAdmin: async.apply(user.isAdministrator, uid),
isModerator: async.apply(posts.isModerator, pids, uid),
isOwner: async.apply(posts.isOwner, pids, uid),
'topics:read': async.apply(helpers.isUserAllowedTo, 'topics:read', uid, cids),
read: async.apply(helpers.isUserAllowedTo, 'read', uid, cids),
}, next);
}
}, function(err, results) {
], function(err, results) {
if (err) {
return callback(err);
}
@@ -37,11 +40,16 @@ module.exports = function(privileges) {
var privileges = [];
for (var i=0; i<pids.length; ++i) {
var editable = results.isAdmin || results.isModerator[i] || results.isOwner[i];
var isAdminOrMod = results.isAdmin || results.isModerator[i];
var editable = isAdminOrMod || results.isOwner[i];
privileges.push({
editable: editable,
view_deleted: editable,
move: results.isAdmin || results.isModerator[i]
move: isAdminOrMod,
isAdminOrMod: isAdminOrMod,
'topics:read': results['topics:read'][i] || isAdminOrMod,
read: results.read[i] || isAdminOrMod
});
}

2
src/socket.io/categories.js
View File

@@ -193,7 +193,7 @@ SocketCategories.isModerator = function(socket, cid, callback) {
};
SocketCategories.getCategory = function(socket, cid, callback) {
apiController.getObjectByType(socket.uid, 'category', cid, callback);
apiController.getCategoryData(cid, socket.uid, callback);
};
module.exports = SocketCategories;

12
src/socket.io/posts.js
View File

@@ -73,17 +73,7 @@ SocketPosts.getRawPost = function(socket, pid, callback) {
};
SocketPosts.getPost = function(socket, pid, callback) {
async.waterfall([
function(next) {
apiController.getObjectByType(socket.uid, 'post', pid, next);
},
function(postData, next) {
if (parseInt(postData.deleted, 10) === 1) {
return next(new Error('[[error:no-post]]'));
}
next(null, postData);
}
], callback);
apiController.getPostData(pid, socket.uid, callback);
};
SocketPosts.loadMoreFavourites = function(socket, data, callback) {

12
src/socket.io/topics.js
View File

@@ -111,17 +111,7 @@ SocketTopics.isModerator = function(socket, tid, callback) {
};
SocketTopics.getTopic = function (socket, tid, callback) {
async.waterfall([
function (next) {
apiController.getObjectByType(socket.uid, 'topic', tid, next);
},
function (topicData, next) {
if (parseInt(topicData.deleted, 10) === 1) {
return next(new Error('[[error:no-topic]]'));
}
next(null, topicData);
}
], callback);
apiController.getTopicData(tid, socket.uid, callback);
};
module.exports = SocketTopics;