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
r5sdk/r5dev/networksystem/pylon.h

56 lines
2.3 KiB
C
Raw Normal View History

Heavy cleanup for CHostState methods and signatures * Add Cbuf_AddText and Cbuf_Execute signatures. * Remove additional VGui stuff from dedicated statemachine. * Move signatures to their respective headers. * De-inline 'CHostState::FrameUpdate()' * Ported al new patters to GAMEDLL_S1, CEngine still recreation needs extra work
2022-02-19 02:31:16 +01:00
#pragma once
Finish libcurl implementation Master server queries now use SSL.
2023-01-26 20:06:48 +01:00
#include "thirdparty/curl/include/curl/curl.h"
Initial implementation of bulk ban checking Initial implementation of the bulk ban check system. This implementation takes a snapshot of the currently connected clients, sends it up to the master server, and the master server returns anything within this list that is marked 'banned'. The server would then kick the player from the server. This commit also removes the global banned list cache, as the bulk checking system offers a lot more freedom regarding banning specific players and have it sync across all available servers.
2023-04-28 23:47:58 +02:00
#include "bansystem.h"
Renamed master server related stuff
2022-07-01 10:29:27 +02:00
#include "serverlisting.h"
Make sure language is never NULL * Initialize CPylon::m_Language to "english". * Make sure cvar change callback is always setting values instead of returning out early.
2023-09-16 00:45:11 +02:00
#include "localize/ilocalize.h"
Heavy cleanup for CHostState methods and signatures * Add Cbuf_AddText and Cbuf_Execute signatures. * Remove additional VGui stuff from dedicated statemachine. * Move signatures to their respective headers. * De-inline 'CHostState::FrameUpdate()' * Ported al new patters to GAMEDLL_S1, CEngine still recreation needs extra work
2022-02-19 02:31:16 +01:00
EULA dialog implementation Display the EULA (fetched from masterserver), which the end user MUST accept before they can make use of the multiplayer features of R5Reloaded. NOTE: user doesn't need to agree to this to use the listenserver.
2024-04-05 16:26:18 +02:00
struct MSEulaData_t
{
int version;
string language;
string contents;
};
Renamed master server related stuff
2022-07-01 10:29:27 +02:00
class CPylon
{
public:
Make sure language is never NULL * Initialize CPylon::m_Language to "english". * Make sure cvar change callback is always setting values instead of returning out early.
2023-09-16 00:45:11 +02:00
CPylon() { m_Language = g_LanguageNames[0]; }
CPylon server query code deduplication Created another dedicated wrapper for handling API requests; significantly reduced duplicate code.
2023-04-24 01:55:37 +02:00
vector<NetGameServer_t> GetServerList(string& outMessage) const;
bool GetServerByToken(NetGameServer_t& slOutServer, string& outMessage, const string& svToken) const;
Client token authentication implementation The game internally obtains a auth token from Origin. On connect to a gameserver, it will send it to the masterserver. The master server will create a JWT token and send this back to the client. The client stores this token in 3 userinfo cvars (token, sig1, sig2). the sig1 and sig2 cvars are there to compensate for the truncation caused by sending the cvar, as each cvar string length could be up to 255 (byte max). The server verifies this token (the signature, timestamp, expiry); if they are valid, the has successfully authenticated and will connect.
2023-10-15 10:40:46 +02:00
bool PostServerHost(string& outMessage, string& svOutToken, string& outHostIp, const NetGameServer_t& netGameServer) const;
Initial implementation of bulk ban checking Initial implementation of the bulk ban check system. This implementation takes a snapshot of the currently connected clients, sends it up to the master server, and the master server returns anything within this list that is marked 'banned'. The server would then kick the player from the server. This commit also removes the global banned list cache, as the bulk checking system offers a lot more freedom regarding banning specific players and have it sync across all available servers.
2023-04-28 23:47:58 +02:00
Ban system refactor Use CUtlVector, and remove every copy caused by passing vectors by value. CUtlVector does not support copying. Also removed all extraneous std::string copies caused by calling itoa instead of std::to_string, or std::stoll, etc. All features have been tested and work as designed.
2023-08-31 00:16:25 +02:00
bool GetBannedList(const CBanSystem::BannedList_t& inBannedVec, CBanSystem::BannedList_t& outBannedVec) const;
Send client's persona name to the master server Will be used on the master server for additional checking.
2023-04-29 00:05:47 +02:00
bool CheckForBan(const string& ipAddress, const uint64_t nucleusId, const string& personaName, string& outReason) const;
CPylon server query code deduplication Created another dedicated wrapper for handling API requests; significantly reduced duplicate code.
2023-04-24 01:55:37 +02:00
Client token authentication implementation The game internally obtains a auth token from Origin. On connect to a gameserver, it will send it to the masterserver. The master server will create a JWT token and send this back to the client. The client stores this token in 3 userinfo cvars (token, sig1, sig2). the sig1 and sig2 cvars are there to compensate for the truncation caused by sending the cvar, as each cvar string length could be up to 255 (byte max). The server verifies this token (the signature, timestamp, expiry); if they are valid, the has successfully authenticated and will connect.
2023-10-15 10:40:46 +02:00
bool AuthForConnection(const uint64_t nucleusId, const char* ipAddress, const char* authCode, string& outToken, string& outMessage) const;
Show a more detailed error if the EULA request failed
2023-10-25 23:29:37 +02:00
bool GetEULA(MSEulaData_t& outData, string& outMessage) const;
EULA dialog implementation Display the EULA (fetched from masterserver), which the end user MUST accept before they can make use of the multiplayer features of R5Reloaded. NOTE: user doesn't need to agree to this to use the listenserver.
2024-04-05 16:26:18 +02:00
Replace JSON library with RapidJSON Less copies and overall CPU time parsing/constructing JSON's as we are mostly still using string pointers rather than STL string container.
2023-09-07 11:17:05 +02:00
void ExtractError(const rapidjson::Document& resultBody, string& outMessage, CURLINFO status, const char* errorText = nullptr) const;
CPylon server query code deduplication Created another dedicated wrapper for handling API requests; significantly reduced duplicate code.
2023-04-24 01:55:37 +02:00
void ExtractError(const string& response, string& outMessage, CURLINFO status, const char* messageText = nullptr) const;
CPylon error handling code deduplication Deduplicate code.
2023-04-24 00:32:27 +02:00
Replace JSON library with RapidJSON Less copies and overall CPU time parsing/constructing JSON's as we are mostly still using string pointers rather than STL string container.
2023-09-07 11:17:05 +02:00
void LogBody(const rapidjson::Document& responseJson) const;
EULA dialog implementation Display the EULA (fetched from masterserver), which the end user MUST accept before they can make use of the multiplayer features of R5Reloaded. NOTE: user doesn't need to agree to this to use the listenserver.
2024-04-05 16:26:18 +02:00
bool SendRequest(const char* endpoint, const rapidjson::Document& requestJson, rapidjson::Document& responseJson, string& outMessage, CURLINFO& status, const char* errorText = nullptr, const bool checkEula = true) const;
CPylon parsing/logging code deduplication Deduplicated parsing and logging code. Results are a lot more consistent and comprehensive.
2023-04-25 00:45:39 +02:00
bool QueryServer(const char* endpoint, const char* request, string& outResponse, string& outMessage, CURLINFO& outStatus) const;
GameUI: cleanup and fix race condition * Use CThreadFastMutex instead * Rename ISurface to IDebugSurface to prevent a potential name collision with VGUI's ISurface iface if we ever add it * Fix race condition when setting CPylon::m_HostIP from materialsystem thread, this has been dispatched to the main thread * Marked 'pylon_matchmaking_hostname' FCVAR_MATERIAL_SYSTEM_THREAD as we use it in the server browser panel.
2024-01-21 23:06:26 +01:00
inline void SetCurrentToken(const string& token) { m_Token = token; }
CPylon: add getters and setters for error/token fields
2023-07-19 02:17:28 +02:00
inline const string& GetCurrentToken() const { return m_Token; }
Client token authentication implementation The game internally obtains a auth token from Origin. On connect to a gameserver, it will send it to the masterserver. The master server will create a JWT token and send this back to the client. The client stores this token in 3 userinfo cvars (token, sig1, sig2). the sig1 and sig2 cvars are there to compensate for the truncation caused by sending the cvar, as each cvar string length could be up to 255 (byte max). The server verifies this token (the signature, timestamp, expiry); if they are valid, the has successfully authenticated and will connect.
2023-10-15 10:40:46 +02:00
CPylon: add getters and setters for error/token fields
2023-07-19 02:17:28 +02:00
inline void SetCurrentError(const string& error) { m_ErrorMsg = error; }
GameUI: cleanup and fix race condition * Use CThreadFastMutex instead * Rename ISurface to IDebugSurface to prevent a potential name collision with VGUI's ISurface iface if we ever add it * Fix race condition when setting CPylon::m_HostIP from materialsystem thread, this has been dispatched to the main thread * Marked 'pylon_matchmaking_hostname' FCVAR_MATERIAL_SYSTEM_THREAD as we use it in the server browser panel.
2024-01-21 23:06:26 +01:00
inline const string& GetCurrentError() const { return m_ErrorMsg; }
Pylon logic imporvements * Removed duplicate json parsing that was part of a PR that required a small refactor. * Only check if response buffer is empty when we are going to parse the error message (this helps finding bugs in master server, since failure to parse has an exception handler). * Log private server token and error messages to dedicated server console.
2023-02-04 19:18:18 +01:00
Client token authentication implementation The game internally obtains a auth token from Origin. On connect to a gameserver, it will send it to the masterserver. The master server will create a JWT token and send this back to the client. The client stores this token in 3 userinfo cvars (token, sig1, sig2). the sig1 and sig2 cvars are there to compensate for the truncation caused by sending the cvar, as each cvar string length could be up to 255 (byte max). The server verifies this token (the signature, timestamp, expiry); if they are valid, the has successfully authenticated and will connect.
2023-10-15 10:40:46 +02:00
inline void SetHostIP(const string& ip) { m_HostIP = ip; };
GameUI: cleanup and fix race condition * Use CThreadFastMutex instead * Rename ISurface to IDebugSurface to prevent a potential name collision with VGUI's ISurface iface if we ever add it * Fix race condition when setting CPylon::m_HostIP from materialsystem thread, this has been dispatched to the main thread * Marked 'pylon_matchmaking_hostname' FCVAR_MATERIAL_SYSTEM_THREAD as we use it in the server browser panel.
2024-01-21 23:06:26 +01:00
inline const string& GetHostIP() const { return m_HostIP; };
Client token authentication implementation The game internally obtains a auth token from Origin. On connect to a gameserver, it will send it to the masterserver. The master server will create a JWT token and send this back to the client. The client stores this token in 3 userinfo cvars (token, sig1, sig2). the sig1 and sig2 cvars are there to compensate for the truncation caused by sending the cvar, as each cvar string length could be up to 255 (byte max). The server verifies this token (the signature, timestamp, expiry); if they are valid, the has successfully authenticated and will connect.
2023-10-15 10:40:46 +02:00
fix dedi compile sets pylon language in a cvar change callback instead of accessing directly, as networksystem does not have a DEDICATED define
2023-08-17 20:22:28 +01:00
inline void SetLanguage(const char* lang) { m_Language = lang; };
GameUI: cleanup and fix race condition * Use CThreadFastMutex instead * Rename ISurface to IDebugSurface to prevent a potential name collision with VGUI's ISurface iface if we ever add it * Fix race condition when setting CPylon::m_HostIP from materialsystem thread, this has been dispatched to the main thread * Marked 'pylon_matchmaking_hostname' FCVAR_MATERIAL_SYSTEM_THREAD as we use it in the server browser panel.
2024-01-21 23:06:26 +01:00
inline const string& GetLanguage() const { return m_Language; };
fix dedi compile sets pylon language in a cvar change callback instead of accessing directly, as networksystem does not have a DEDICATED define
2023-08-17 20:22:28 +01:00
Pylon logic imporvements * Removed duplicate json parsing that was part of a PR that required a small refactor. * Only check if response buffer is empty when we are going to parse the error message (this helps finding bugs in master server, since failure to parse has an exception handler). * Log private server token and error messages to dedicated server console.
2023-02-04 19:18:18 +01:00
private:
string m_Token;
string m_ErrorMsg;
Client token authentication implementation The game internally obtains a auth token from Origin. On connect to a gameserver, it will send it to the masterserver. The master server will create a JWT token and send this back to the client. The client stores this token in 3 userinfo cvars (token, sig1, sig2). the sig1 and sig2 cvars are there to compensate for the truncation caused by sending the cvar, as each cvar string length could be up to 255 (byte max). The server verifies this token (the signature, timestamp, expiry); if they are valid, the has successfully authenticated and will connect.
2023-10-15 10:40:46 +02:00
string m_HostIP;
Pylon: fix use after free The member must contain a copy of the string, pointing it to the buffer used by the language cvar results in undefined behavior. Several cases were the string pointed to random data were reported.
2023-10-08 16:37:10 +02:00
string m_Language;
Renamed master server related stuff
2022-07-01 10:29:27 +02:00
};
Make singletons use static memory Avoid heap memory allocation and a level of indirection. This allows the compiler to optimize the program even more. No logic has been changed in this patch.
2024-01-21 21:29:23 +01:00
extern CPylon g_MasterServer;
Reference in New Issue Copy Permalink