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

Change errors in BCrypt to be more clear for users to fix

Browse source 
Change doc verbiage to refer to what these actually do
This commit is contained in:
Lucas Nicodemus 2015-04-13 12:46:10 -06:00
parent 6cef3c6eb3
commit 1f690440d0
1 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

14
TShockAPI/DB/UserManager.cs
View file

@ -376,7 +376,7 @@ namespace TShockAPI.DB
try { try {
this.Password = BCrypt.Net.BCrypt.HashPassword(password, TShock.Config.BCryptWorkFactor); this.Password = BCrypt.Net.BCrypt.HashPassword(password, TShock.Config.BCryptWorkFactor);
} catch (ArgumentOutOfRangeException) { } catch (ArgumentOutOfRangeException) {
TShock.Log.ConsoleError("Invalid BCrypt work factor! Upgrading user password to BCrypt using default work factor."); TShock.Log.ConsoleError("Invalid BCrypt work factor in config file! Upgrading user password to BCrypt using default work factor.");
this.Password = BCrypt.Net.BCrypt.HashPassword(password); this.Password = BCrypt.Net.BCrypt.HashPassword(password);
} }
@ -398,7 +398,7 @@ namespace TShockAPI.DB
try { try {
this.Password = BCrypt.Net.BCrypt.HashPassword(password, TShock.Config.BCryptWorkFactor); this.Password = BCrypt.Net.BCrypt.HashPassword(password, TShock.Config.BCryptWorkFactor);
} catch (ArgumentOutOfRangeException) { } catch (ArgumentOutOfRangeException) {
TShock.Log.ConsoleError("Invalid BCrypt work factor! Refusing to change work-factor on exsting password."); TShock.Log.ConsoleError("Invalid BCrypt work factor in config file! Refusing to change work-factor on exsting password.");
} }
try { try {
@ -415,7 +415,7 @@ namespace TShockAPI.DB
try { try {
this.Password = BCrypt.Net.BCrypt.HashPassword(password, TShock.Config.BCryptWorkFactor); this.Password = BCrypt.Net.BCrypt.HashPassword(password, TShock.Config.BCryptWorkFactor);
} catch (ArgumentOutOfRangeException) { } catch (ArgumentOutOfRangeException) {
TShock.Log.ConsoleError("Invalid BCrypt work factor! Creating new hash using default work factor."); TShock.Log.ConsoleError("Invalid BCrypt work factor in config file! Creating new hash using default work factor.");
this.Password = BCrypt.Net.BCrypt.HashPassword(password); this.Password = BCrypt.Net.BCrypt.HashPassword(password);
} }
} }
@ -434,10 +434,10 @@ namespace TShockAPI.DB
}; };
/// <summary> /// <summary>
/// Returns a Sha256 string for a given string /// Returns a hashed string for a given string based on the config file's hash algo
/// </summary> /// </summary>
/// <param name="bytes">bytes to hash</param> /// <param name="bytes">bytes to hash</param>
/// <returns>string sha256</returns> /// <returns>string hash</returns>
internal string hashPassword(byte[] bytes) internal string hashPassword(byte[] bytes)
{ {
if (bytes == null) if (bytes == null)
@ -454,10 +454,10 @@ namespace TShockAPI.DB
} }
/// <summary> /// <summary>
/// Returns a hashed password string for a given string /// Returns a hashed string for a given string based on the config file's hash algo
/// </summary> /// </summary>
/// <param name="password">string to hash</param> /// <param name="password">string to hash</param>
/// <returns>string sha256</returns> /// <returns>string hash</returns>
internal string hashPassword(string password) internal string hashPassword(string password)
{ {
if (string.IsNullOrEmpty(password) || password == "non-existant password") if (string.IsNullOrEmpty(password) || password == "non-existant password")