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

2 files changed, 86 insertions, 46 deletions

diff --git a/src/server/game/Accounts/RBAC.h b/src/server/game/Accounts/RBAC.h
index 139aa8c93aa..675a1d2de5d 100644
--- a/src/server/game/Accounts/RBAC.h
+++ b/src/server/game/Accounts/RBAC.h
@@ -177,7 +177,47 @@ enum RBACPermissions
     RBAC_PERM_COMMAND_CHEAT_STATUS                           = 297,

     RBAC_PERM_COMMAND_CHEAT_TAXI                             = 298,

     RBAC_PERM_COMMAND_CHEAT_WATERWALK                        = 299,

-

+    RBAC_PERM_COMMAND_DEBUG                                  = 300,

+    RBAC_PERM_COMMAND_DEBUG_ANIM                             = 301,

+    RBAC_PERM_COMMAND_DEBUG_AREATRIGGERS                     = 302,

+    RBAC_PERM_COMMAND_DEBUG_ARENA                            = 303,

+    RBAC_PERM_COMMAND_DEBUG_BG                               = 304,

+    RBAC_PERM_COMMAND_DEBUG_ENTERVEHICLE                     = 305,

+    RBAC_PERM_COMMAND_DEBUG_GETITEMSTATE                     = 306,

+    RBAC_PERM_COMMAND_DEBUG_GETITEMVALUE                     = 307,

+    RBAC_PERM_COMMAND_DEBUG_GETVALUE                         = 308,

+    RBAC_PERM_COMMAND_DEBUG_HOSTIL                           = 309,

+    RBAC_PERM_COMMAND_DEBUG_ITEMEXPIRE                       = 310,

+    RBAC_PERM_COMMAND_DEBUG_LOOTRECIPIENT                    = 311,

+    RBAC_PERM_COMMAND_DEBUG_LOS                              = 312,

+    RBAC_PERM_COMMAND_DEBUG_MOD32VALUE                       = 313,

+    RBAC_PERM_COMMAND_DEBUG_MOVEFLAGS                        = 314,

+    RBAC_PERM_COMMAND_DEBUG_PLAY                             = 315,

+    RBAC_PERM_COMMAND_DEBUG_PLAY_CINEMATIC                   = 316,

+    RBAC_PERM_COMMAND_DEBUG_PLAY_MOVIE                       = 317,

+    RBAC_PERM_COMMAND_DEBUG_PLAY_SOUND                       = 318,

+    RBAC_PERM_COMMAND_DEBUG_SEND                             = 319,

+    RBAC_PERM_COMMAND_DEBUG_SEND_BUYERROR                    = 320,

+    RBAC_PERM_COMMAND_DEBUG_SEND_CHANNELNOTIFY               = 321,

+    RBAC_PERM_COMMAND_DEBUG_SEND_CHATMESSAGE                 = 322,

+    RBAC_PERM_COMMAND_DEBUG_SEND_EQUIPERROR                  = 323,

+    RBAC_PERM_COMMAND_DEBUG_SEND_LARGEPACKET                 = 324,

+    RBAC_PERM_COMMAND_DEBUG_SEND_OPCODE                      = 325,

+    RBAC_PERM_COMMAND_DEBUG_SEND_QINVALIDMSG                 = 326,

+    RBAC_PERM_COMMAND_DEBUG_SEND_QPARTYMSG                   = 327,

+    RBAC_PERM_COMMAND_DEBUG_SEND_SELLERROR                   = 328,

+    RBAC_PERM_COMMAND_DEBUG_SEND_SETPHASESHIFT               = 329,

+    RBAC_PERM_COMMAND_DEBUG_SEND_SPELLFAIL                   = 330,

+    RBAC_PERM_COMMAND_DEBUG_SETAURASTATE                     = 331,

+    RBAC_PERM_COMMAND_DEBUG_SETBIT                           = 332,

+    RBAC_PERM_COMMAND_DEBUG_SETITEMVALUE                     = 333,

