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

"Brace" for impact with these Important changes

Browse source 
Apparently the convention is UpperCamel for private functions too.
Fixed a stray brace that caused people to brace for a sudden evisceration of limbs.
Use Int32.Parse instead of Convert.ToInt32, because Microsoft exposes public
APIs they say not to use. 👏
This commit is contained in:
Lucas Nicodemus 2015-04-13 23:24:37 -06:00
parent b91f0ff7b7
commit b34c00107c
2 changed files with 14 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

3
TShockAPI/Commands.cs
View file

@ -994,7 +994,8 @@ namespace TShockAPI
var user = new User(); var user = new User();
user.Name = args.Parameters[1]; user.Name = args.Parameters[1];
try { try
{
user.CreateBCryptHash(args.Parameters[2]); user.CreateBCryptHash(args.Parameters[2]);
} }
catch (ArgumentOutOfRangeException) catch (ArgumentOutOfRangeException)

17
TShockAPI/DB/UserManager.cs
View file

@ -374,7 +374,7 @@ namespace TShockAPI.DB
/// <summary>Upgrades a password to BCrypt, from an insecure hashing algorithm.</summary> /// <summary>Upgrades a password to BCrypt, from an insecure hashing algorithm.</summary>
/// <param name="password">string password - the raw user password (unhashed) to upgrade</param> /// <param name="password">string password - the raw user password (unhashed) to upgrade</param>
protected internal void upgradePasswordToBCrypt(string password) protected internal void UpgradePasswordToBCrypt(string password)
{ {
// Save the old password, in the event that we have to revert changes. // Save the old password, in the event that we have to revert changes.
string oldpassword = this.Password; string oldpassword = this.Password;
@ -403,10 +403,17 @@ namespace TShockAPI.DB
/// <summary>Upgrades a password to the highest work factor available in the config.</summary> /// <summary>Upgrades a password to the highest work factor available in the config.</summary>
/// <param name="password">string password - the raw user password (unhashed) to upgrade</param> /// <param name="password">string password - the raw user password (unhashed) to upgrade</param>
protected internal void upgradePasswordWorkFactor(string password) protected internal void UpgradePasswordWorkFactor(string password)
{ {
// If the destination work factor is not greater, we won't upgrade it or re-hash it // If the destination work factor is not greater, we won't upgrade it or re-hash it
int currentWorkFactor = Convert.ToInt32((this.Password.Split('$')[2])); try
{
int currentWorkFactor = Int32.Parse((this.Password.Split('$')[2]));
}
catch (FormatException)
{
TShock.Log.ConsoleError("Warning: Not upgrading work factor because bcrypt hash in an invalid format.");
}
if (currentWorkFactor < TShock.Config.BCryptWorkFactor) if (currentWorkFactor < TShock.Config.BCryptWorkFactor)
{ {
@ -479,7 +486,7 @@ namespace TShockAPI.DB
/// </summary> /// </summary>
/// <param name="bytes">bytes to hash</param> /// <param name="bytes">bytes to hash</param>
/// <returns>string hash</returns> /// <returns>string hash</returns>
protected internal string hashPassword(byte[] bytes) protected internal string HashPassword(byte[] bytes)
{ {
if (bytes == null) if (bytes == null)
throw new NullReferenceException("bytes"); throw new NullReferenceException("bytes");
@ -499,7 +506,7 @@ namespace TShockAPI.DB
/// </summary> /// </summary>
/// <param name="password">string to hash</param> /// <param name="password">string to hash</param>
/// <returns>string hash</returns> /// <returns>string hash</returns>
protected internal string hashPassword(string password) protected internal string HashPassword(string password)
{ {
if (string.IsNullOrEmpty(password) || password == "non-existant password") if (string.IsNullOrEmpty(password) || password == "non-existant password")
return null; return null;