dallasgroot/0ad
1
0
Fork 0
mirror of https://gitea.wildfiregames.com/0ad/0ad synced 2026-06-16 05:13:58 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Pass the controllerSecret to the CNet* constructor

Browse source 
It wasn't clear when to call `SetControllerSecret` now it can't be done
wrong. Also the mutex has to be locked less often.
This commit is contained in:
phosit 2026-03-02 19:22:44 +01:00
parent d33fb147bc
commit dbe89d10ae
No known key found for this signature in database
GPG key ID: C9430B600671C268
5 changed files with 17 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
source/network/NetClient.cpp
View file

@ -67,13 +67,14 @@ constexpr u32 NETWORK_BAD_PING = DEFAULT_TURN_LENGTH * COMMAND_DELAY_MP / 2;
CNetClient *g_NetClient = NULL;
CNetClient::CNetClient(CGame* game, const CStrW& username, const CStr& hostJID,
std::string hashedPassword) :
std::string hashedPassword, std::string controllerSecret) :
m_UserName{username},
m_HostJID{hostJID},
m_Game{game},
// Hash on top with the user's name, to make sure not all
// hashing data is in control of the host.
m_Password{HashCryptographically(std::move(hashedPassword), m_UserName.ToUTF8())}
m_Password{HashCryptographically(std::move(hashedPassword), m_UserName.ToUTF8())},
m_ControllerSecret{std::move(controllerSecret)}
{
m_Game->SetTurnManager(NULL); // delete the old local turn manager so we don't accidentally use it
@ -146,11 +147,6 @@ CNetClient::~CNetClient()
DestroyConnection();
}
void CNetClient::SetControllerSecret(const std::string& secret)
{
m_ControllerSecret = secret;
}
bool CNetClient::SetupConnection(ENetHost* enetClient)
{

4
source/network/NetClient.h
View file

@ -79,12 +79,10 @@ public:
* The JID of the host is needed for the secure lobby authentication.
*/
CNetClient(CGame* game, const CStrW& username = L"anonymous", const CStr& hostJID = {},
std::string hashedPassword = {});
std::string hashedPassword = {}, std::string controllerSecret = {});
virtual ~CNetClient();
void SetControllerSecret(const std::string& secret);
bool IsController() const { return m_IsController; }
/**

21
source/network/NetServer.cpp
View file

@ -112,9 +112,10 @@ static CStr DebugName(CNetServerSession* session)
*/
CNetServerWorker::CNetServerWorker(const bool continueSavedGame, const bool useLobbyAuth,
std::string password) :
std::string password, std::string controllerSecret) :
m_ContinuesSavedGame{continueSavedGame},
m_LobbyAuth{useLobbyAuth},
m_ControllerSecret{std::move(controllerSecret)},
m_Password{std::move(password)}
{
}
@ -155,12 +156,6 @@ CNetServerWorker::~CNetServerWorker()
}
void CNetServerWorker::SetControllerSecret(const std::string& secret)
{
m_ControllerSecret = secret;
}
bool CNetServerWorker::CheckPassword(const std::string& password, const std::string& salt) const
{
return HashCryptographically(m_Password, salt) == password;
@ -1689,8 +1684,10 @@ void CNetServerWorker::SendHolePunchingMessage(const CStr& ipStr, u16 port)
CNetServer::CNetServer(const bool continueSavedGame, const bool useLobbyAuth, std::string password) :
m_Worker{new CNetServerWorker{continueSavedGame, useLobbyAuth, password}},
CNetServer::CNetServer(const bool continueSavedGame, const bool useLobbyAuth, std::string password,
std::string controllerSecret) :
m_Worker{new CNetServerWorker{continueSavedGame, useLobbyAuth, password,
std::move(controllerSecret)}},
m_LobbyAuth{useLobbyAuth},
m_Password{std::move(password)}
{
@ -1759,12 +1756,6 @@ bool CNetServer::IsBanned(const std::string& username) const
return it != m_FailedAttempts.end() && it->second >= FAILED_PASSWORD_TRIES_BEFORE_BAN;
}
void CNetServer::SetControllerSecret(const std::string& secret)
{
std::lock_guard<std::mutex> lock(m_Worker->m_WorkerMutex);
m_Worker->SetControllerSecret(secret);
}
void CNetServer::StartGame()
{
std::lock_guard<std::mutex> lock(m_Worker->m_WorkerMutex);

10
source/network/NetServer.h
View file

@ -112,7 +112,8 @@ class CNetServer
{
NONCOPYABLE(CNetServer);
public:
CNetServer(const bool isSavedGame, const bool useLobbyAuth = false, std::string password = {});
CNetServer(const bool isSavedGame, const bool useLobbyAuth = false, std::string password = {},
std::string controllerSecret = {});
~CNetServer();
/**
@ -179,8 +180,6 @@ public:
*/
bool IsBanned(const std::string& username) const;
void SetControllerSecret(const std::string& secret);
private:
CNetServerWorker* m_Worker;
const bool m_LobbyAuth;
@ -228,13 +227,12 @@ public:
private:
friend class CNetServer;
CNetServerWorker(const bool continuesSavedGame, const bool useLobbyAuth, std::string password);
CNetServerWorker(const bool continuesSavedGame, const bool useLobbyAuth, std::string password,
std::string controllerSecret);
~CNetServerWorker();
bool CheckPassword(const std::string& password, const std::string& salt) const;
void SetControllerSecret(const std::string& secret);
/**
* Begin listening for network connections.
* @return true on success, false on error (e.g. port already in use)

8
source/network/scripting/JSInterface_Network.cpp
View file

@ -105,7 +105,8 @@ void StartNetworkHost(const CStrW& playerName, const u16 serverPort, const CStr&
std::string hashedPassword = hasLobby ?
HashCryptographically(password, hostJID + password + PS_SERIALIZATION_VERSION) : "";
g_NetServer = new CNetServer(continueSavedGame, hasLobby, hashedPassword);
const std::string secret = ps_generate_guid();
g_NetServer = new CNetServer(continueSavedGame, hasLobby, hashedPassword, secret);
if (!g_NetServer->SetupConnection(serverPort))
{
@ -122,13 +123,10 @@ void StartNetworkHost(const CStrW& playerName, const u16 serverPort, const CStr&
}
// Generate a secret to identify the host client.
std::string secret = ps_generate_guid();
g_NetServer->SetControllerSecret(secret);
g_Game = new CGame(storeReplay);
g_NetClient = new CNetClient(g_Game, playerName, hostJID, hashedPassword);
g_NetClient = new CNetClient(g_Game, playerName, hostJID, hashedPassword, secret);
g_NetClient->SetupServerData("127.0.0.1", serverPort);
g_NetClient->SetControllerSecret(secret);
if (!g_NetClient->SetupConnection(nullptr))
{