Merge remote-tracking branch 'origin/netcore/netcore' into netcore/task/6973-migrating-authenticationcontroller
# Conflicts: # src/Umbraco.Infrastructure/PropertyEditors/PropertyEditorsComposer.cs
This commit is contained in:
Shannon
@@ -1,147 +0,0 @@
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using Umbraco.Core;
|
||||
using Umbraco.Core.Dashboards;
|
||||
using Umbraco.Core.Models.Membership;
|
||||
using Umbraco.Core.Services;
|
||||
using Umbraco.Web.Dashboards;
|
||||
using Umbraco.Web.Models.ContentEditing;
|
||||
|
||||
namespace Umbraco.Web.Services
|
||||
{
|
||||
/// <summary>
|
||||
/// A utility class for determine dashboard security
|
||||
/// </summary>
|
||||
public class DashboardService : IDashboardService
|
||||
{
|
||||
// TODO: Unit test all this!!! :/
|
||||
|
||||
private readonly ISectionService _sectionService;
|
||||
private readonly DashboardCollection _dashboardCollection;
|
||||
private readonly ILocalizedTextService _localizedText;
|
||||
|
||||
public DashboardService(ISectionService sectionService, DashboardCollection dashboardCollection, ILocalizedTextService localizedText)
|
||||
{
|
||||
_sectionService = sectionService ?? throw new ArgumentNullException(nameof(sectionService));
|
||||
_dashboardCollection = dashboardCollection ?? throw new ArgumentNullException(nameof(dashboardCollection));
|
||||
_localizedText = localizedText ?? throw new ArgumentNullException(nameof(localizedText));
|
||||
}
|
||||
|
||||
|
||||
/// <inheritdoc />
|
||||
public IEnumerable<Tab<IDashboard>> GetDashboards(string section, IUser currentUser)
|
||||
{
|
||||
var tabs = new List<Tab<IDashboard>>();
|
||||
var tabId = 0;
|
||||
|
||||
foreach (var dashboard in _dashboardCollection.Where(x => x.Sections.InvariantContains(section)))
|
||||
{
|
||||
// validate access
|
||||
if (!CheckUserAccessByRules(currentUser, _sectionService, dashboard.AccessRules))
|
||||
continue;
|
||||
|
||||
if (dashboard.View.InvariantEndsWith(".ascx"))
|
||||
throw new NotSupportedException("Legacy UserControl (.ascx) dashboards are no longer supported.");
|
||||
|
||||
var dashboards = new List<IDashboard> {dashboard};
|
||||
tabs.Add(new Tab<IDashboard>
|
||||
{
|
||||
Id = tabId++,
|
||||
Label = _localizedText.Localize("dashboardTabs", dashboard.Alias),
|
||||
Alias = dashboard.Alias,
|
||||
Properties = dashboards
|
||||
});
|
||||
}
|
||||
|
||||
return tabs;
|
||||
}
|
||||
|
||||
/// <inheritdoc />
|
||||
public IDictionary<string, IEnumerable<Tab<IDashboard>>> GetDashboards(IUser currentUser)
|
||||
{
|
||||
return _sectionService.GetSections().ToDictionary(x => x.Alias, x => GetDashboards(x.Alias, currentUser));
|
||||
}
|
||||
|
||||
private bool CheckUserAccessByRules(IUser user, ISectionService sectionService, IEnumerable<IAccessRule> rules)
|
||||
{
|
||||
if (user.Id == Constants.Security.SuperUserId)
|
||||
return true;
|
||||
|
||||
var (denyRules, grantRules, grantBySectionRules) = GroupRules(rules);
|
||||
|
||||
var hasAccess = true;
|
||||
string[] assignedUserGroups = null;
|
||||
|
||||
// if there are no grant rules, then access is granted by default, unless denied
|
||||
// otherwise, grant rules determine if access can be granted at all
|
||||
if (grantBySectionRules.Length > 0 || grantRules.Length > 0)
|
||||
{
|
||||
hasAccess = false;
|
||||
|
||||
// check if this item has any grant-by-section arguments.
|
||||
// if so check if the user has access to any of the sections approved, if so they will be allowed to see it (so far)
|
||||
if (grantBySectionRules.Length > 0)
|
||||
{
|
||||
var allowedSections = sectionService.GetAllowedSections(user.Id).Select(x => x.Alias).ToArray();
|
||||
var wantedSections = grantBySectionRules.SelectMany(g => g.Value.Split(new[] { ',' }, StringSplitOptions.RemoveEmptyEntries)).ToArray();
|
||||
|
||||
if (wantedSections.Intersect(allowedSections).Any())
|
||||
hasAccess = true;
|
||||
}
|
||||
|
||||
// if not already granted access, check if this item as any grant arguments.
|
||||
// if so check if the user is in one of the user groups approved, if so they will be allowed to see it (so far)
|
||||
if (hasAccess == false && grantRules.Any())
|
||||
{
|
||||
assignedUserGroups = user.Groups.Select(x => x.Alias).ToArray();
|
||||
var wantedUserGroups = grantRules.SelectMany(g => g.Value.Split(new[] { ',' }, StringSplitOptions.RemoveEmptyEntries)).ToArray();
|
||||
|
||||
if (wantedUserGroups.Intersect(assignedUserGroups).Any())
|
||||
hasAccess = true;
|
||||
}
|
||||
}
|
||||
|
||||
// No need to check denyRules if there aren't any, just return current state
|
||||
if (denyRules.Length == 0)
|
||||
return hasAccess;
|
||||
|
||||
// check if this item has any deny arguments, if so check if the user is in one of the denied user groups, if so they will
|
||||
// be denied to see it no matter what
|
||||
assignedUserGroups = assignedUserGroups ?? user.Groups.Select(x => x.Alias).ToArray();
|
||||
var deniedUserGroups = denyRules.SelectMany(g => g.Value.Split(new[] { ',' }, StringSplitOptions.RemoveEmptyEntries)).ToArray();
|
||||
|
||||
if (deniedUserGroups.Intersect(assignedUserGroups).Any())
|
||||
hasAccess = false;
|
||||
|
||||
return hasAccess;
|
||||
}
|
||||
|
||||
private static (IAccessRule[], IAccessRule[], IAccessRule[]) GroupRules(IEnumerable<IAccessRule> rules)
|
||||
{
|
||||
IAccessRule[] denyRules = null, grantRules = null, grantBySectionRules = null;
|
||||
|
||||
var groupedRules = rules.GroupBy(x => x.Type);
|
||||
foreach (var group in groupedRules)
|
||||
{
|
||||
var a = group.ToArray();
|
||||
switch (group.Key)
|
||||
{
|
||||
case AccessRuleType.Deny:
|
||||
denyRules = a;
|
||||
break;
|
||||
case AccessRuleType.Grant:
|
||||
grantRules = a;
|
||||
break;
|
||||
case AccessRuleType.GrantBySection:
|
||||
grantBySectionRules = a;
|
||||
break;
|
||||
default:
|
||||
throw new NotSupportedException($"The '{group.Key.ToString()}'-AccessRuleType is not supported.");
|
||||
}
|
||||
}
|
||||
|
||||
return (denyRules ?? Array.Empty<IAccessRule>(), grantRules ?? Array.Empty<IAccessRule>(), grantBySectionRules ?? Array.Empty<IAccessRule>());
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -8,6 +8,7 @@ using Newtonsoft.Json;
|
||||
using Umbraco.Core.Composing;
|
||||
using Umbraco.Core.Models;
|
||||
using Umbraco.Core.PropertyEditors;
|
||||
using Umbraco.Core.Serialization;
|
||||
using Umbraco.Core.Strings;
|
||||
|
||||
namespace Umbraco.Core.Services.Implement
|
||||
@@ -26,6 +27,7 @@ namespace Umbraco.Core.Services.Implement
|
||||
private readonly UrlSegmentProviderCollection _urlSegmentProviders;
|
||||
private readonly IShortStringHelper _shortStringHelper;
|
||||
private readonly PropertyEditorCollection _propertyEditors;
|
||||
private readonly IConfigurationEditorJsonSerializer _configurationEditorJsonSerializer;
|
||||
|
||||
public EntityXmlSerializer(
|
||||
IContentService contentService,
|
||||
@@ -36,7 +38,8 @@ namespace Umbraco.Core.Services.Implement
|
||||
IContentTypeService contentTypeService,
|
||||
UrlSegmentProviderCollection urlSegmentProviders,
|
||||
IShortStringHelper shortStringHelper,
|
||||
PropertyEditorCollection propertyEditors)
|
||||
PropertyEditorCollection propertyEditors,
|
||||
IConfigurationEditorJsonSerializer configurationEditorJsonSerializer)
|
||||
{
|
||||
_contentTypeService = contentTypeService;
|
||||
_mediaService = mediaService;
|
||||
@@ -47,6 +50,7 @@ namespace Umbraco.Core.Services.Implement
|
||||
_urlSegmentProviders = urlSegmentProviders;
|
||||
_shortStringHelper = shortStringHelper;
|
||||
_propertyEditors = propertyEditors;
|
||||
_configurationEditorJsonSerializer = configurationEditorJsonSerializer;
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
@@ -179,7 +183,7 @@ namespace Umbraco.Core.Services.Implement
|
||||
xml.Add(new XAttribute("Id", dataType.EditorAlias));
|
||||
xml.Add(new XAttribute("Definition", dataType.Key));
|
||||
xml.Add(new XAttribute("DatabaseType", dataType.DatabaseType.ToString()));
|
||||
xml.Add(new XAttribute("Configuration", JsonConvert.SerializeObject(dataType.Configuration, PropertyEditors.ConfigurationEditor.ConfigurationJsonSettings)));
|
||||
xml.Add(new XAttribute("Configuration", _configurationEditorJsonSerializer.Serialize(dataType.Configuration)));
|
||||
|
||||
var folderNames = string.Empty;
|
||||
if (dataType.Level != 1)
|
||||
|
||||
Reference in New Issue
Block a user