edg-l/ddnet
1
0
Fork 0
mirror of https://github.com/ddnet/ddnet.git synced 2024-11-10 10:08:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Correctly update auth keys when using auth_remove

Browse source 
When using `auth_remove`, the key indices for the default helper, mod and admin passwords were not properly adjusted, causing the wrong passwords to be used for the username-less logins.

The key indices for connected clients were also not properly adjusted, causing the wrong identity to be shown for currently authenticated clients when using the `status` command.

Closes #6427.
This commit is contained in:
Robert Müller 2023-09-22 20:55:27 +02:00
parent 1c1961f903
commit 1d711d6cf0
3 changed files with 15 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/engine/server/authmanager.cpp
View file

@ -65,21 +65,21 @@ int CAuthManager::AddKey(const char *pIdent, const char *pPw, int AuthLevel)
return AddKeyHash(pIdent, HashPassword(pPw, aSalt), aSalt, AuthLevel); return AddKeyHash(pIdent, HashPassword(pPw, aSalt), aSalt, AuthLevel);
} }
int CAuthManager::RemoveKey(int Slot) void CAuthManager::RemoveKey(int Slot)
{ {
m_vKeys.erase(m_vKeys.begin() + Slot); m_vKeys.erase(m_vKeys.begin() + Slot);
// Update indices of default keys
for(int &Default : m_aDefault) for(int &Default : m_aDefault)
{ {
if(Default == Slot) if(Default == Slot)
{ {
Default = -1; Default = -1;
} }
else if(Default == (int)m_vKeys.size()) else if(Default > Slot)
{ {
Default = Slot; --Default;
} }
} }
return m_vKeys.size();
} }
int CAuthManager::FindKey(const char *pIdent) const int CAuthManager::FindKey(const char *pIdent) const

2
src/engine/server/authmanager.h
View file

@ -30,7 +30,7 @@ public:
void Init(); void Init();
int AddKeyHash(const char *pIdent, MD5_DIGEST Hash, const unsigned char *pSalt, int AuthLevel); int AddKeyHash(const char *pIdent, MD5_DIGEST Hash, const unsigned char *pSalt, int AuthLevel);
int AddKey(const char *pIdent, const char *pPw, int AuthLevel); int AddKey(const char *pIdent, const char *pPw, int AuthLevel);
int RemoveKey(int Slot); // Returns the old key slot that is now in the named one. void RemoveKey(int Slot);
int FindKey(const char *pIdent) const; int FindKey(const char *pIdent) const;
bool CheckKey(int Slot, const char *pPw) const; bool CheckKey(int Slot, const char *pPw) const;
int DefaultKey(int AuthLevel) const; int DefaultKey(int AuthLevel) const;

16
src/engine/server/server.cpp
View file

@ -3107,16 +3107,20 @@ static int GetAuthLevel(const char *pLevel)
void CServer::AuthRemoveKey(int KeySlot) void CServer::AuthRemoveKey(int KeySlot)
{ {
int NewKeySlot = KeySlot; m_AuthManager.RemoveKey(KeySlot);
int OldKeySlot = m_AuthManager.RemoveKey(KeySlot);
LogoutKey(KeySlot, "key removal"); LogoutKey(KeySlot, "key removal");
// Update indices. // Update indices.
if(OldKeySlot != NewKeySlot) for(auto &Client : m_aClients)
{ {
for(auto &Client : m_aClients) if(Client.m_AuthKey == KeySlot)
if(Client.m_AuthKey == OldKeySlot) {
Client.m_AuthKey = NewKeySlot; Client.m_AuthKey = -1;
}
else if(Client.m_AuthKey > KeySlot)
{
--Client.m_AuthKey;
}
} }
} }