+    RBAC_PERM_COMMAND_DEBUG_SETVALUE                         = 334,

+    RBAC_PERM_COMMAND_DEBUG_SETVID                           = 335,

+    RBAC_PERM_COMMAND_DEBUG_SPAWNVEHICLE                     = 336,

+    RBAC_PERM_COMMAND_DEBUG_THREAT                           = 337,

+    RBAC_PERM_COMMAND_DEBUG_UPDATE                           = 338,

+    RBAC_PERM_COMMAND_DEBUG_UWS                              = 339,

+    RBAC_PERM_COMMAND_WPGPS                                  = 340,

     // custom permissions 1000+

     RBAC_PERM_MAX

 };

diff --git a/src/server/scripts/Commands/cs_debug.cpp b/src/server/scripts/Commands/cs_debug.cpp
index 4c099d49773..df80ba3c797 100644
--- a/src/server/scripts/Commands/cs_debug.cpp
+++ b/src/server/scripts/Commands/cs_debug.cpp
@@ -44,60 +44,60 @@ public:
     {
         static ChatCommand debugPlayCommandTable[] =
         {
-            { "cinematic",      RBAC_PERM_MODERATOR_COMMANDS,      false, &HandleDebugPlayCinematicCommand,   "", NULL },
-            { "movie",          RBAC_PERM_MODERATOR_COMMANDS,      false, &HandleDebugPlayMovieCommand,       "", NULL },
-            { "sound",          RBAC_PERM_MODERATOR_COMMANDS,      false, &HandleDebugPlaySoundCommand,       "", NULL },
-            { NULL,             RBAC_PERM_PLAYER_COMMANDS,     false, NULL,                               "", NULL }
+            { "cinematic",     RBAC_PERM_COMMAND_DEBUG_PLAY_CINEMATIC, false, &HandleDebugPlayCinematicCommand,   "", NULL },
+            { "movie",         RBAC_PERM_COMMAND_DEBUG_PLAY_MOVIE,     false, &HandleDebugPlayMovieCommand,       "", NULL },
+            { "sound",         RBAC_PERM_COMMAND_DEBUG_PLAY_SOUND,     false, &HandleDebugPlaySoundCommand,       "", NULL },
+            { NULL,            0,                                      false, NULL,                               "", NULL }
         };
         static ChatCommand debugSendCommandTable[] =
         {
-            { "buyerror",       RBAC_PERM_ADMINISTRATOR_COMMANDS,  false, &HandleDebugSendBuyErrorCommand,       "", NULL },
-            { "channelnotify",  RBAC_PERM_ADMINISTRATOR_COMMANDS,  false, &HandleDebugSendChannelNotifyCommand,  "", NULL },
-            { "chatmmessage",   RBAC_PERM_ADMINISTRATOR_COMMANDS,  false, &HandleDebugSendChatMsgCommand,        "", NULL },
-            { "equiperror",     RBAC_PERM_ADMINISTRATOR_COMMANDS,  false, &HandleDebugSendEquipErrorCommand,     "", NULL },
-            { "largepacket",    RBAC_PERM_ADMINISTRATOR_COMMANDS,  false, &HandleDebugSendLargePacketCommand,    "", NULL },
-            { "opcode",         RBAC_PERM_ADMINISTRATOR_COMMANDS,  false, &HandleDebugSendOpcodeCommand,         "", NULL },
-            { "qpartymsg",      RBAC_PERM_ADMINISTRATOR_COMMANDS,  false, &HandleDebugSendQuestPartyMsgCommand,  "", NULL },
-            { "qinvalidmsg",    RBAC_PERM_ADMINISTRATOR_COMMANDS,  false, &HandleDebugSendQuestInvalidMsgCommand, "", NULL },
-            { "sellerror",      RBAC_PERM_ADMINISTRATOR_COMMANDS,  false, &HandleDebugSendSellErrorCommand,      "", NULL },
-            { "setphaseshift",  RBAC_PERM_ADMINISTRATOR_COMMANDS,  false, &HandleDebugSendSetPhaseShiftCommand,  "", NULL },
-            { "spellfail",      RBAC_PERM_ADMINISTRATOR_COMMANDS,  false, &HandleDebugSendSpellFailCommand,      "", NULL },
-            { NULL,             RBAC_PERM_PLAYER_COMMANDS,         false, NULL,                                  "", NULL }
+            { "buyerror",      RBAC_PERM_COMMAND_DEBUG_SEND_BUYERROR,      false, &HandleDebugSendBuyErrorCommand,        "", NULL },
+            { "channelnotify", RBAC_PERM_COMMAND_DEBUG_SEND_CHANNELNOTIFY, false, &HandleDebugSendChannelNotifyCommand,   "", NULL },
+            { "chatmessage",   RBAC_PERM_COMMAND_DEBUG_SEND_CHATMESSAGE,   false, &HandleDebugSendChatMsgCommand,         "", NULL },
+            { "equiperror",    RBAC_PERM_COMMAND_DEBUG_SEND_EQUIPERROR,    false, &HandleDebugSendEquipErrorCommand,      "", NULL },
+            { "largepacket",   RBAC_PERM_COMMAND_DEBUG_SEND_LARGEPACKET,   false, &HandleDebugSendLargePacketCommand,     "", NULL },
+            { "opcode",        RBAC_PERM_COMMAND_DEBUG_SEND_OPCODE,        false, &HandleDebugSendOpcodeCommand,          "", NULL },
+            { "qpartymsg",     RBAC_PERM_COMMAND_DEBUG_SEND_QPARTYMSG,     false, &HandleDebugSendQuestPartyMsgCommand,   "", NULL },
+            { "qinvalidmsg",   RBAC_PERM_COMMAND_DEBUG_SEND_QINVALIDMSG,   false, &HandleDebugSendQuestInvalidMsgCommand, "", NULL },
+            { "sellerror",     RBAC_PERM_COMMAND_DEBUG_SEND_SELLERROR,     false, &HandleDebugSendSellErrorCommand,       "", NULL },
+            { "setphaseshift", RBAC_PERM_COMMAND_DEBUG_SEND_SETPHASESHIFT, false, &HandleDebugSendSetPhaseShiftCommand,   "", NULL },
+            { "spellfail",     RBAC_PERM_COMMAND_DEBUG_SEND_SPELLFAIL,     false, &HandleDebugSendSpellFailCommand,       "", NULL },
+            { NULL,            0,                                          false, NULL,                                   "", NULL }
         };
         static ChatCommand debugCommandTable[] =
         {
-            { "setbit",         RBAC_PERM_ADMINISTRATOR_COMMANDS,  false, &HandleDebugSet32BitCommand,        "", NULL },
-            { "threat",         RBAC_PERM_ADMINISTRATOR_COMMANDS,  false, &HandleDebugThreatListCommand,      "", NULL },
-            { "hostil",         RBAC_PERM_ADMINISTRATOR_COMMANDS,  false, &HandleDebugHostileRefListCommand,  "", NULL },
-            { "anim",           RBAC_PERM_GAMEMASTER_COMMANDS,     false, &HandleDebugAnimCommand,            "", NULL },
-            { "arena",          RBAC_PERM_ADMINISTRATOR_COMMANDS,  false, &HandleDebugArenaCommand,           "", NULL },
-            { "bg",             RBAC_PERM_ADMINISTRATOR_COMMANDS,  false, &HandleDebugBattlegroundCommand,    "", NULL },
-            { "getitemstate",   RBAC_PERM_ADMINISTRATOR_COMMANDS,  false, &HandleDebugGetItemStateCommand,    "", NULL },
-            { "lootrecipient",  RBAC_PERM_GAMEMASTER_COMMANDS,     false, &HandleDebugGetLootRecipientCommand, "", NULL },
-            { "getvalue",       RBAC_PERM_ADMINISTRATOR_COMMANDS,  false, &HandleDebugGetValueCommand,        "", NULL },
-            { "getitemvalue",   RBAC_PERM_ADMINISTRATOR_COMMANDS,  false, &HandleDebugGetItemValueCommand,    "", NULL },
-            { "Mod32Value",     RBAC_PERM_ADMINISTRATOR_COMMANDS,  false, &HandleDebugMod32ValueCommand,      "", NULL },
-            { "play",           RBAC_PERM_MODERATOR_COMMANDS,      false, NULL,              "", debugPlayCommandTable },
-            { "send",           RBAC_PERM_ADMINISTRATOR_COMMANDS,  false, NULL,              "", debugSendCommandTable },
-            { "setaurastate",   RBAC_PERM_ADMINISTRATOR_COMMANDS,  false, &HandleDebugSetAuraStateCommand,    "", NULL },
-            { "setitemvalue",   RBAC_PERM_ADMINISTRATOR_COMMANDS,  false, &HandleDebugSetItemValueCommand,    "", NULL },
-            { "setvalue",       RBAC_PERM_ADMINISTRATOR_COMMANDS,  false, &HandleDebugSetValueCommand,        "", NULL },
-            { "spawnvehicle",   RBAC_PERM_ADMINISTRATOR_COMMANDS,  false, &HandleDebugSpawnVehicleCommand,    "", NULL },
-            { "setvid",         RBAC_PERM_ADMINISTRATOR_COMMANDS,  false, &HandleDebugSetVehicleIdCommand,    "", NULL },
-            { "entervehicle",   RBAC_PERM_ADMINISTRATOR_COMMANDS,  false, &HandleDebugEnterVehicleCommand,    "", NULL },
-            { "uws",            RBAC_PERM_ADMINISTRATOR_COMMANDS,  false, &HandleDebugUpdateWorldStateCommand, "", NULL },
-            { "update",         RBAC_PERM_ADMINISTRATOR_COMMANDS,  false, &HandleDebugUpdateCommand,          "", NULL },
-            { "itemexpire",     RBAC_PERM_ADMINISTRATOR_COMMANDS,  false, &HandleDebugItemExpireCommand,      "", NULL },
-            { "areatriggers",   RBAC_PERM_ADMINISTRATOR_COMMANDS,  false, &HandleDebugAreaTriggersCommand,    "", NULL },
-            { "los",            RBAC_PERM_MODERATOR_COMMANDS,      false, &HandleDebugLoSCommand,             "", NULL },
-            { "moveflags",      RBAC_PERM_ADMINISTRATOR_COMMANDS,  false, &HandleDebugMoveflagsCommand,       "", NULL },
-            { NULL,             RBAC_PERM_PLAYER_COMMANDS,         false, NULL,                               "", NULL }
+            { "setbit",        RBAC_PERM_COMMAND_DEBUG_SETBIT,        false, &HandleDebugSet32BitCommand,         "", NULL },
+            { "threat",        RBAC_PERM_COMMAND_DEBUG_THREAT,        false, &HandleDebugThreatListCommand,       "", NULL },
+            { "hostil",        RBAC_PERM_COMMAND_DEBUG_HOSTIL,        false, &HandleDebugHostileRefListCommand,   "", NULL },
+            { "anim",          RBAC_PERM_COMMAND_DEBUG_ANIM,          false, &HandleDebugAnimCommand,             "", NULL },
+            { "arena",         RBAC_PERM_COMMAND_DEBUG_ARENA,         false, &HandleDebugArenaCommand,            "", NULL },
+            { "bg",            RBAC_PERM_COMMAND_DEBUG_BG,            false, &HandleDebugBattlegroundCommand,     "", NULL },
+            { "getitemstate",  RBAC_PERM_COMMAND_DEBUG_GETITEMSTATE,  false, &HandleDebugGetItemStateCommand,     "", NULL },
+            { "lootrecipient", RBAC_PERM_COMMAND_DEBUG_LOOTRECIPIENT, false, &HandleDebugGetLootRecipientCommand, "", NULL },
+            { "getvalue",      RBAC_PERM_COMMAND_DEBUG_GETVALUE,      false, &HandleDebugGetValueCommand,         "", NULL },
+            { "getitemvalue",  RBAC_PERM_COMMAND_DEBUG_GETITEMVALUE,  false, &HandleDebugGetItemValueCommand,     "", NULL },
+            { "Mod32Value",    RBAC_PERM_COMMAND_DEBUG_MOD32VALUE,    false, &HandleDebugMod32ValueCommand,       "", NULL },
+            { "play",          RBAC_PERM_COMMAND_DEBUG_PLAY,          false, NULL,              "", debugPlayCommandTable },
+            { "send",          RBAC_PERM_COMMAND_DEBUG_SEND,          false, NULL,              "", debugSendCommandTable },
+            { "setaurastate",  RBAC_PERM_COMMAND_DEBUG_SETAURASTATE,  false, &HandleDebugSetAuraStateCommand,     "", NULL },
+            { "setitemvalue",  RBAC_PERM_COMMAND_DEBUG_SETITEMVALUE,  false, &HandleDebugSetItemValueCommand,     "", NULL },
+            { "setvalue",      RBAC_PERM_COMMAND_DEBUG_SETVALUE,      false, &HandleDebugSetValueCommand,         "", NULL },
+            { "spawnvehicle",  RBAC_PERM_COMMAND_DEBUG_SPAWNVEHICLE,  false, &HandleDebugSpawnVehicleCommand,     "", NULL },
+            { "setvid",        RBAC_PERM_COMMAND_DEBUG_SETVID,        false, &HandleDebugSetVehicleIdCommand,     "", NULL },
+            { "entervehicle",  RBAC_PERM_COMMAND_DEBUG_ENTERVEHICLE,  false, &HandleDebugEnterVehicleCommand,     "", NULL },
+            { "uws",           RBAC_PERM_COMMAND_DEBUG_UWS,           false, &HandleDebugUpdateWorldStateCommand, "", NULL },
+            { "update",        RBAC_PERM_COMMAND_DEBUG_UPDATE,        false, &HandleDebugUpdateCommand,           "", NULL },
+            { "itemexpire",    RBAC_PERM_COMMAND_DEBUG_ITEMEXPIRE,    false, &HandleDebugItemExpireCommand,       "", NULL },
+            { "areatriggers",  RBAC_PERM_COMMAND_DEBUG_AREATRIGGERS,  false, &HandleDebugAreaTriggersCommand,     "", NULL },
+            { "los",           RBAC_PERM_COMMAND_DEBUG_LOS,           false, &HandleDebugLoSCommand,              "", NULL },
+            { "moveflags",     RBAC_PERM_COMMAND_DEBUG_MOVEFLAGS,     false, &HandleDebugMoveflagsCommand,        "", NULL },
+            { NULL,            0,                                     false, NULL,                                "", NULL }
         };
         static ChatCommand commandTable[] =
         {
-            { "debug",          RBAC_PERM_MODERATOR_COMMANDS,      true,  NULL,                  "", debugCommandTable },
-            { "wpgps",          RBAC_PERM_ADMINISTRATOR_COMMANDS,  false, &HandleWPGPSCommand,                "", NULL },
-            { NULL,             RBAC_PERM_PLAYER_COMMANDS,         false, NULL,                  "",              NULL }
+            { "debug",         RBAC_PERM_COMMAND_DEBUG,   true,  NULL,               "", debugCommandTable },
+            { "wpgps",         RBAC_PERM_COMMAND_WPGPS,  false, &HandleWPGPSCommand, "", NULL },
+            { NULL,            0,                        false, NULL,                "", NULL }
         };
         return commandTable;
     }