vlad.os/LuaCsForBarotraumaEP
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Removed per-user password from whitelist

Browse Source
This commit is contained in:
juanjp600
2016-09-03 17:18:44 -03:00
parent ef2b0d8721
commit efa8b4da51
3 changed files with 1454 additions and 1480 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
Subsurface/Source/Networking/GameServerLogin.cs
View File

@@ -57,7 +57,6 @@ namespace Barotrauma.Networking
private void CheckAuthentication(NetIncomingMessage inc)
{
string whitelistPw = "";
var unauthenticatedClient = unauthenticatedClients.Find(uc => uc.Connection == inc.SenderConnection);
if (unauthenticatedClient != null)
{
@@ -70,26 +69,10 @@ namespace Barotrauma.Networking
inc.Decrypt(algo);
string rdPw = inc.ReadString();
if (!whitelist.enabled)
if (rdPw != saltedPw)
{
if (rdPw != saltedPw)
{
inc.SenderConnection.Disconnect("Wrong password!");
return;
}
}
else
{
WhiteListedPlayer wlp = whitelist.WhiteListedPlayers.Find(x => x.GetHashedPassword(unauthenticatedClient.Nonce) == saltedPw);
if (wlp==null)
{
inc.SenderConnection.Disconnect("Wrong password or name!");
return;
}
else
{
whitelistPw = wlp.Password;
}
inc.SenderConnection.Disconnect("Wrong password!");
return;
}
}
else
@@ -160,9 +143,15 @@ namespace Barotrauma.Networking
inc.SenderConnection.Disconnect("The name ''" + name + "'' is already in use. Please choose another name.");
DebugConsole.NewMessage(name + " couldn't join the server (name already in use)", Color.Red);
return;
}
}
#endif
if (!whitelist.IsWhiteListed(name, inc.SenderConnection.RemoteEndPoint.Address.ToString()))
{
inc.SenderConnection.Disconnect("You're not in this server's whitelist.");
DebugConsole.NewMessage(name + " couldn't join the server (not in whitelist)", Color.Red);
return;
}
//existing user re-joining
if (userID > 0)