aboutsummaryrefslogtreecommitdiff
path: root/NorthstarDedicatedTest
diff options
context:
space:
mode:
authorKittenPopo <Pokeberry123@gmail.com>2022-07-04 17:19:57 -0700
committerGitHub <noreply@github.com>2022-07-05 02:19:57 +0200
commit5995a7462da970ee2102a0dd0047ebbcef519dd0 (patch)
treece8a18c48a74ccedb8806ad04f230283203d9f37 /NorthstarDedicatedTest
parent22a1ce87fa1205aa15eff81d78dc7c0e87c251c9 (diff)
downloadNorthstarLauncher-5995a7462da970ee2102a0dd0047ebbcef519dd0.tar.gz
NorthstarLauncher-5995a7462da970ee2102a0dd0047ebbcef519dd0.zip
Fix KHook hooking order to prevent missed hooks (#213)
Diffstat (limited to 'NorthstarDedicatedTest')
-rw-r--r--NorthstarDedicatedTest/ExploitFixes.cpp68
-rw-r--r--NorthstarDedicatedTest/ExploitFixes.h8
-rw-r--r--NorthstarDedicatedTest/NSMem.h20
-rw-r--r--NorthstarDedicatedTest/dllmain.cpp12
4 files changed, 61 insertions, 47 deletions
diff --git a/NorthstarDedicatedTest/ExploitFixes.cpp b/NorthstarDedicatedTest/ExploitFixes.cpp
index 0f8569b5..2f4e2b5c 100644
--- a/NorthstarDedicatedTest/ExploitFixes.cpp
+++ b/NorthstarDedicatedTest/ExploitFixes.cpp
@@ -272,13 +272,11 @@ INVALID_CMD:
// basically: by default r2 isn't set as a valve mod, meaning that m_bRestrictServerCommands is false
// this is HORRIBLE for security, because it means servers can run arbitrary concommands on clients
// especially since we have script commands this could theoretically be awful
-
-typedef void (*IsValveModType)();
-IsValveModType IsValveMod;
-
-bool IsValveModHook()
+KHOOK(IsValveMod, ("engine.dll", "48 83 EC 28 48 8B 0D ? ? ? ? 48 8D 15 ? ? ? ? E8 ? ? ? ? 85 C0 74 63"), bool, __fastcall, ())
{
- return !CommandLine()->CheckParm("-norestrictservercommands");
+ bool result = !CommandLine()->CheckParm("-norestrictservercommands");
+ spdlog::info("ExploitFixes: Overriding IsValveMod to {}...", result);
+ return result;
}
// Fix respawn's crappy UTF8 parser so it doesn't crash -_-
@@ -490,36 +488,62 @@ KHOOK(
return oSpecialClientCommand(player, command);
}
-void ExploitFixes::LoadCallback(HMODULE baseAddress)
+void SetupKHook(KHook* hook)
{
- spdlog::info("ExploitFixes::LoadCallback ...");
-
- spdlog::info("\tByte patching...");
- DoBytePatches();
-
- if (KHook::InitAllHooks())
+ if (hook->Setup())
{
- spdlog::info("\tInitialized " + std::to_string(KHook::_allHooks.size()) + " exploit-patch hooks.");
+ spdlog::debug("KHook::Setup(): Hooked at {}", hook->targetFuncAddr);
}
else
{
spdlog::critical("\tFAILED to initialize all exploit patches.");
- // Force exit?
+ // Force exit
MessageBoxA(0, "FAILED to initialize all exploit patches.", "Northstar", MB_ICONERROR);
exit(0);
}
+}
- ns_exploitfixes_log =
- new ConVar("ns_exploitfixes_log", "1", FCVAR_GAMEDLL, "Whether to log whenever ExploitFixes.cpp blocks/corrects something");
+void ExploitFixes::LoadCallback_MultiModule(HMODULE baseAddress)
+{
- HookEnabler hook;
- ENABLER_CREATEHOOK(hook, (char*)baseAddress + 0x2a8a50, &GetEntByIndexHook, reinterpret_cast<LPVOID*>(&GetEntByIndex));
+ spdlog::info("ExploitFixes::LoadCallback_MultiModule({}) ...", (void*)baseAddress);
+
+ int hooksEnabled = 0;
+ for (auto itr = KHook::_allHooks.begin(); itr != KHook::_allHooks.end(); itr++)
+ {
+ auto curHook = *itr;
+ if (GetModuleHandleA(curHook->targetFunc.moduleName) == baseAddress)
+ {
+ SetupKHook(curHook);
+ itr = KHook::_allHooks.erase(itr); // Prevent repeated initialization
+
+ hooksEnabled++;
+
+ if (itr == KHook::_allHooks.end())
+ break;
+ }
+ }
+
+ spdlog::info("\tEnabled {} hooks.", hooksEnabled);
}
-void ExploitFixes::LoadCallbackEngine(HMODULE baseAddress)
+void ExploitFixes::LoadCallback_Full(HMODULE baseAddress)
{
- spdlog::info("ExploitFixes::LoadCallbackEngine ...");
+ spdlog::info("ExploitFixes::LoadCallback_Full ...");
+
+ spdlog::info("\tByte patching...");
+ DoBytePatches();
+
+ for (KHook* hook : KHook::_allHooks)
+ SetupKHook(hook);
+
+ spdlog::info("\tInitialized " + std::to_string(KHook::_allHooks.size()) + " late exploit-patch hooks.");
+ KHook::_allHooks.clear();
+
+ ns_exploitfixes_log =
+ new ConVar("ns_exploitfixes_log", "1", FCVAR_GAMEDLL, "Whether to log whenever ExploitFixes.cpp blocks/corrects something");
+
HookEnabler hook;
- ENABLER_CREATEHOOK(hook, (char*)baseAddress + 0x1C6360, &IsValveModHook, reinterpret_cast<LPVOID*>(&IsValveMod));
+ ENABLER_CREATEHOOK(hook, (char*)baseAddress + 0x2a8a50, &GetEntByIndexHook, reinterpret_cast<LPVOID*>(&GetEntByIndex));
} \ No newline at end of file
diff --git a/NorthstarDedicatedTest/ExploitFixes.h b/NorthstarDedicatedTest/ExploitFixes.h
index 1cafe758..d0754d72 100644
--- a/NorthstarDedicatedTest/ExploitFixes.h
+++ b/NorthstarDedicatedTest/ExploitFixes.h
@@ -5,6 +5,8 @@
namespace ExploitFixes
{
- void LoadCallback(HMODULE unused);
- void LoadCallbackEngine(HMODULE baseAddress);
-} // namespace ExploitFixes \ No newline at end of file
+ // This callback will be ran muliple times on multiple module loads
+ void LoadCallback_MultiModule(HMODULE baseAddress);
+
+ void LoadCallback_Full(HMODULE unused);
+} // namespace ExploitFixes
diff --git a/NorthstarDedicatedTest/NSMem.h b/NorthstarDedicatedTest/NSMem.h
index 74df3a84..84bb93db 100644
--- a/NorthstarDedicatedTest/NSMem.h
+++ b/NorthstarDedicatedTest/NSMem.h
@@ -182,25 +182,7 @@ struct KHook
if (!targetFuncAddr)
return false;
- return MH_CreateHook(targetFuncAddr, hookFunc, original) == MH_OK;
- }
-
- // Returns true if succeeded
- static bool InitAllHooks()
- {
- for (KHook* hook : _allHooks)
- {
- if (hook->Setup())
- {
- spdlog::info("KHook hooked at {}", hook->targetFuncAddr);
- }
- else
- {
- return false;
- }
- }
-
- return MH_EnableHook(MH_ALL_HOOKS) == MH_OK;
+ return (MH_CreateHook(targetFuncAddr, hookFunc, original) == MH_OK) && (MH_EnableHook(targetFuncAddr) == MH_OK);
}
};
#define KHOOK(name, funcPatternInfo, returnType, convention, args) \
diff --git a/NorthstarDedicatedTest/dllmain.cpp b/NorthstarDedicatedTest/dllmain.cpp
index 08081d78..04cb883b 100644
--- a/NorthstarDedicatedTest/dllmain.cpp
+++ b/NorthstarDedicatedTest/dllmain.cpp
@@ -285,9 +285,15 @@ bool InitialiseNorthstar()
// mod manager after everything else
AddDllLoadCallback("engine.dll", InitialiseModManager);
- // activate exploit fixes
- AddDllLoadCallback("server.dll", ExploitFixes::LoadCallback);
- AddDllLoadCallback("engine.dll", ExploitFixes::LoadCallbackEngine);
+ {
+ // activate multi-module exploitfixes callbacks
+ constexpr const char* EXPLOITFIXES_MULTICALLBACK_MODS[] = {"client.dll", "engine.dll", "server.dll"};
+ for (const char* mod : EXPLOITFIXES_MULTICALLBACK_MODS)
+ AddDllLoadCallback(mod, ExploitFixes::LoadCallback_MultiModule);
+
+ // activate exploit fixes later
+ AddDllLoadCallback("server.dll", ExploitFixes::LoadCallback_Full);
+ }
// run callbacks for any libraries that are already loaded by now
CallAllPendingDLLLoadCallbacks();