nullworks/cathook
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixes and IRC security improvement

Browse Source
This commit is contained in:
LightCat 2018-10-23 15:29:38 +02:00
parent 5889712401
commit a82a02c6b4
2 changed files with 20 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/hooks/CreateMove.cpp
View File

@ -313,13 +313,13 @@ DEFINE_HOOKED_METHOD(CreateMove, bool, void *this_, float input_sample_time,
PROF_SECTION(CM_deadringer);
hacks::shared::deadringer::CreateMove();
}
if (engine_pred)
engine_prediction::RunEnginePrediction(RAW_ENT(LOCAL_E),
current_user_cmd);
{
PROF_SECTION(CM_bunnyhop);
hacks::shared::bunnyhop::CreateMove();
}
if (engine_pred)
engine_prediction::RunEnginePrediction(RAW_ENT(LOCAL_E),
current_user_cmd);
{
PROF_SECTION(CM_backtracc);
hacks::shared::backtrack::Run();

20
src/irc.cpp
View File

@ -58,6 +58,11 @@ void authreq(std::string &msg)
// Check if we are in a game
if (g_Settings.bInvalid)
return;
INetChannel *ch = (INetChannel *)g_IEngine->GetNetChannelInfo();
if (!ch)
return;
std::string ip = ch->GetAddress();
logging::Info(ip.c_str());
bool isreply = false;
if (msg.find("authrep") == 0)
@ -79,9 +84,10 @@ void authreq(std::string &msg)
if (!g_IEngine->GetPlayerInfo(i, &pinfo))
continue;
auto tarsteamid = pinfo.friendsID;
std::string total_hash = std::to_string(tarsteamid).append(pinfo.name).append(ip);
MD5Value_t result;
// Hash steamid
MD5_ProcessSingleBuffer(&tarsteamid, sizeof(tarsteamid), result);
MD5_ProcessSingleBuffer(total_hash.c_str(), strlen(total_hash.c_str()), result);
// Get bits of hash and store in string
std::string tarhash;
for (auto i : result.bits)
@ -271,7 +277,15 @@ void auth(bool reply)
if (!*authenticate)
return;
MD5Value_t result;
MD5_ProcessSingleBuffer(&LOCAL_E->player_info.friendsID, sizeof(uint32),
player_info_s pinfo{};
if (!g_IEngine->GetPlayerInfo(LOCAL_E->m_IDX, &pinfo))
return;
INetChannel *ch = (INetChannel *)g_IEngine->GetNetChannelInfo();
if (!ch)
return;
std::string ip = ch->GetName();
std::string total_hash = std::to_string(pinfo.friendsID).append(pinfo.name).append(ip);
MD5_ProcessSingleBuffer(total_hash.c_str(), strlen(total_hash.c_str()),
result);
std::string msg("auth");
if (reply)
@ -302,7 +316,7 @@ int GetMaxParty()
CatCommand debug_maxparty("debug_partysize", "Debug party size",
[]() { logging::Info("%d", GetMaxParty()); });
Timer resize_party{};
static Timer resize_party{};
static HookedFunction paint(HookedFunctions_types::HF_Paint, "IRC", 16, []() {
if (!restarting)
{