yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Removed UseLegacyEncoding option from config

Browse Source
This commit is contained in:
Bjarke Berg
2020-03-19 19:09:33 +01:00
parent dd012db594
commit 7c011e5b57
7 changed files with 3 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/Umbraco.Configuration/Models/MemberPasswordConfigurationSettings.cs
View File

@@ -29,9 +29,6 @@ namespace Umbraco.Configuration.Models
public bool RequireUppercase =>
_configuration.GetValue(Prefix + "RequireUppercase", false);
public bool UseLegacyEncoding =>
_configuration.GetValue(Prefix + "UseLegacyEncoding", false);
public string HashAlgorithmType =>
_configuration.GetValue(Prefix + "HashAlgorithmType", "HMACSHA256");

3
src/Umbraco.Configuration/Models/UserPasswordConfigurationSettings.cs
View File

@@ -27,9 +27,6 @@ namespace Umbraco.Configuration.Models
public bool RequireUppercase =>
_configuration.GetValue(Prefix + "RequireUppercase", false);
public bool UseLegacyEncoding =>
_configuration.GetValue(Prefix + "UseLegacyEncoding", false);
public string HashAlgorithmType =>
_configuration.GetValue(Prefix + "HashAlgorithmType", "HMACSHA256");

4
src/Umbraco.Core/Configuration/IPasswordConfiguration.cs
View File

@@ -6,13 +6,11 @@
/// </summary>
public interface IPasswordConfiguration
{
int RequiredLength { get; }
int RequiredLength { get; }
bool RequireNonLetterOrDigit { get; }
bool RequireDigit { get; }
bool RequireLowercase { get; }
bool RequireUppercase { get; }
bool UseLegacyEncoding { get; }
string HashAlgorithmType { get; }
// TODO: This doesn't really belong here

3
src/Umbraco.Core/Configuration/PasswordConfiguration.cs
View File

@@ -17,7 +17,6 @@ namespace Umbraco.Core.Configuration
RequireDigit = configSettings.RequireDigit;
RequireLowercase = configSettings.RequireLowercase;
RequireUppercase = configSettings.RequireUppercase;
UseLegacyEncoding = configSettings.UseLegacyEncoding;
HashAlgorithmType = configSettings.HashAlgorithmType;
MaxFailedAccessAttemptsBeforeLockout = configSettings.MaxFailedAccessAttemptsBeforeLockout;
}
@@ -32,8 +31,6 @@ namespace Umbraco.Core.Configuration
public bool RequireUppercase { get; }
public bool UseLegacyEncoding { get; }
public string HashAlgorithmType { get; }
public int MaxFailedAccessAttemptsBeforeLockout { get; }

12
src/Umbraco.Tests/Configurations/UmbracoSettings/SecurityElementTests.cs
View File

@@ -66,12 +66,6 @@ namespace Umbraco.Tests.Configurations.UmbracoSettings
Assert.IsTrue(UserPasswordConfiguration.RequireUppercase == false);
}
[Test]
public void UserPasswordConfiguration_UseLegacyEncoding()
{
Assert.IsTrue(UserPasswordConfiguration.UseLegacyEncoding == false);
}
[Test]
public void UserPasswordConfiguration_HashAlgorithmType()
{
@@ -114,12 +108,6 @@ namespace Umbraco.Tests.Configurations.UmbracoSettings
Assert.IsTrue(MemberPasswordConfiguration.RequireUppercase == false);
}
[Test]
public void MemberPasswordConfiguration_UseLegacyEncoding()
{
Assert.IsTrue(MemberPasswordConfiguration.UseLegacyEncoding == false);
}
[Test]
public void MemberPasswordConfiguration_HashAlgorithmType()
{

8
src/Umbraco.Tests/Security/PasswordSecurityTests.cs
View File

@@ -14,14 +14,6 @@ namespace Umbraco.Tests.Security
[TestFixture]
public class PasswordSecurityTests
{
[Test]
public void Get_Hash_Algorithm_Legacy()
{
var passwordSecurity = new PasswordSecurity(Mock.Of<IPasswordConfiguration>(x => x.UseLegacyEncoding == true && x.HashAlgorithmType == "HMACSHA256"));
var alg = passwordSecurity.GetHashAlgorithm("blah");
Assert.IsTrue(alg is HMACSHA1);
}
[Test]
public void Get_Hash_Algorithm_Default()
{

30
src/Umbraco.Web/Security/PasswordSecurity.cs
View File

@@ -72,11 +72,6 @@ namespace Umbraco.Core.Security
/// <returns></returns>
public string FormatPasswordForStorage(string hashedPassword, string salt)
{
if (PasswordConfiguration.UseLegacyEncoding)
{
return hashedPassword;
}
return salt + hashedPassword;
}
@@ -88,13 +83,6 @@ namespace Umbraco.Core.Security
/// <returns></returns>
public string HashPassword(string pass, string salt)
{
//if we are doing it the old way
if (PasswordConfiguration.UseLegacyEncoding)
{
return LegacyEncodePassword(pass);
}
//This is the correct way to implement this (as per the sql membership provider)
var bytes = Encoding.Unicode.GetBytes(pass);
@@ -183,11 +171,6 @@ namespace Umbraco.Core.Security
public string ParseStoredHashPassword(string storedString, out string salt)
{
if (string.IsNullOrWhiteSpace(storedString)) throw new ArgumentException("Value cannot be null or whitespace.", nameof(storedString));
if (PasswordConfiguration.UseLegacyEncoding)
{
salt = string.Empty;
return storedString;
}
var saltLen = GenerateSalt();
salt = storedString.Substring(0, saltLen.Length);
@@ -208,15 +191,6 @@ namespace Umbraco.Core.Security
/// <returns></returns>
public HashAlgorithm GetHashAlgorithm(string password)
{
if (PasswordConfiguration.UseLegacyEncoding)
{
return new HMACSHA1
{
//the legacy salt was actually the password :(
Key = Encoding.Unicode.GetBytes(password)
};
}
if (PasswordConfiguration.HashAlgorithmType.IsNullOrWhiteSpace())
throw new InvalidOperationException("No hash algorithm type specified");
@@ -239,9 +213,9 @@ namespace Umbraco.Core.Security
return encodedPassword;
}
}
}