From de4aacc5bcc7782d7bb515ca432db7713f71315e Mon Sep 17 00:00:00 2001 From: Andrew Ma Date: Sat, 24 Apr 2010 17:01:11 -0700 Subject: [PATCH 1/4] Issue #16411. Adding support for additional Hash algorithms specified by user in the UserRecord. --- src/Orchard.Web/Modules/Orchard.Users/Models/UserRecord.cs | 1 + .../Modules/Orchard.Users/Services/MembershipService.cs | 5 +++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/Orchard.Web/Modules/Orchard.Users/Models/UserRecord.cs b/src/Orchard.Web/Modules/Orchard.Users/Models/UserRecord.cs index dbb9a6039..3d3c7ec46 100644 --- a/src/Orchard.Web/Modules/Orchard.Users/Models/UserRecord.cs +++ b/src/Orchard.Web/Modules/Orchard.Users/Models/UserRecord.cs @@ -9,6 +9,7 @@ namespace Orchard.Users.Models { public virtual string Password { get; set; } public virtual MembershipPasswordFormat PasswordFormat { get; set; } + public virtual string HashAlgorithm { get; set; } public virtual string PasswordSalt { get; set; } } } \ No newline at end of file diff --git a/src/Orchard.Web/Modules/Orchard.Users/Services/MembershipService.cs b/src/Orchard.Web/Modules/Orchard.Users/Services/MembershipService.cs index 94eb85f91..a504c88d3 100644 --- a/src/Orchard.Web/Modules/Orchard.Users/Services/MembershipService.cs +++ b/src/Orchard.Web/Modules/Orchard.Users/Services/MembershipService.cs @@ -39,6 +39,7 @@ namespace Orchard.Users.Services { init.Record.UserName = createUserParams.Username; init.Record.Email = createUserParams.Email; init.Record.NormalizedUserName = createUserParams.Username.ToLower(); + init.Record.HashAlgorithm = "SHA1"; SetPassword(init.Record, createUserParams.Password); }); } @@ -124,7 +125,7 @@ namespace Orchard.Users.Services { var combinedBytes = saltBytes.Concat(passwordBytes).ToArray(); - var hashAlgorithm = HashAlgorithm.Create("SHA1"); + var hashAlgorithm = HashAlgorithm.Create(record.HashAlgorithm); var hashBytes = hashAlgorithm.ComputeHash(combinedBytes); record.PasswordFormat = MembershipPasswordFormat.Hashed; @@ -140,7 +141,7 @@ namespace Orchard.Users.Services { var combinedBytes = saltBytes.Concat(passwordBytes).ToArray(); - var hashAlgorithm = HashAlgorithm.Create("SHA1"); + var hashAlgorithm = HashAlgorithm.Create(record.HashAlgorithm); var hashBytes = hashAlgorithm.ComputeHash(combinedBytes); return record.Password == Convert.ToBase64String(hashBytes); From b8620cd49ced8a3dc51aff52e7c425c105d01140 Mon Sep 17 00:00:00 2001 From: Andrew Ma Date: Sun, 25 Apr 2010 21:18:59 -0700 Subject: [PATCH 2/4] Fixing spelling mistake in BlogCOntroller.Rsd --- .../Modules/Orchard.Blogs/Controllers/BlogController.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Orchard.Web/Modules/Orchard.Blogs/Controllers/BlogController.cs b/src/Orchard.Web/Modules/Orchard.Blogs/Controllers/BlogController.cs index ed0a60822..c0aad6773 100644 --- a/src/Orchard.Web/Modules/Orchard.Blogs/Controllers/BlogController.cs +++ b/src/Orchard.Web/Modules/Orchard.Blogs/Controllers/BlogController.cs @@ -98,7 +98,7 @@ namespace Orchard.Blogs.Controllers { var options = new XElement( XName.Get("service", manifestUri), - new XElement(XName.Get("engineName", manifestUri), "Orchar CMS"), + new XElement(XName.Get("engineName", manifestUri), "Orchard CMS"), new XElement(XName.Get("engineLink", manifestUri), "http://orchardproject.net"), new XElement(XName.Get("homePageLink", manifestUri), "http://orchardproject.net"), new XElement(XName.Get("apis", manifestUri), From 0a2af479e0cf84eb3382da2788827bf8a86cf6f4 Mon Sep 17 00:00:00 2001 From: "Phil@Megaverse.hsd1.wa.comcast.net." Date: Tue, 1 Jun 2010 19:04:54 -0700 Subject: [PATCH 3/4] Changed IEventBus Notify method to accept an IDictionary rather than Dictionary --- .../Settings/Topology/ShellDescriptorManagerTests.cs | 2 +- src/Orchard/Events/DefaultOrchardEventBus.cs | 2 +- src/Orchard/Events/IEventBus.cs | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/Orchard.Tests.Modules/Settings/Topology/ShellDescriptorManagerTests.cs b/src/Orchard.Tests.Modules/Settings/Topology/ShellDescriptorManagerTests.cs index 6c41371af..931892176 100644 --- a/src/Orchard.Tests.Modules/Settings/Topology/ShellDescriptorManagerTests.cs +++ b/src/Orchard.Tests.Modules/Settings/Topology/ShellDescriptorManagerTests.cs @@ -25,7 +25,7 @@ namespace Orchard.Tests.Modules.Settings.Topology { public void Notify_Obsolete(string messageName, IDictionary eventData) { } - public void Notify(string messageName, Dictionary eventData) { + public void Notify(string messageName, IDictionary eventData) { LastMessageName = messageName; LastEventData = eventData; } diff --git a/src/Orchard/Events/DefaultOrchardEventBus.cs b/src/Orchard/Events/DefaultOrchardEventBus.cs index d8eebfac4..161352584 100644 --- a/src/Orchard/Events/DefaultOrchardEventBus.cs +++ b/src/Orchard/Events/DefaultOrchardEventBus.cs @@ -26,7 +26,7 @@ namespace Orchard.Events { _handlers().Invoke(handler => handler.Process(messageName, eventData), Logger); } - public void Notify(string messageName, Dictionary eventData) { + public void Notify(string messageName, IDictionary eventData) { string[] parameters = messageName.Split('.'); if (parameters.Length != 2) { throw new ArgumentException(messageName + T(" is not formatted correctly")); diff --git a/src/Orchard/Events/IEventBus.cs b/src/Orchard/Events/IEventBus.cs index 46cb7f214..2f7232f90 100644 --- a/src/Orchard/Events/IEventBus.cs +++ b/src/Orchard/Events/IEventBus.cs @@ -3,6 +3,6 @@ namespace Orchard.Events { public interface IEventBus : IDependency { void Notify_Obsolete(string messageName, IDictionary eventData); - void Notify(string messageName, Dictionary eventData); + void Notify(string messageName, IDictionary eventData); } } From fbe3f982acd7eac421c6615d118c28e3940c0152 Mon Sep 17 00:00:00 2001 From: Suha Can Date: Fri, 4 Jun 2010 14:16:20 -0700 Subject: [PATCH 4/4] - Patch by ArturDwornik fixing the Login forms for Contoso and Corporate. --- src/Orchard.Web/Themes/Contoso/Styles/site.css | 7 ++++--- src/Orchard.Web/Themes/Contoso/Views/LogOn.ascx | 2 +- src/Orchard.Web/Themes/Corporate/Styles/site.css | 7 ++++--- src/Orchard.Web/Themes/Corporate/Views/LogOn.ascx | 6 +++--- 4 files changed, 12 insertions(+), 10 deletions(-) diff --git a/src/Orchard.Web/Themes/Contoso/Styles/site.css b/src/Orchard.Web/Themes/Contoso/Styles/site.css index f1424626a..d92dd7aa8 100644 --- a/src/Orchard.Web/Themes/Contoso/Styles/site.css +++ b/src/Orchard.Web/Themes/Contoso/Styles/site.css @@ -172,9 +172,10 @@ caption { background: #eee; } -------------------------------------------------------------- */ -label { font-weight: normal; } -fieldset { padding:0em; margin: 0 0 0em 0; border: 0px solid #ccc; } -legend { font-weight: bold; font-size:1.2em; } +label { font-weight: normal; display:block; } +label.forcheckbox { margin:0 0 0 4px; display:inline; } +fieldset { padding:0em; margin: 0 0 0em 0; border: 0px solid #ccc; } +legend { font-weight: bold; font-size:1.2em; } /* Form fields diff --git a/src/Orchard.Web/Themes/Contoso/Views/LogOn.ascx b/src/Orchard.Web/Themes/Contoso/Views/LogOn.ascx index a54cc96d2..3a65a9e7d 100644 --- a/src/Orchard.Web/Themes/Contoso/Views/LogOn.ascx +++ b/src/Orchard.Web/Themes/Contoso/Views/LogOn.ascx @@ -9,7 +9,7 @@ using (Html.BeginFormAntiForgeryPost(Url.Action("LogOn", new {ReturnUrl = Reques