Core/RBAC: Move message commands to RBAC (using individual permissions)

This commit is contained in:
Spp
2013-09-02 13:01:50 +02:00
parent 2d508387e5
commit f68471f142
4 changed files with 69 additions and 13 deletions

View File

@@ -0,0 +1,31 @@
/* cs_message.cpp */
SET @id = 458;
-- Add new permissions
DELETE FROM `rbac_permissions` WHERE `id` BETWEEN @id AND @id+9;
INSERT INTO `rbac_permissions` (`id`, `name`) VALUES
(@id+0, 'announce'),
(@id+1, 'channel'),
(@id+2, 'channel set'),
(@id+3, 'channel set ownership'),
(@id+4, 'gmannounce'),
(@id+5, 'gmnameannounce'),
(@id+6, 'gmnotify'),
(@id+7, 'nameannounce'),
(@id+8, 'notify'),
(@id+9, 'whispers');
-- Add permissions to "corresponding Commands Role"
DELETE FROM `rbac_role_permissions` WHERE `permissionId` BETWEEN @id AND @id+9;
INSERT INTO `rbac_role_permissions` (`roleId`, `permissionId`) VALUES
(2, @id+0),
(4, @id+1),
(4, @id+2),
(4, @id+3),
(2, @id+4),
(2, @id+5),
(2, @id+6),
(2, @id+7),
(2, @id+8),
(2, @id+9);

View File

@@ -0,0 +1,15 @@
/* cs_message.cpp */
SET @id = 458;
-- Update command table with new RBAC permissions
UPDATE `command` SET `permission` = @id+0 WHERE `name` = 'announce';
UPDATE `command` SET `permission` = @id+1 WHERE `name` = 'channel';
UPDATE `command` SET `permission` = @id+2 WHERE `name` = 'channel set';
UPDATE `command` SET `permission` = @id+3 WHERE `name` = 'channel set ownership';
UPDATE `command` SET `permission` = @id+4 WHERE `name` = 'gmannounce';
UPDATE `command` SET `permission` = @id+5 WHERE `name` = 'gmnameannounce';
UPDATE `command` SET `permission` = @id+6 WHERE `name` = 'gmnotify';
UPDATE `command` SET `permission` = @id+7 WHERE `name` = 'nameannounce';
UPDATE `command` SET `permission` = @id+8 WHERE `name` = 'notify';
UPDATE `command` SET `permission` = @id+9 WHERE `name` = 'whispers');

View File

@@ -334,6 +334,16 @@ enum RBACPermissions
RBAC_PERM_COMMAND_LOOKUP_TELE = 455,
RBAC_PERM_COMMAND_LOOKUP_TITLE = 456,
RBAC_PERM_COMMAND_LOOKUP_MAP = 457,
RBAC_PERM_COMMAND_ANNOUNCE = 458,
RBAC_PERM_COMMAND_CHANNEL = 459,
RBAC_PERM_COMMAND_CHANNEL_SET = 460,
RBAC_PERM_COMMAND_CHANNEL_SET_OWNERSHIP = 461,
RBAC_PERM_COMMAND_GMANNOUNCE = 462,
RBAC_PERM_COMMAND_GMNAMEANNOUNCE = 463,
RBAC_PERM_COMMAND_GMNOTIFY = 464,
RBAC_PERM_COMMAND_NAMEANNOUNCE = 465,
RBAC_PERM_COMMAND_NOTIFY = 466,
RBAC_PERM_COMMAND_WHISPERS = 467,
// custom permissions 1000+
RBAC_PERM_MAX

View File

@@ -38,25 +38,25 @@ public:
{
static ChatCommand channelSetCommandTable[] =
{
{ "ownership", RBAC_PERM_ADMINISTRATOR_COMMANDS, false, &HandleChannelSetOwnership, "", NULL },
{ NULL, 0, false, NULL, "", NULL }
{ "ownership", RBAC_PERM_COMMAND_CHANNEL_SET_OWNERSHIP, false, &HandleChannelSetOwnership, "", NULL },
{ NULL, 0, false, NULL, "", NULL }
};
static ChatCommand channelCommandTable[] =
{
{ "set", RBAC_PERM_ADMINISTRATOR_COMMANDS, true, NULL, "", channelSetCommandTable },
{ NULL, 0, false, NULL, "", NULL }
{ "set", RBAC_PERM_COMMAND_CHANNEL_SET, true, NULL, "", channelSetCommandTable },
{ NULL, 0, false, NULL, "", NULL }
};
static ChatCommand commandTable[] =
{
{ "channel", RBAC_PERM_ADMINISTRATOR_COMMANDS, true, NULL, "", channelCommandTable },
{ "nameannounce", RBAC_PERM_MODERATOR_COMMANDS, true, &HandleNameAnnounceCommand, "", NULL },
{ "gmnameannounce", RBAC_PERM_MODERATOR_COMMANDS, true, &HandleGMNameAnnounceCommand, "", NULL },
{ "announce", RBAC_PERM_MODERATOR_COMMANDS, true, &HandleAnnounceCommand, "", NULL },
{ "gmannounce", RBAC_PERM_MODERATOR_COMMANDS, true, &HandleGMAnnounceCommand, "", NULL },
{ "notify", RBAC_PERM_MODERATOR_COMMANDS, true, &HandleNotifyCommand, "", NULL },
{ "gmnotify", RBAC_PERM_MODERATOR_COMMANDS, true, &HandleGMNotifyCommand, "", NULL },
{ "whispers", RBAC_PERM_MODERATOR_COMMANDS, false, &HandleWhispersCommand, "", NULL },
{ NULL, 0, false, NULL, "", NULL }
{ "channel", RBAC_PERM_COMMAND_CHANNEL, true, NULL, "", channelCommandTable },
{ "nameannounce", RBAC_PERM_COMMAND_NAMEANNOUNCE, true, &HandleNameAnnounceCommand, "", NULL },
{ "gmnameannounce", RBAC_PERM_COMMAND_GMNAMEANNOUNCE, true, &HandleGMNameAnnounceCommand, "", NULL },
{ "announce", RBAC_PERM_COMMAND_ANNOUNCE, true, &HandleAnnounceCommand, "", NULL },
{ "gmannounce", RBAC_PERM_COMMAND_GMANNOUNCE, true, &HandleGMAnnounceCommand, "", NULL },
{ "notify", RBAC_PERM_COMMAND_NOTIFY, true, &HandleNotifyCommand, "", NULL },
{ "gmnotify", RBAC_PERM_COMMAND_GMNOTIFY, true, &HandleGMNotifyCommand, "", NULL },
{ "whispers", RBAC_PERM_COMMAND_WHISPERS, false, &HandleWhispersCommand, "", NULL },
{ NULL, 0, false, NULL, "", NULL }
};
return commandTable;
}