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

Removing OverridableAuthorizationAttribute as it is no longer needed

Browse Source
This commit is contained in:
Elitsa Marinovska
2020-12-08 16:05:04 +01:00
parent b6cc9f076a
commit c858ededf4
2 changed files with 0 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/Umbraco.Web/Umbraco.Web.csproj
View File

@@ -141,7 +141,6 @@
<Compile Include="Mvc\RenderMvcController.cs" />
<Compile Include="Mvc\UmbracoViewPageOfTModel.cs" />
<Compile Include="Security\BackOfficeSecurity.cs" />
<Compile Include="WebApi\Filters\OverridableAuthorizationAttribute.cs" />
<Compile Include="HttpContextAccessorExtensions.cs" />
<Compile Include="Models\Membership\UmbracoMembershipMember.cs" />
<Compile Include="Mvc\HttpUmbracoFormRouteStringException.cs" />

52
src/Umbraco.Web/WebApi/Filters/OverridableAuthorizationAttribute.cs
View File

@@ -1,52 +0,0 @@
using System;
using System.Linq;
using System.Web.Http;
using System.Web.Http.Controllers;
namespace Umbraco.Web.WebApi.Filters
{
// TODO: remove this since we don't need it, see notes in EnableOverrideAuthorizationAttribute
/// <summary>
/// Abstract auth filter class that can be used to enable overriding class auth filters at the action level
/// </summary>
/// <remarks>
/// To enable a class auth filter to be overridden by an action auth filter the EnableOverrideAuthorizationAttribute can be applied
/// to the class.
/// </remarks>
public abstract class OverridableAuthorizationAttribute : AuthorizeAttribute
{
/// <summary>
/// If the controller has an EnabledOverrideAuthorizationAttribute attribute specified and the action has any AuthorizeAttribute
/// specified then use the action's auth attribute instead of this one
/// </summary>
/// <param name="actionContext">The context.</param>
/// <exception cref="T:System.ArgumentNullException">The context parameter is null.</exception>
public override void OnAuthorization(HttpActionContext actionContext)
{
if (actionContext == null) throw new ArgumentNullException("actionContext");
var actionAttributes = actionContext.ActionDescriptor.GetCustomAttributes<AuthorizeAttribute>();
//if 'this' authorize attribute exists in the current collection then continue as per normal... this is because 'this' attribute instance
// is obviously assigned at an Action level and therefore it's already executing
if (actionAttributes.Any(x => Equals(x, this)))
{
base.OnAuthorization(actionContext);
return;
}
//if the controller is allowing authorization to be overridden at the action level and there are action level authorization attributes
// then exit and let the action level auth attribute(s) execute.
if (actionContext.ActionDescriptor.ControllerDescriptor.GetCustomAttributes<OverrideAuthorizationAttribute>().Any()
&& actionAttributes.Any())
{
return;
}
base.OnAuthorization(actionContext);
}
}
}