feat(Core/Scripting): Add hook during command security evaluation. (#…

…20564)
azerothcore · Nov 14, 2024 · 53cd41b · 53cd41b
1 parent e1766eb
commit 53cd41b
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 0 deletions.
diff --git a/src/server/game/Chat/ChatCommands/ChatCommand.cpp b/src/server/game/Chat/ChatCommands/ChatCommand.cpp
@@ -506,6 +506,9 @@ bool Acore::Impl::ChatCommands::ChatCommandNode::IsInvokerVisible(ChatHandler co
     if (!_invoker)
         return false;
 
+    if (!sScriptMgr->OnBeforeIsInvokerVisible(_name, _permission, who))
+        return true;
+
     if (who.IsConsole() && (_permission.AllowConsole == Acore::ChatCommands::Console::No))
         return false;
 

diff --git a/src/server/game/Scripting/ScriptDefines/AllCommandScript.cpp b/src/server/game/Scripting/ScriptDefines/AllCommandScript.cpp
@@ -16,6 +16,7 @@
  */
 
 #include "AllCommandScript.h"
+#include "ChatCommand.h"
 #include "ScriptMgr.h"
 #include "ScriptMgrMacros.h"
 
@@ -29,6 +30,11 @@ bool ScriptMgr::OnTryExecuteCommand(ChatHandler& handler, std::string_view cmdSt
     CALL_ENABLED_BOOLEAN_HOOKS(AllCommandScript, ALLCOMMANDHOOK_ON_TRY_EXECUTE_COMMAND, !script->OnTryExecuteCommand(handler, cmdStr));
 }
 
+bool ScriptMgr::OnBeforeIsInvokerVisible(std::string name, Acore::Impl::ChatCommands::CommandPermissions permissions, ChatHandler const& who)
+{
+    CALL_ENABLED_BOOLEAN_HOOKS(AllCommandScript, ALLCOMMANDHOOK_ON_BEFORE_IS_INVOKER_VISIBLE, !script->OnBeforeIsInvokerVisible(name, permissions, who));
+}
+
 AllCommandScript::AllCommandScript(const char* name, std::vector<uint16> enabledHooks)
     : ScriptObject(name, ALLCOMMANDHOOK_END)
 {

diff --git a/src/server/game/Scripting/ScriptDefines/AllCommandScript.h b/src/server/game/Scripting/ScriptDefines/AllCommandScript.h
@@ -19,12 +19,14 @@
 #define SCRIPT_OBJECT_ALL_COMMAND_SCRIPT_H_
 
 #include "ScriptObject.h"
+#include "ChatCommand.h"
 #include <vector>
 
 enum AllCommandHook
 {
     ALLCOMMANDHOOK_ON_HANDLE_DEV_COMMAND,
     ALLCOMMANDHOOK_ON_TRY_EXECUTE_COMMAND,
+    ALLCOMMANDHOOK_ON_BEFORE_IS_INVOKER_VISIBLE,
     ALLCOMMANDHOOK_END
 };
 
@@ -45,6 +47,8 @@ class AllCommandScript : public ScriptObject
      * @param cmdStr Contains information about the command name
      */
     [[nodiscard]] virtual bool OnTryExecuteCommand(ChatHandler& /*handler*/, std::string_view /*cmdStr*/) { return true; }
+
+    [[nodiscard]] virtual bool OnBeforeIsInvokerVisible(std::string /*name*/, Acore::Impl::ChatCommands::CommandPermissions /*permissions*/, ChatHandler const& /*who*/) { return true; }
 };
 
 // Compatibility for old scripts

diff --git a/src/server/game/Scripting/ScriptMgr.h b/src/server/game/Scripting/ScriptMgr.h
@@ -22,6 +22,7 @@
 #include "ArenaTeam.h"
 #include "AuctionHouseMgr.h"
 #include "Battleground.h"
+#include "ChatCommand.h"
 #include "Common.h"
 #include "DBCStores.h"
 #include "DynamicObject.h"
@@ -672,6 +673,7 @@ class ScriptMgr
 
     void OnHandleDevCommand(Player* player, bool& enable);
     bool OnTryExecuteCommand(ChatHandler& handler, std::string_view cmdStr);
+    bool OnBeforeIsInvokerVisible(std::string name, Acore::Impl::ChatCommands::CommandPermissions permissions, ChatHandler const& who);
 
 public: /* DatabaseScript */