Fix server crashing due to an invalid username (#822)
* Fix typo * Fix server crash due to an invalid username
This commit is contained in:
1 parent
1e19e2928c
commit
990a0301d8
1 file changed
+6
-13
@@ -811,12 +811,12 @@ namespace Vocaluxe.Base.Server
|
|||||||
{
|
{
|
||||||
CProfile profile = CProfiles.GetProfile(profileId);
|
CProfile profile = CProfiles.GetProfile(profileId);
|
||||||
if (profile == null)
|
if (profile == null)
|
||||||
throw new ArgumentException("Invalid profileId");
|
return false;
|
||||||
|
|
||||||
if (profile.PasswordHash == null)
|
if (profile.PasswordHash == null)
|
||||||
{
|
{
|
||||||
if (string.IsNullOrEmpty(password))
|
if (string.IsNullOrEmpty(password))
|
||||||
return true; //Allow emty passwords
|
return true; //Allow empty passwords
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -828,12 +828,12 @@ namespace Vocaluxe.Base.Server
|
|||||||
{
|
{
|
||||||
CProfile profile = CProfiles.GetProfile(profileId);
|
CProfile profile = CProfiles.GetProfile(profileId);
|
||||||
if (profile == null)
|
if (profile == null)
|
||||||
throw new ArgumentException("Invalid profileId");
|
return false;
|
||||||
|
|
||||||
if (profile.PasswordHash == null)
|
if (profile.PasswordHash == null)
|
||||||
{
|
{
|
||||||
if (hashedPassword == null)
|
if (hashedPassword == null)
|
||||||
return true; //Allow emty passwords
|
return true; //Allow empty passwords
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -848,7 +848,7 @@ namespace Vocaluxe.Base.Server
|
|||||||
throw new ArgumentException("Invalid profileId");
|
throw new ArgumentException("Invalid profileId");
|
||||||
|
|
||||||
if (profile.PasswordHash == null)
|
if (profile.PasswordHash == null)
|
||||||
throw new ArgumentException("Emty password");
|
throw new ArgumentException("Empty password");
|
||||||
|
|
||||||
return profile.PasswordSalt;
|
return profile.PasswordSalt;
|
||||||
}
|
}
|
||||||
@@ -889,14 +889,7 @@ namespace Vocaluxe.Base.Server
|
|||||||
IEnumerable<Guid> playerIds = (from p in CProfiles.GetProfiles()
|
IEnumerable<Guid> playerIds = (from p in CProfiles.GetProfiles()
|
||||||
where String.Equals(p.PlayerName, username, StringComparison.OrdinalIgnoreCase)
|
where String.Equals(p.PlayerName, username, StringComparison.OrdinalIgnoreCase)
|
||||||
select p.ID);
|
select p.ID);
|
||||||
try
|
return playerIds.FirstOrDefault();
|
||||||
{
|
|
||||||
return playerIds.First();
|
|
||||||
}
|
|
||||||
catch (InvalidOperationException)
|
|
||||||
{
|
|
||||||
throw new ArgumentException("Invalid playername");
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
private static byte[] _Hash(byte[] password, byte[] salt)
|
private static byte[] _Hash(byte[] password, byte[] salt)
|
||||||
|
|||||||
Reference in new issue
Block a user