From 08ef6bd9f8c76c0606818cb66c4754a28f185e25 Mon Sep 17 00:00:00 2001 From: Spp Date: Mon, 2 Sep 2013 11:53:22 +0200 Subject: [PATCH] Core/RBAC: Move honor commands to RBAC (using individual permissions) --- sql/updates/auth/2013_09_02_08_auth_misc.sql | 22 +++++++------------ sql/updates/auth/2013_09_02_09_auth_misc.sql | 19 ++++++++++++++++ .../world/2013_09_02_10_world_command.sql | 9 ++++++++ src/server/game/Accounts/RBAC.h | 4 ++++ src/server/scripts/Commands/cs_honor.cpp | 16 +++++++------- 5 files changed, 48 insertions(+), 22 deletions(-) create mode 100644 sql/updates/auth/2013_09_02_09_auth_misc.sql create mode 100644 sql/updates/world/2013_09_02_10_world_command.sql diff --git a/sql/updates/auth/2013_09_02_08_auth_misc.sql b/sql/updates/auth/2013_09_02_08_auth_misc.sql index b6bf442aeb..6efc9765ab 100644 --- a/sql/updates/auth/2013_09_02_08_auth_misc.sql +++ b/sql/updates/auth/2013_09_02_08_auth_misc.sql @@ -1,25 +1,19 @@ -/* cs_guild.cpp */ +/* cs_honor.cpp */ SET @id = 401; -- Add new permissions -DELETE FROM `rbac_permissions` WHERE `id` BETWEEN @id AND @id+6; +DELETE FROM `rbac_permissions` WHERE `id` BETWEEN @id AND @id+3; INSERT INTO `rbac_permissions` (`id`, `name`) VALUES -(@id+0, 'guild'), -(@id+1, 'guild create'), -(@id+2, 'guild delete'), -(@id+3, 'guild invite'), -(@id+4, 'guild uninvite'), -(@id+5, 'guild rank'), -(@id+6, 'guild rename'); +(@id+0, 'honor'), +(@id+1, 'honor add'), +(@id+2, 'honor add kill'), +(@id+3, 'honor update'); -- Add permissions to "corresponding Commands Role" -DELETE FROM `rbac_role_permissions` WHERE `permissionId` BETWEEN @id AND @id+6; +DELETE FROM `rbac_role_permissions` WHERE `permissionId` BETWEEN @id AND @id+3; INSERT INTO `rbac_role_permissions` (`roleId`, `permissionId`) VALUES (4, @id+0), (4, @id+1), (4, @id+2), -(4, @id+3), -(4, @id+4), -(4, @id+5), -(4, @id+6); +(4, @id+3); diff --git a/sql/updates/auth/2013_09_02_09_auth_misc.sql b/sql/updates/auth/2013_09_02_09_auth_misc.sql new file mode 100644 index 0000000000..3b16d9181d --- /dev/null +++ b/sql/updates/auth/2013_09_02_09_auth_misc.sql @@ -0,0 +1,19 @@ +/* cs_honor.cpp */ + +SET @id = 408; + +-- Add new permissions +DELETE FROM `rbac_permissions` WHERE `id` BETWEEN @id AND @id+3; +INSERT INTO `rbac_permissions` (`id`, `name`) VALUES +(@id+0, 'honor'), +(@id+1, 'honor add'), +(@id+2, 'honor add kill'), +(@id+3, 'honor update'); + +-- Add permissions to "corresponding Commands Role" +DELETE FROM `rbac_role_permissions` WHERE `permissionId` BETWEEN @id AND @id+3; +INSERT INTO `rbac_role_permissions` (`roleId`, `permissionId`) VALUES +(2, @id+0), +(2, @id+1), +(2, @id+2), +(2, @id+3); diff --git a/sql/updates/world/2013_09_02_10_world_command.sql b/sql/updates/world/2013_09_02_10_world_command.sql new file mode 100644 index 0000000000..f038adf1b3 --- /dev/null +++ b/sql/updates/world/2013_09_02_10_world_command.sql @@ -0,0 +1,9 @@ +/* cs_honor.cpp */ + +SET @id = 408; + +-- Update command table with new RBAC permissions +UPDATE `command` SET `permission` = @id+0 WHERE `name` = 'honor'; +UPDATE `command` SET `permission` = @id+1 WHERE `name` = 'honor add'; +UPDATE `command` SET `permission` = @id+2 WHERE `name` = 'honor add kill'; +UPDATE `command` SET `permission` = @id+3 WHERE `name` = 'honor update'; diff --git a/src/server/game/Accounts/RBAC.h b/src/server/game/Accounts/RBAC.h index 77e2a647e7..e34aad3d85 100644 --- a/src/server/game/Accounts/RBAC.h +++ b/src/server/game/Accounts/RBAC.h @@ -284,6 +284,10 @@ enum RBACPermissions RBAC_PERM_COMMAND_GUILD_UNINVITE = 405, RBAC_PERM_COMMAND_GUILD_RANK = 406, RBAC_PERM_COMMAND_GUILD_RENAME = 407, + RBAC_PERM_COMMAND_HONOR = 408, + RBAC_PERM_COMMAND_HONOR_ADD = 409, + RBAC_PERM_COMMAND_HONOR_ADD_KILL = 410, + RBAC_PERM_COMMAND_HONOR_UPDATE = 411, // custom permissions 1000+ RBAC_PERM_MAX diff --git a/src/server/scripts/Commands/cs_honor.cpp b/src/server/scripts/Commands/cs_honor.cpp index 4707e3d65c..cd8e2630a6 100644 --- a/src/server/scripts/Commands/cs_honor.cpp +++ b/src/server/scripts/Commands/cs_honor.cpp @@ -37,22 +37,22 @@ public: { static ChatCommand honorAddCommandTable[] = { - { "kill", RBAC_PERM_GAMEMASTER_COMMANDS, false, &HandleHonorAddKillCommand, "", NULL }, - { "", RBAC_PERM_GAMEMASTER_COMMANDS, false, &HandleHonorAddCommand, "", NULL }, - { NULL, 0, false, NULL, "", NULL } + { "kill", RBAC_PERM_COMMAND_HONOR_ADD_KILL, false, &HandleHonorAddKillCommand, "", NULL }, + { "", RBAC_PERM_COMMAND_HONOR_ADD, false, &HandleHonorAddCommand, "", NULL }, + { NULL, 0, false, NULL, "", NULL } }; static ChatCommand honorCommandTable[] = { - { "add", RBAC_PERM_GAMEMASTER_COMMANDS, false, NULL, "", honorAddCommandTable }, - { "update", RBAC_PERM_GAMEMASTER_COMMANDS, false, &HandleHonorUpdateCommand, "", NULL }, - { NULL, 0, false, NULL, "", NULL } + { "add", RBAC_PERM_COMMAND_HONOR_ADD, false, NULL, "", honorAddCommandTable }, + { "update", RBAC_PERM_COMMAND_HONOR_UPDATE, false, &HandleHonorUpdateCommand, "", NULL }, + { NULL, 0, false, NULL, "", NULL } }; static ChatCommand commandTable[] = { - { "honor", RBAC_PERM_GAMEMASTER_COMMANDS, false, NULL, "", honorCommandTable }, - { NULL, 0, false, NULL, "", NULL } + { "honor", RBAC_PERM_COMMAND_HONOR, false, NULL, "", honorCommandTable }, + { NULL, 0, false, NULL, "", NULL } }; return commandTable; }