a1624d26a3
* Getting new netcore PublicAccessChecker in place * Adds full test coverage for PublicAccessChecker * remove PublicAccessComposer * adjust namespaces, ensure RoleManager works, separate public access controller, reduce content controller * Implements the required methods on IMemberManager, removes old migrated code * Updates routing to be able to re-route, Fixes middleware ordering ensuring endpoints are last, refactors pipeline options, adds public access middleware, ensures public access follows all hops * adds note * adds note * Cleans up ext methods, ensures that members identity is added on both front-end and back ends. updates how UmbracoApplicationBuilder works in that it explicitly starts endpoints at the time of calling. * Changes name to IUmbracoEndpointBuilder * adds note * Fixing tests, fixing error describers so there's 2x one for back office, one for members, fixes TryConvertTo, fixes login redirect * fixing build * Fixes keepalive, fixes PublicAccessMiddleware to not throw, updates startup code to be more clear and removes magic that registers middleware. * adds note * removes unused filter, fixes build * fixes WebPath and tests * Looks up entities in one query * remove usings * Fix test, remove stylesheet * Set status code before we write to response to avoid error * Ensures that users and members are validated when logging in. Shares more code between users and members. * Fixes RepositoryCacheKeys to ensure the keys are normalized * oops didn't mean to commit this * Fix casing issues with caching, stop boxing value types for all cache operations, stop re-creating string keys in DefaultRepositoryCachePolicy * bah, far out this keeps getting recommitted. sorry Co-authored-by: Bjarke Berg <mail@bergmania.dk>
66 lines
2.3 KiB
C#
66 lines
2.3 KiB
C#
using System;
|
|
using System.Collections.Generic;
|
|
using System.Threading.Tasks;
|
|
using Microsoft.AspNetCore.Http;
|
|
using Microsoft.Extensions.DependencyInjection;
|
|
using Umbraco.Cms.Core.Security;
|
|
using Umbraco.Cms.Core.Services;
|
|
using Umbraco.Extensions;
|
|
|
|
namespace Umbraco.Cms.Web.Common.Security
|
|
{
|
|
public class PublicAccessChecker : IPublicAccessChecker
|
|
{
|
|
private readonly IHttpContextAccessor _httpContextAccessor;
|
|
private readonly IPublicAccessService _publicAccessService;
|
|
private readonly IContentService _contentService;
|
|
|
|
public PublicAccessChecker(IHttpContextAccessor httpContextAccessor, IPublicAccessService publicAccessService, IContentService contentService)
|
|
{
|
|
_httpContextAccessor = httpContextAccessor;
|
|
_publicAccessService = publicAccessService;
|
|
_contentService = contentService;
|
|
}
|
|
|
|
public async Task<PublicAccessStatus> HasMemberAccessToContentAsync(int publishedContentId)
|
|
{
|
|
HttpContext httpContext = _httpContextAccessor.GetRequiredHttpContext();
|
|
IMemberManager memberManager = httpContext.RequestServices.GetRequiredService<IMemberManager>();
|
|
if (httpContext.User.Identity == null || !httpContext.User.Identity.IsAuthenticated)
|
|
{
|
|
return PublicAccessStatus.NotLoggedIn;
|
|
}
|
|
MemberIdentityUser currentMember = await memberManager.GetUserAsync(httpContext.User);
|
|
if (currentMember == null)
|
|
{
|
|
return PublicAccessStatus.NotLoggedIn;
|
|
}
|
|
|
|
var username = currentMember.UserName;
|
|
IList<string> userRoles = await memberManager.GetRolesAsync(currentMember);
|
|
|
|
if (userRoles.Count == 0)
|
|
{
|
|
return PublicAccessStatus.AccessDenied;
|
|
}
|
|
|
|
if (!currentMember.IsApproved)
|
|
{
|
|
return PublicAccessStatus.NotApproved;
|
|
}
|
|
|
|
if (currentMember.IsLockedOut)
|
|
{
|
|
return PublicAccessStatus.LockedOut;
|
|
}
|
|
|
|
if (!_publicAccessService.HasAccess(publishedContentId, _contentService, username, userRoles))
|
|
{
|
|
return PublicAccessStatus.AccessDenied;
|
|
}
|
|
|
|
return PublicAccessStatus.AccessAccepted;
|
|
}
|
|
}
|
|
}
|