R5Reloaded/r5sdk
1
0
Fork 0
mirror of https://github.com/Mauler125/r5sdk.git synced 2025-02-09 19:15:03 +01:00
Code Issues Packages Projects Releases Wiki Activity

RTech: implement Nucleus ID hashing for LiveAPI events

Browse Source 
The field was supposed to be hashed, added cheap hashing logic and an option to truncate it to reduce overhead.
This commit is contained in:
Kawe Mazidjatari 2024-04-04 01:56:31 +02:00
parent 70c117b6ff
commit 873e20c121
4 changed files with 30 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
r5dev/game/CMakeLists.txt
View File

@ -175,6 +175,7 @@ endif()
target_include_directories( ${PROJECT_NAME} PRIVATE
"${ENGINE_SOURCE_DIR}/tier0/"
"${ENGINE_SOURCE_DIR}/tier1/"
"${THIRDPARTY_SOURCE_DIR}/mbedtls/include"
)
endmacro()

32
r5dev/game/server/liveapi/liveapi.cpp
View File

@ -9,20 +9,21 @@
//
//=============================================================================//
#include "tier1/depthcounter.h"
#include "mbedtls/include/mbedtls/sha512.h"
#include "rtech/liveapi/liveapi.h"
#include "engine/sys_utils.h"
#include "vscript/languages/squirrel_re/include/sqtable.h"
#include "vscript/languages/squirrel_re/include/sqarray.h"
#include "game/server/vscript_server.h"
#include "rtech/liveapi/liveapi.h"
#include "liveapi.h"
#include "engine/sys_utils.h"
#pragma warning(push)
#pragma warning(disable : 4505)
#include "protoc/events.pb.h"
#pragma warning(pop)
// The total nesting depth cannot exceed this number
#define LIVEAPI_MAX_ITEM_DEPTH 64
#define LIVEAPI_MAX_ITEM_DEPTH 64 // The total nesting depth cannot exceed this number
#define LIVEAPI_SHA512_HASH_SIZE 64
/*
@ -373,6 +374,27 @@ static void LiveAPI_SetVersion(rtech::liveapi::Version* const msg)
msg->set_revision(LIVEAPI_REVISION);
}
static void LiveAPI_SetNucleusHash(std::string* const msg, const SQString* const nucleusId)
{
static const char hexChars[] = "0123456789abcdef";
uint8_t nucleusIdHash[LIVEAPI_SHA512_HASH_SIZE];
mbedtls_sha512(reinterpret_cast<const uint8_t*>(nucleusId->_val), nucleusId->_len, nucleusIdHash, NULL);
const size_t hashSize = liveapi_truncate_hash_fields.GetBool()
? LIVEAPI_SHA512_HASH_SIZE / 4
: LIVEAPI_SHA512_HASH_SIZE;
msg->reserve((hashSize * 2) + 1);
msg->resize((hashSize * 2));
for (size_t i = 0; i < hashSize; i++)
{
(*msg)[i * 2] = hexChars[(nucleusIdHash[i] >> 4) & 0xf];
(*msg)[i * 2 + 1] = hexChars[nucleusIdHash[i] & 0xf];
}
}
static bool LiveAPI_SetPlayerIdentityFields(HSQUIRRELVM const v, const SQTable* const table, rtech::liveapi::Player* const playerMsg)
{
bool ranLoop = false;
@ -454,7 +476,7 @@ static bool LiveAPI_SetPlayerIdentityFields(HSQUIRRELVM const v, const SQTable*
case rtech::liveapi::Player::kNucleusHashFieldNumber:
{
LIVEAPI_ENSURE_TYPE(v, obj, OT_STRING, playerMsg, fieldNum);
playerMsg->set_nucleushash(_string(obj)->_val);
LiveAPI_SetNucleusHash(playerMsg->mutable_nucleushash(), _string(obj));
break;
}

1
r5dev/rtech/liveapi/liveapi.cpp
View File

@ -36,6 +36,7 @@ static void LiveAPI_AddressChangedCallback(IConVar* var, const char* pOldValue)
//-----------------------------------------------------------------------------
ConVar liveapi_enabled("liveapi_enabled", "1", FCVAR_RELEASE | FCVAR_SERVER_FRAME_THREAD, "Enable LiveAPI functionality", &LiveAPI_EnabledChangedCallback);
ConVar liveapi_session_name("liveapi_session_name", "liveapi_session", FCVAR_RELEASE | FCVAR_SERVER_FRAME_THREAD, "LiveAPI session name to identify this connection");
ConVar liveapi_truncate_hash_fields("liveapi_truncate_hash_fields", "1", FCVAR_RELEASE | FCVAR_SERVER_FRAME_THREAD, "Whether to truncate hash fields in LiveAPI events to save on I/O");
// WebSocket core
static ConVar liveapi_websocket_enabled("liveapi_websocket_enabled", "1", FCVAR_RELEASE | FCVAR_SERVER_FRAME_THREAD, "Whether to use WebSocket to transmit LiveAPI events", &LiveAPI_WebSocketEnabledChangedCallback);

1
r5dev/rtech/liveapi/liveapi.h
View File

@ -7,6 +7,7 @@
extern ConVar liveapi_enabled;
extern ConVar liveapi_session_name;
extern ConVar liveapi_truncate_hash_fields;
struct ProtoWebSocketRefT;
typedef void (*LiveAPISendCallback_t)(ProtoWebSocketRefT* webSocket);