reHLDS/ReUnion
1
0
Fork 0
mirror of https://github.com/rehlds/reunion.git synced 2025-02-05 10:10:39 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixed collisions of SteamIDs issued to non-unique serial numbers "0000_0000_0000_0000_0000_0100_0000_0000".

Browse Source 
For these non-steam clients, SteamIDs will now be generated based on IP.
This commit is contained in:
s1lentq 2024-06-21 21:26:22 +07:00
parent c3dddd0bf4
commit de41ab367f
4 changed files with 26 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
reunion/src/client_auth.cpp
View File

@ -97,6 +97,7 @@ uint64_t SteamByIp(uint32_t ip)
bool Reunion_FinishClientAuth(CReunionPlayer* reunionPlr, USERID_t* userid, client_auth_context_t* ctx)
{
client_auth_kind authkind;
client_id_kind idkind = CI_UNKNOWN;
if (!ctx->authentificatedInSteam) {
// native auth failed, try authorize by emulators
@ -125,6 +126,10 @@ bool Reunion_FinishClientAuth(CReunionPlayer* reunionPlr, USERID_t* userid, clie
authkind = CA_STEAM_PENDING;
}
else {
// check for bad authkey
if (!IsValidHddsnNumber(authdata.authKey, authdata.authKeyLen))
idkind = CI_VALVE_BY_IP;
// salt steamid
if (g_ReunionConfig->getSteamIdSaltLen()) {
SaltSteamId(&authdata);
@ -162,7 +167,9 @@ bool Reunion_FinishClientAuth(CReunionPlayer* reunionPlr, USERID_t* userid, clie
}
// add prefix
client_id_kind idkind = g_ReunionConfig->getIdGenOptions(authkind)->id_kind;
if (idkind == CI_UNKNOWN)
idkind = g_ReunionConfig->getIdGenOptions(authkind)->id_kind;
switch (idkind) {
// check for deprecation
case CI_DEPRECATED:

6
reunion/src/reunion_authorizers.cpp
View File

@ -58,14 +58,16 @@ void RevEmuFinishAuthorization(authdata_t* authdata, const char* authStr, bool s
if (IsHddsnNumber(authStr)) {
authdata->authKeyKind = AK_HDDSN;
LCPrintf(false, "RevEmu raw auth string: '%s' (HDDSN)\n", authStr);
if (stripSpecialChars) {
authdata->authKeyLen = strecpy(hddsn, authStr, authKeyMaxLen, " \\/-");
authStr = hddsn;
}
else
authdata->authKeyLen = min(strlen(authStr), authKeyMaxLen);
LCPrintf(false, "RevEmu raw auth string: '%s' (HDDSN)%s\n", authStr,
IsValidHddsnNumber(authStr, authdata->authKeyLen) ? "" : " (INVALID)"
);
}
else {
authdata->authKeyKind = AK_VOLUMEID;

13
reunion/src/reunion_utils.cpp
View File

@ -145,6 +145,19 @@ bool IsHddsnNumber(const char* authstring)
return strtoull(authstring, nullptr, 10) >= UINT32_MAX; // SSD
}
// This serial number is actually not a valid serial number
// it is a system bug that provides an incorrect serial number for NVMe solid-state drives (Netac NVMe SSD),
// retrieved from the Storage Descriptor instead of reading it from the driver.
// Therefore, obtaining the serial number from the Storage Descriptor means we should not generate a SteamID based on such serial numbers,
// as it increases the risk of SteamID collisions.
// Instead, it is better to generate a SteamID based on the client's IP.
const char *BadHddsnNumber = "0000_0000_0000_0000_0000_0100_0";
bool IsValidHddsnNumber(const void* data, size_t maxlen)
{
return memcmp(data, BadHddsnNumber, min(strlen(BadHddsnNumber), maxlen)) != 0;
}
void util_console_print(const char* fmt, ...)
{
char buf[1024];

1
reunion/src/reunion_utils.h
View File

@ -16,6 +16,7 @@ extern bool IsUniqueIdKind(client_id_kind idkind);
extern bool IsValidId(uint32 authId);
extern bool IsValidSteamTicket(const uint8 *pvSteam2Key, size_t ucbSteam2Key);
extern bool IsHddsnNumber(const char* authstring);
extern bool IsValidHddsnNumber(const void* data, size_t maxlen);
extern void util_console_print(const char* fmt, ...);
extern void util_syserror(const char* fmt, ...);