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

Fix login handling to only allow correct passwords if a password is given.

Browse source
This commit is contained in:
Zack Piispanen 2013-10-24 13:18:21 -04:00
parent 666ea54e1e
commit fa097e61e3
1 changed files with 20 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

28
TShockAPI/Commands.cs
View file

@ -676,12 +676,13 @@ namespace TShockAPI
User user = TShock.Users.GetUserByName(args.Player.Name); User user = TShock.Users.GetUserByName(args.Player.Name);
string encrPass = ""; string encrPass = "";
bool usingUUID = false;
if (args.Parameters.Count == 0) if (args.Parameters.Count == 0 && !TShock.Config.DisableUUIDLogin)
{ {
if (Hooks.PlayerHooks.OnPlayerPreLogin(args.Player, args.Player.Name, "")) if (Hooks.PlayerHooks.OnPlayerPreLogin(args.Player, args.Player.Name, ""))
return; return;
user = TShock.Users.GetUserByName(args.Player.Name); user = TShock.Users.GetUserByName(args.Player.Name);
usingUUID = true;
} }
else if (args.Parameters.Count == 1) else if (args.Parameters.Count == 1)
{ {
@ -705,7 +706,9 @@ namespace TShockAPI
} }
else else
{ {
args.Player.SendErrorMessage(String.Format("Syntax: /login{0} [password]", TShock.Config.AllowLoginAnyUsername ? " [username]" : " ")); args.Player.SendErrorMessage("Syntax: /login - Logs in using your UUID and character name");
args.Player.SendErrorMessage(" /login <password> - Logs in using your password and character name");
args.Player.SendErrorMessage(" /login <username> <password> - Logs in using your username and password");
args.Player.SendErrorMessage("If you forgot your password, there is no way to recover it."); args.Player.SendErrorMessage("If you forgot your password, there is no way to recover it.");
return; return;
} }
@ -715,7 +718,9 @@ namespace TShockAPI
{ {
args.Player.SendErrorMessage("A user by that name does not exist."); args.Player.SendErrorMessage("A user by that name does not exist.");
} }
else if (user.Password.ToUpper() == encrPass.ToUpper() || (user.UUID == args.Player.UUID && !TShock.Config.DisableUUIDLogin && !String.IsNullOrWhiteSpace(args.Player.UUID))) else if (user.Password.ToUpper() == encrPass.ToUpper() ||
(usingUUID && user.UUID == args.Player.UUID && !TShock.Config.DisableUUIDLogin &&
!String.IsNullOrWhiteSpace(args.Player.UUID)))
{ {
args.Player.PlayerData = TShock.CharacterDB.GetPlayerData(args.Player, TShock.Users.GetUserID(user.Name)); args.Player.PlayerData = TShock.CharacterDB.GetPlayerData(args.Player, TShock.Users.GetUserID(user.Name));
@ -738,7 +743,7 @@ namespace TShockAPI
args.Player.IgnoreActionsForDisabledArmor = "none"; args.Player.IgnoreActionsForDisabledArmor = "none";
args.Player.Group = group; args.Player.Group = group;
args.Player.tempGroup = null; args.Player.tempGroup = null;
args.Player.UserAccountName = user.Name; args.Player.UserAccountName = user.Name;
args.Player.UserID = TShock.Users.GetUserID(args.Player.UserAccountName); args.Player.UserID = TShock.Users.GetUserID(args.Player.UserAccountName);
args.Player.IsLoggedIn = true; args.Player.IsLoggedIn = true;
@ -757,18 +762,25 @@ namespace TShockAPI
if (TShock.RememberedPos.GetLeavePos(args.Player.Name, args.Player.IP) != Vector2.Zero) if (TShock.RememberedPos.GetLeavePos(args.Player.Name, args.Player.IP) != Vector2.Zero)
{ {
Vector2 pos = TShock.RememberedPos.GetLeavePos(args.Player.Name, args.Player.IP); Vector2 pos = TShock.RememberedPos.GetLeavePos(args.Player.Name, args.Player.IP);
args.Player.Teleport((int)pos.X*16, (int)pos.Y *16 ); args.Player.Teleport((int) pos.X*16, (int) pos.Y*16);
} }
args.Player.LoginHarassed = false; args.Player.LoginHarassed = false;
} }
TShock.Users.SetUserUUID(user, args.Player.UUID); TShock.Users.SetUserUUID(user, args.Player.UUID);
Hooks.PlayerHooks.OnPlayerPostLogin(args.Player); Hooks.PlayerHooks.OnPlayerPostLogin(args.Player);
} }
else else
{ {
args.Player.SendErrorMessage("Incorrect password."); if (usingUUID && !TShock.Config.DisableUUIDLogin)
{
args.Player.SendErrorMessage("UUID does not match this character!");
}
else
{
args.Player.SendErrorMessage("Invalid password!");
}
Log.Warn(args.Player.IP + " failed to authenticate as user: " + user.Name + "."); Log.Warn(args.Player.IP + " failed to authenticate as user: " + user.Name + ".");
args.Player.LoginAttempts++; args.Player.LoginAttempts++;
} }