BRNSystems/minetest
1
0
Fork 0
forked from Mirrorlandia_minetest/minetest
Code Pull Requests 1 Activity

Fix race condition in registration leading to duplicate create_auth calls

Browse Source
This commit is contained in:
sfan5 2022-04-27 19:00:49 +02:00
parent 0d91ef78dd
commit 391eec9ee7
1 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/network/serverpackethandler.cpp
View File

@ -1495,8 +1495,19 @@ void Server::handleCommand_FirstSrp(NetworkPacket* pkt)
} }
std::string initial_ver_key; std::string initial_ver_key;
initial_ver_key = encode_srp_verifier(verification_key, salt); initial_ver_key = encode_srp_verifier(verification_key, salt);
// It is possible for multiple connections to get this far with the same
// player name. In the end only one player with a given name will be emerged
// (see Server::StateTwoClientInit) but we still have to be careful here.
if (m_script->getAuth(playername, nullptr, nullptr)) {
// Another client beat us to it
actionstream << "Server: Client from " << addr_s
<< " tried to register " << playername << " a second time."
<< std::endl;
DenyAccess(peer_id, SERVER_ACCESSDENIED_ALREADY_CONNECTED);
return;
}
m_script->createAuth(playername, initial_ver_key); m_script->createAuth(playername, initial_ver_key);
m_script->on_authplayer(playername, addr_s, true); m_script->on_authplayer(playername, addr_s, true);