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

Merge pull request #9428 from umbraco/netcore/task/6666-auth-policies

Browse Source 
Migrate authorization filters to authorization policies
This commit is contained in:
Bjarke Berg
2020-12-01 08:17:04 +01:00
committed by GitHub
parent 1aea3f9085 a995cdc360
commit 3e0d52b330
131 changed files with 2215 additions and 1763 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/Umbraco.Infrastructure/Editors/UserEditorAuthorizationHelper.cs
View File

@@ -12,14 +12,12 @@ namespace Umbraco.Web.Editors
{
private readonly IContentService _contentService;
private readonly IMediaService _mediaService;
private readonly IUserService _userService;
private readonly IEntityService _entityService;
public UserEditorAuthorizationHelper(IContentService contentService, IMediaService mediaService, IUserService userService, IEntityService entityService)
public UserEditorAuthorizationHelper(IContentService contentService, IMediaService mediaService, IEntityService entityService)
{
_contentService = contentService;
_mediaService = mediaService;
_userService = userService;
_entityService = entityService;
}
@@ -114,7 +112,7 @@ namespace Umbraco.Web.Editors
{
if (contentId == Constants.System.Root)
{
var hasAccess = ContentPermissionsHelper.HasPathAccess("-1", currentUser.CalculateContentStartNodeIds(_entityService), Constants.System.RecycleBinContent);
var hasAccess = ContentPermissions.HasPathAccess("-1", currentUser.CalculateContentStartNodeIds(_entityService), Constants.System.RecycleBinContent);
if (hasAccess == false)
return Attempt.Fail("The current user does not have access to the content root");
}
@@ -135,7 +133,7 @@ namespace Umbraco.Web.Editors
{
if (mediaId == Constants.System.Root)
{
var hasAccess = ContentPermissionsHelper.HasPathAccess("-1", currentUser.CalculateMediaStartNodeIds(_entityService), Constants.System.RecycleBinMedia);
var hasAccess = ContentPermissions.HasPathAccess("-1", currentUser.CalculateMediaStartNodeIds(_entityService), Constants.System.RecycleBinMedia);
if (hasAccess == false)
return Attempt.Fail("The current user does not have access to the media root");
}

6
src/Umbraco.Infrastructure/Runtime/CoreInitialComposer.cs
View File

@@ -63,6 +63,7 @@ using Umbraco.Core.Builder;
using Umbraco.Core.Configuration.HealthChecks;
using Umbraco.Core.HealthCheck;
using Umbraco.Core.HealthCheck.Checks;
using Umbraco.Core.Security;
namespace Umbraco.Core.Runtime
{
@@ -376,6 +377,11 @@ namespace Umbraco.Core.Runtime
builder.Services.AddUnique<UploadAutoFillProperties>();
builder.Services.AddUnique<ICronTabParser, NCronTabParser>();
builder.Services.AddUnique(factory => new LegacyPasswordSecurity());
builder.Services.AddUnique<UserEditorAuthorizationHelper>();
builder.Services.AddUnique<ContentPermissions>();
builder.Services.AddUnique<MediaPermissions>();
}
}
}