added new privilege "find", added guest meta group, closed #1282

src/controllers/index.js

@@ -78,8 +78,8 @@ Controllers.home = function(req, res, next) {
 				}
 
 				async.filter(data.categories, function (category, next) {
-					privileges.categories.canRead(category.cid, uid, function(err, canRead) {
-						next(!err && canRead);
+					privileges.categories.can('find', category.cid, uid, function(err, findable) {
+						next(!err && findable);
 					});
 				}, function(visibleCategories) {
 					data.categories = visibleCategories;

src/privileges/categories.js

@@ -44,6 +44,20 @@ module.exports = function(privileges) {
 		});
 	};
 
+	privileges.categories.can = function(privilege, cid, uid, callback) {
+		helpers.some([
+			function(next) {
+				helpers.allowedTo(privilege, uid, cid, next);
+			},
+			function(next) {
+				user.isModerator(uid, cid, next);
+			},
+			function(next) {
+				user.isAdministrator(uid, next);
+			}
+		], callback);
+	};
+
 	privileges.categories.canRead = function(cid, uid, callback) {
 		helpers.some([
 			function(next) {
@@ -80,6 +94,7 @@ module.exports = function(privileges) {
 
 	privileges.categories.userPrivileges = function(cid, uid, callback) {
 		async.parallel({
+			find: async.apply(helpers.isMember, groups.isMember, 'cid:' + cid + ':privileges:find', uid),
 			read: function(next) {
 				helpers.isMember(groups.isMember, 'cid:' + cid + ':privileges:read', uid, next);
 			},
@@ -97,6 +112,7 @@ module.exports = function(privileges) {
 
 	privileges.categories.groupPrivileges = function(cid, groupName, callback) {
 		async.parallel({
+			'groups:find': async.apply(helpers.isMember, groups.isMember, 'cid:' + cid + ':privileges:groups:find', groupName),
 			'groups:read': function(next) {
 				helpers.isMember(groups.isMember, 'cid:' + cid + ':privileges:groups:read', groupName, function(err, isMember){
 					next(err, !!isMember);

src/privileges/helpers.js

@@ -30,13 +30,31 @@ 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' ? isMember : isMember !== false);
+					});
+				}
+			], function(err, results) {
+				callback(err, results[0] && results[1]);
+			});
+		}
+
 		async.parallel({
 			hasUserPrivilege: function(next) {
 				helpers.isMember(groups.isMember, 'cid:' + cid + ':privileges:' + privilege, uid, next);
 			},
 			hasGroupPrivilege: function(next) {
 				helpers.isMember(groups.isMemberOfGroupList, 'cid:' + cid + ':privileges:groups:' + privilege, uid, next);
-			},
+			}
 		}, function(err, results) {
 			if (err) {
 				return callback(err);

src/socket.io/admin/categories.js

@@ -58,7 +58,7 @@ Categories.setPrivilege = function(socket, data, callback) {
 };
 
 Categories.getPrivilegeSettings = function(socket, cid, callback) {
-	var privileges = ['read', 'topics:create', 'topics:reply', 'mods'];
+	var privileges = ['find', 'read', 'topics:create', 'topics:reply', 'mods'];
 
 	async.reduce(privileges, [], function(members, privilege, next) {
 		groups.get('cid:' + cid + ':privileges:' + privilege, { expand: true }, function(err, groupObj) {