From e208860ea285ba7ba49c1523302976210e2eb29a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Ros?= Date: Sat, 20 Nov 2010 12:10:47 -0800 Subject: [PATCH] Correcting user management conflicts Work Items: 16453, 16543 --HG-- branch : dev --- .../Drivers/SiteSettingsPartDriver.cs | 31 ++++++++++- .../ViewModels/SiteSettingsPartViewModel.cs | 12 ++--- .../Parts/Settings.SiteSettingsPart.cshtml | 1 + .../Controllers/AdminController.cs | 53 ++++++++++++++----- .../Modules/Orchard.Users/Module.txt | 1 + .../Orchard.Users/Orchard.Users.csproj | 4 ++ 6 files changed, 80 insertions(+), 22 deletions(-) diff --git a/src/Orchard.Web/Core/Settings/Drivers/SiteSettingsPartDriver.cs b/src/Orchard.Web/Core/Settings/Drivers/SiteSettingsPartDriver.cs index 2fabd1803..082e45b10 100644 --- a/src/Orchard.Web/Core/Settings/Drivers/SiteSettingsPartDriver.cs +++ b/src/Orchard.Web/Core/Settings/Drivers/SiteSettingsPartDriver.cs @@ -5,18 +5,30 @@ using Orchard.Core.Settings.Models; using Orchard.Core.Settings.ViewModels; using Orchard.Localization.Services; using Orchard.Settings; +using System; +using Orchard.Security; +using Orchard.UI.Notify; +using Orchard.Localization; namespace Orchard.Core.Settings.Drivers { [UsedImplicitly] public class SiteSettingsPartDriver : ContentPartDriver { private readonly ISiteService _siteService; private readonly ICultureManager _cultureManager; + private readonly IMembershipService _membershipService; + private readonly INotifier _notifier; - public SiteSettingsPartDriver(ISiteService siteService, ICultureManager cultureManager) { + public SiteSettingsPartDriver(ISiteService siteService, ICultureManager cultureManager, IMembershipService membershipService, INotifier notifier) { _siteService = siteService; _cultureManager = cultureManager; + _membershipService = membershipService; + _notifier = notifier; + + T = NullLocalizer.Instance; } + public Localizer T { get; set; } + protected override string Prefix { get { return "SiteSettings"; } } protected override DriverResult Editor(SiteSettingsPart part, dynamic shapeHelper) { @@ -33,10 +45,25 @@ namespace Orchard.Core.Settings.Drivers { protected override DriverResult Editor(SiteSettingsPart part, IUpdateModel updater, dynamic shapeHelper) { var site = _siteService.GetSiteSettings().As(); - var model = new SiteSettingsPartViewModel { Site = site }; + var model = new SiteSettingsPartViewModel { + Site = site, + SiteCultures = _cultureManager.ListCultures() + }; updater.TryUpdateModel(model, Prefix, null, null); + // ensures the super user is fully empty + if (String.IsNullOrEmpty(model.SuperUser)) { + model.SuperUser = String.Empty; + } + // otherwise the super user must be a valid user, to prevent an external account to impersonate as this name + //the user management module ensures the super user can't be deleted, but it can be disabled + else { + if (_membershipService.GetUser(model.SuperUser) == null) { + updater.AddModelError("SuperUser", T("The user {0} was not found", model.SuperUser)); + } + } + return ContentShape("Parts_Settings_SiteSettingsPart", () => shapeHelper.EditorTemplate(TemplateName: "Parts/Settings.SiteSettingsPart", Model: model, Prefix: Prefix)); } diff --git a/src/Orchard.Web/Core/Settings/ViewModels/SiteSettingsPartViewModel.cs b/src/Orchard.Web/Core/Settings/ViewModels/SiteSettingsPartViewModel.cs index 4912b9c95..3c5624ff2 100644 --- a/src/Orchard.Web/Core/Settings/ViewModels/SiteSettingsPartViewModel.cs +++ b/src/Orchard.Web/Core/Settings/ViewModels/SiteSettingsPartViewModel.cs @@ -17,18 +17,18 @@ namespace Orchard.Core.Settings.ViewModels { public string PageTitleSeparator { - get { return Site.As().Record.PageTitleSeparator; } - set { Site.As().Record.PageTitleSeparator = value; } + get { return Site.Record.PageTitleSeparator; } + set { Site.Record.PageTitleSeparator = value; } } public string SiteName { - get { return Site.As().Record.SiteName; } - set { Site.As().Record.SiteName = value; } + get { return Site.Record.SiteName; } + set { Site.Record.SiteName = value; } } public string SiteCulture { - get { return Site.As().Record.SiteCulture; } - set { Site.As().Record.SiteCulture = value; } + get { return Site.Record.SiteCulture; } + set { Site.Record.SiteCulture = value; } } public string SuperUser { diff --git a/src/Orchard.Web/Core/Settings/Views/EditorTemplates/Parts/Settings.SiteSettingsPart.cshtml b/src/Orchard.Web/Core/Settings/Views/EditorTemplates/Parts/Settings.SiteSettingsPart.cshtml index 54b425f75..ba9a67d96 100644 --- a/src/Orchard.Web/Core/Settings/Views/EditorTemplates/Parts/Settings.SiteSettingsPart.cshtml +++ b/src/Orchard.Web/Core/Settings/Views/EditorTemplates/Parts/Settings.SiteSettingsPart.cshtml @@ -29,6 +29,7 @@ @Html.EditorFor(x=>x.SuperUser) @Html.ValidationMessage("SuperUser", "*") + @T("Enter an existing account name, or nothing if you don't want a Super user account")
diff --git a/src/Orchard.Web/Modules/Orchard.Users/Controllers/AdminController.cs b/src/Orchard.Web/Modules/Orchard.Users/Controllers/AdminController.cs index b0564ce25..324e41672 100644 --- a/src/Orchard.Web/Modules/Orchard.Users/Controllers/AdminController.cs +++ b/src/Orchard.Web/Modules/Orchard.Users/Controllers/AdminController.cs @@ -1,6 +1,7 @@ using System.Linq; using System.Web.Mvc; using Orchard.ContentManagement; +using Orchard.Core.Settings.Models; using Orchard.DisplayManagement; using Orchard.Localization; using Orchard.Security; @@ -9,21 +10,27 @@ using Orchard.Users.Models; using Orchard.Users.Services; using Orchard.Users.ViewModels; using Orchard.Mvc.Extensions; +using System; +using Orchard.Settings; namespace Orchard.Users.Controllers { [ValidateInput(false)] public class AdminController : Controller, IUpdateModel { private readonly IMembershipService _membershipService; private readonly IUserService _userService; + private readonly ISiteService _siteService; public AdminController( IOrchardServices services, IMembershipService membershipService, IUserService userService, - IShapeFactory shapeFactory) { + IShapeFactory shapeFactory, + ISiteService siteService) { Services = services; _membershipService = membershipService; _userService = userService; + _siteService = siteService; + T = NullLocalizer.Instance; Shape = shapeFactory; } @@ -125,19 +132,25 @@ namespace Orchard.Users.Controllers { if (!Services.Authorizer.Authorize(Permissions.ManageUsers, T("Not authorized to manage users"))) return new HttpUnauthorizedResult(); - var user = Services.ContentManager.Get(id); + var user = Services.ContentManager.Get(id); + string previousName = user.UserName; + dynamic model = Services.ContentManager.UpdateEditor(user, this); var editModel = new UserEditViewModel {User = user}; - TryUpdateModel(editModel); - - if (ModelState.IsValid) { - ((IContent)model.ContentItem).As().NormalizedUserName = editModel.UserName.ToLower(); - + if (TryUpdateModel(editModel)) { string userExistsMessage = _userService.VerifyUserUnicity(id, editModel.UserName, editModel.Email); if (userExistsMessage != null) { AddModelError("NotUniqueUserName", T(userExistsMessage)); } + else { + // also update the Super user if this is the renamed account + if (String.Equals(Services.WorkContext.CurrentSite.SuperUser, previousName, StringComparison.OrdinalIgnoreCase)) { + _siteService.GetSiteSettings().As().SuperUser = editModel.UserName; + } + + user.NormalizedUserName = editModel.UserName.ToLower(); + } } if (!ModelState.IsValid) { @@ -159,9 +172,21 @@ namespace Orchard.Users.Controllers { if (!Services.Authorizer.Authorize(Permissions.ManageUsers, T("Not authorized to manage users"))) return new HttpUnauthorizedResult(); - Services.ContentManager.Remove(Services.ContentManager.Get(id)); + var user = Services.ContentManager.Get(id); + + if (user != null) { + if (String.Equals(Services.WorkContext.CurrentSite.SuperUser, user.UserName, StringComparison.OrdinalIgnoreCase)) { + Services.Notifier.Error(T("The Super user can't be removed. Please disable this account or specify another Super user account")); + } + else if (String.Equals(Services.WorkContext.CurrentUser.UserName, user.UserName, StringComparison.OrdinalIgnoreCase)) { + Services.Notifier.Error(T("You can't remove your own account. Please log in with another account")); + } + else{ + Services.ContentManager.Remove(user.ContentItem); + Services.Notifier.Information(T("User deleted")); + } + } - Services.Notifier.Information(T("User deleted")); return RedirectToAction("Index"); } @@ -199,15 +224,15 @@ namespace Orchard.Users.Controllers { if ( !Services.Authorizer.Authorize(Permissions.ManageUsers, T("Not authorized to manage users")) ) return new HttpUnauthorizedResult(); - var user = Services.ContentManager.Get(id); + var user = Services.ContentManager.Get(id); - if ( user != null ) { - if (Services.WorkContext.CurrentSite.SuperUser.Equals(user.As().UserName) ) { - Services.Notifier.Error(T("Super user can't be moderated")); + if (user != null) { + if (String.Equals(Services.WorkContext.CurrentUser.UserName, user.UserName, StringComparison.OrdinalIgnoreCase)) { + Services.Notifier.Error(T("You can't disable your own account. Please log in with another account")); } else { user.As().RegistrationStatus = UserStatus.Pending; - Services.Notifier.Information(T("User moderated")); + Services.Notifier.Information(T("User {0} disabled", user.UserName)); } } diff --git a/src/Orchard.Web/Modules/Orchard.Users/Module.txt b/src/Orchard.Web/Modules/Orchard.Users/Module.txt index 266449435..f87a87c29 100644 --- a/src/Orchard.Web/Modules/Orchard.Users/Module.txt +++ b/src/Orchard.Web/Modules/Orchard.Users/Module.txt @@ -9,3 +9,4 @@ Features: Orchard.Users: Description: Standard users. Category: Core + Dependencies: Settings diff --git a/src/Orchard.Web/Modules/Orchard.Users/Orchard.Users.csproj b/src/Orchard.Web/Modules/Orchard.Users/Orchard.Users.csproj index 7681df5ef..b52cb68d1 100644 --- a/src/Orchard.Web/Modules/Orchard.Users/Orchard.Users.csproj +++ b/src/Orchard.Web/Modules/Orchard.Users/Orchard.Users.csproj @@ -116,6 +116,10 @@ {2D1D92BB-4555-4CBE-8D0E-63563D6CE4C6} Orchard.Framework + + {9916839C-39FC-4CEB-A5AF-89CA7E87119F} + Orchard.Core +