lsm/Orchard
1
0
Fork 0
mirror of https://github.com/OrchardCMS/Orchard.git synced 2026-02-09 09:16:41 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge

Browse Source
This commit is contained in:
Suha Can
2010-06-04 12:35:16 -07:00
parent 74fb2c2ffd de4aacc5bc
commit 9fa486a559
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/Orchard.Web/Modules/Orchard.Users/Models/UserRecord.cs
View File

@@ -9,6 +9,7 @@ namespace Orchard.Users.Models {
public virtual string Password { get; set; } public virtual string Password { get; set; }
public virtual MembershipPasswordFormat PasswordFormat { get; set; } public virtual MembershipPasswordFormat PasswordFormat { get; set; }
public virtual string HashAlgorithm { get; set; }
public virtual string PasswordSalt { get; set; } public virtual string PasswordSalt { get; set; }
} }
} }

5
src/Orchard.Web/Modules/Orchard.Users/Services/MembershipService.cs
View File

@@ -39,6 +39,7 @@ namespace Orchard.Users.Services {
init.Record.UserName = createUserParams.Username; init.Record.UserName = createUserParams.Username;
init.Record.Email = createUserParams.Email; init.Record.Email = createUserParams.Email;
init.Record.NormalizedUserName = createUserParams.Username.ToLower(); init.Record.NormalizedUserName = createUserParams.Username.ToLower();
init.Record.HashAlgorithm = "SHA1";
SetPassword(init.Record, createUserParams.Password); SetPassword(init.Record, createUserParams.Password);
}); });
} }
@@ -128,7 +129,7 @@ namespace Orchard.Users.Services {
var combinedBytes = saltBytes.Concat(passwordBytes).ToArray(); var combinedBytes = saltBytes.Concat(passwordBytes).ToArray();
var hashAlgorithm = HashAlgorithm.Create("SHA1"); var hashAlgorithm = HashAlgorithm.Create(record.HashAlgorithm);
var hashBytes = hashAlgorithm.ComputeHash(combinedBytes); var hashBytes = hashAlgorithm.ComputeHash(combinedBytes);
record.PasswordFormat = MembershipPasswordFormat.Hashed; record.PasswordFormat = MembershipPasswordFormat.Hashed;
@@ -144,7 +145,7 @@ namespace Orchard.Users.Services {
var combinedBytes = saltBytes.Concat(passwordBytes).ToArray(); var combinedBytes = saltBytes.Concat(passwordBytes).ToArray();
var hashAlgorithm = HashAlgorithm.Create("SHA1"); var hashAlgorithm = HashAlgorithm.Create(record.HashAlgorithm);
var hashBytes = hashAlgorithm.ComputeHash(combinedBytes); var hashBytes = hashAlgorithm.ComputeHash(combinedBytes);
return record.Password == Convert.ToBase64String(hashBytes); return record.Password == Convert.ToBase64String(hashBytes);