themaster1970sf/TShock
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity Actions

Added null check to attemptlogin.

Browse source
This commit is contained in:
high 2011-08-07 02:52:20 -04:00
parent 1f4792b71c
commit 6f472e92a3
1 changed files with 9 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

15
TShockAPI/Commands.cs
View file

@ -317,7 +317,11 @@ namespace TShockAPI
{ {
string encrPass = Tools.HashPassword(args.Parameters[1]); string encrPass = Tools.HashPassword(args.Parameters[1]);
var user = TShock.Users.GetUserByName(args.Parameters[0]); var user = TShock.Users.GetUserByName(args.Parameters[0]);
if (user.Password.ToUpper() == encrPass.ToUpper()) if (user == null)
{
args.Player.SendMessage("User by that name does not exist");
}
else if (user.Password.ToUpper() == encrPass.ToUpper())
{ {
args.Player.Group = Tools.GetGroup(user.Group); args.Player.Group = Tools.GetGroup(user.Group);
args.Player.UserAccountName = args.Parameters[0]; args.Player.UserAccountName = args.Parameters[0];
@ -325,19 +329,18 @@ namespace TShockAPI
args.Player.IsLoggedIn = true; args.Player.IsLoggedIn = true;
args.Player.SendMessage("Authenticated as " + args.Parameters[0] + " successfully.", Color.LimeGreen); args.Player.SendMessage("Authenticated as " + args.Parameters[0] + " successfully.", Color.LimeGreen);
Log.ConsoleInfo(args.Player.Name + " authenticated successfully as user: " + args.Parameters[0]); Log.ConsoleInfo(args.Player.Name + " authenticated successfully as user: " + args.Parameters[0]);
return;
} }
else else
{ {
args.Player.SendMessage("Incorrect password", Color.LimeGreen);
Log.Warn(args.Player.IP + " failed to authenticate as user: " + args.Parameters[0]); Log.Warn(args.Player.IP + " failed to authenticate as user: " + args.Parameters[0]);
args.Player.LoginAttempts++; args.Player.LoginAttempts++;
return;
} }
} }
catch (Exception) catch (Exception ex)
{ {
args.Player.SendMessage("There was an error processing your request. Maybe your account doesn't exist?", Color.Red); args.Player.SendMessage("There was an error processing your request.", Color.Red);
return; Log.Error(ex.ToString());
} }
} }