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

4 files changed, 43 insertions, 7 deletions

diff --git a/sql/updates/auth/2013_09_02_10_auth_misc.sql b/sql/updates/auth/2013_09_02_10_auth_misc.sql
new file mode 100644
index 00000000000..a69174d6ca3
--- /dev/null
+++ b/sql/updates/auth/2013_09_02_10_auth_misc.sql
@@ -0,0 +1,21 @@
+/* cs_instance.cpp */
+
+SET @id = 412;
+
+-- Add new permissions
+DELETE FROM `rbac_permissions` WHERE `id` BETWEEN @id AND @id+4;
+INSERT INTO `rbac_permissions` (`id`, `name`) VALUES
+(@id+0, 'instance'),
+(@id+1, 'instance listbinds'),
+(@id+2, 'instance unbind'),
+(@id+3, 'instance stats'),
+(@id+4, 'instance savedata');
+
+-- Add permissions to "corresponding Commands Role"
+DELETE FROM `rbac_role_permissions` WHERE `permissionId` BETWEEN @id AND @id+4;
+INSERT INTO `rbac_role_permissions` (`roleId`, `permissionId`) VALUES
+(2, @id+0),
+(2, @id+1),
+(2, @id+2),
+(2, @id+3),
+(2, @id+4);
diff --git a/sql/updates/world/2013_09_02_11_world_command.sql b/sql/updates/world/2013_09_02_11_world_command.sql
new file mode 100644
index 00000000000..c134fb703e6
--- /dev/null
+++ b/sql/updates/world/2013_09_02_11_world_command.sql
@@ -0,0 +1,10 @@
+/* cs_instance.cpp */
+
+SET @id = 408;
+
+-- Update command table with new RBAC permissions
+UPDATE `command` SET `permission` = @id+0 WHERE `name` = 'instance';
+UPDATE `command` SET `permission` = @id+1 WHERE `name` = 'instance listbinds';
+UPDATE `command` SET `permission` = @id+2 WHERE `name` = 'instance unbind';
+UPDATE `command` SET `permission` = @id+3 WHERE `name` = 'instance stats';
+UPDATE `command` SET `permission` = @id+3 WHERE `name` = 'instance savedata';
diff --git a/src/server/game/Accounts/RBAC.h b/src/server/game/Accounts/RBAC.h
index e34aad3d857..4d5b2150be8 100644
--- a/src/server/game/Accounts/RBAC.h
+++ b/src/server/game/Accounts/RBAC.h
@@ -288,6 +288,11 @@ enum RBACPermissions
     RBAC_PERM_COMMAND_HONOR_ADD                              = 409,

     RBAC_PERM_COMMAND_HONOR_ADD_KILL                         = 410,

     RBAC_PERM_COMMAND_HONOR_UPDATE                           = 411,

+    RBAC_PERM_COMMAND_INSTANCE                               = 412,

+    RBAC_PERM_COMMAND_INSTANCE_LISTBINDS                     = 413,

+    RBAC_PERM_COMMAND_INSTANCE_UNBIND                        = 414,

+    RBAC_PERM_COMMAND_INSTANCE_STATS                         = 415,

+    RBAC_PERM_COMMAND_INSTANCE_SAVEDATA                      = 416,

 

     // custom permissions 1000+

     RBAC_PERM_MAX

diff --git a/src/server/scripts/Commands/cs_instance.cpp b/src/server/scripts/Commands/cs_instance.cpp
index 65dfa46ebd7..b597caf0ae0 100644
--- a/src/server/scripts/Commands/cs_instance.cpp
+++ b/src/server/scripts/Commands/cs_instance.cpp
@@ -39,17 +39,17 @@ public:
     {
         static ChatCommand instanceCommandTable[] =
         {
-            { "listbinds",      RBAC_PERM_ADMINISTRATOR_COMMANDS,  false,  &HandleInstanceListBindsCommand,    "", NULL },
-            { "unbind",         RBAC_PERM_ADMINISTRATOR_COMMANDS,  false,  &HandleInstanceUnbindCommand,       "", NULL },
-            { "stats",          RBAC_PERM_ADMINISTRATOR_COMMANDS,  true,   &HandleInstanceStatsCommand,        "", NULL },
-            { "savedata",       RBAC_PERM_ADMINISTRATOR_COMMANDS,  false,  &HandleInstanceSaveDataCommand,     "", NULL },
-            { NULL,             0,                  false,  NULL,                               "", NULL }
+            { "listbinds", RBAC_PERM_COMMAND_INSTANCE_LISTBINDS, false, &HandleInstanceListBindsCommand,    "", NULL },
+            { "unbind",    RBAC_PERM_COMMAND_INSTANCE_UNBIND,    false, &HandleInstanceUnbindCommand,       "", NULL },
+            { "stats",     RBAC_PERM_COMMAND_INSTANCE_STATS,      true, &HandleInstanceStatsCommand,        "", NULL },
+            { "savedata",  RBAC_PERM_COMMAND_INSTANCE_SAVEDATA,  false, &HandleInstanceSaveDataCommand,     "", NULL },
+            { NULL,        0,                                    false, NULL,                               "", NULL }
         };
 
         static ChatCommand commandTable[] =
         {
-            { "instance",       RBAC_PERM_ADMINISTRATOR_COMMANDS,  true,   NULL,                               "", instanceCommandTable },
-            { NULL,             0,                  false,  NULL,                               "", NULL }
+            { "instance", RBAC_PERM_COMMAND_INSTANCE,  true, NULL, "", instanceCommandTable },
+            { NULL,       0,                          false, NULL, "", NULL }
         };
 
         return commandTable;