github
/
NorthstarLauncher
mirror of https://github.com/R2Northstar/NorthstarLauncher
1
Fork 0
Code Releases Activity

Reject banned players during masterserver auth (#434) 

* Reject banned players during masterserver auth

This is backwards-compatible with old masterserver versions (it will
be treated as a general authentication failure).

* Reword server ban message
This commit is contained in:
pg9182 2023-03-07 19:37:42 -05:00 committed by GitHub
parent 6f4c6f3e95
commit 06221fab6b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 19 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
NorthstarDLL/server/auth/serverauthentication.cpp
View File

@ -62,6 +62,22 @@ void ServerAuthenticationManager::StartPlayerAuthServer()
return;
}
uint64_t uid;
try
{
uid = std::strtoull(request.get_param_value("id").c_str(), nullptr, 10);
}
catch (std::exception const& ex)
{
response.set_content("{\"success\":false}", "application/json");
return;
}
if (!g_pBanSystem->IsUIDAllowed(uid))
{
response.set_content("{\"success\":false,\"reject\":\"Banned from this server.\"}", "application/json");
return;
}
RemoteAuthData newAuthData {};
strncpy_s(newAuthData.uid, sizeof(newAuthData.uid), request.get_param_value("id").c_str(), sizeof(newAuthData.uid) - 1);
strncpy_s(
@ -307,11 +323,11 @@ bool,, (R2::CBaseClient* self, char* pName, void* pNetChannel, char bFakePlayer,
if (!bFakePlayer)
{
if (!g_pServerAuthentication->VerifyPlayerName(pNextPlayerToken, pName, pVerifiedName))
pAuthenticationFailure = "Invalid Name.";
pAuthenticationFailure = "Invalid name.";
else if (!g_pBanSystem->IsUIDAllowed(iNextPlayerUid))
pAuthenticationFailure = "Banned From server.";
pAuthenticationFailure = "Banned from this server.";
else if (!g_pServerAuthentication->CheckAuthentication(self, iNextPlayerUid, pNextPlayerToken))
pAuthenticationFailure = "Authentication Failed.";
pAuthenticationFailure = "Authentication failed.";
}
else // need to copy name for bots still
strncpy_s(pVerifiedName, pName, 63);