huahaofeng
/
aspnetcore
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Action/ActionResult/ExceptionFilterAttribute(s) 

AllowAnonymousAttribute
Name cleanup in ReflectionActionDescriptorProvider
This commit is contained in:
Yishai Galatzer 2014-03-03 03:04:40 -08:00
parent 1783a06dc0
commit 8c5db4fdfa
1 changed files with 23 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
src/Microsoft.AspNet.Mvc.Core/ReflectedActionDescriptorProvider.cs
View File

@ -43,7 +43,10 @@ namespace Microsoft.AspNet.Mvc
foreach (var cd in controllerDescriptors) foreach (var cd in controllerDescriptors)
{ {
var controllerFilters = GetOrderedFilterAttributes(cd.ControllerTypeInfo); var controllerAttributes = cd.ControllerTypeInfo.GetCustomAttributes(inherit: true).ToArray();
var filtersFromController = GetOrderedFilterAttributes(controllerAttributes);
bool allowAnonymous = IsAnonymous(controllerAttributes);
bool allowAnonymous = IsAnonymous(controllerAttributes); bool allowAnonymous = IsAnonymous(controllerAttributes);
@ -59,24 +62,24 @@ namespace Microsoft.AspNet.Mvc
foreach (var actionInfo in actionInfos) foreach (var actionInfo in actionInfos)
{ {
yield return BuildDescriptor(cd, methodInfo, actionInfo, controllerFilters); yield return BuildDescriptor(cd, methodInfo, actionInfo, filtersFromController, allowAnonymous);
} }
} }
} }
} }
private IFilter[] GetOrderedFilterAttributes(MemberInfo memberInfo) private bool IsAnonymous(object[] attributes)
{
return attributes.OfType<AllowAnonymousAttribute>().Any();
}
private IFilter[] GetOrderedFilterAttributes(object[] attributes)
{ {
var attributes = memberInfo.GetCustomAttributes(inherit: true);
var filters = attributes.OfType<IFilter>().OrderByDescending(filter => filter.Order); var filters = attributes.OfType<IFilter>().OrderByDescending(filter => filter.Order);
return filters.ToArray(); return filters.ToArray();
} }
private ReflectedActionDescriptor BuildDescriptor(ControllerDescriptor controllerDescriptor,
MethodInfo methodInfo,
ActionInfo actionInfo,
IFilter[] controllerFilters)
private ReflectedActionDescriptor BuildDescriptor(ControllerDescriptor controllerDescriptor, private ReflectedActionDescriptor BuildDescriptor(ControllerDescriptor controllerDescriptor,
MethodInfo methodInfo, MethodInfo methodInfo,
ActionInfo actionInfo, ActionInfo actionInfo,
@ -115,10 +118,10 @@ namespace Microsoft.AspNet.Mvc
ad.Parameters = methodInfo.GetParameters().Select(p => _parameterDescriptorFactory.GetDescriptor(p)).ToList(); ad.Parameters = methodInfo.GetParameters().Select(p => _parameterDescriptorFactory.GetDescriptor(p)).ToList();
// TODO: add ordering support such that action filters are ahead of controller filters if they have the same order var attributes = methodInfo.GetCustomAttributes(inherit: true).ToArray();
var actionFilters = GetOrderedFilterAttributes(methodInfo);
ad.Filters = MergeSorted(actionFilters, controllerFilters); // TODO: add ordering support such that action filters are ahead of controller filters if they have the same order
var filtersFromAction = GetOrderedFilterAttributes(attributes);
ad.Filters = MergeSorted(filtersFromAction, controllerFilters); ad.Filters = MergeSorted(filtersFromAction, controllerFilters);
@ -127,29 +130,29 @@ namespace Microsoft.AspNet.Mvc
return ad; return ad;
} }
internal List<IFilter> MergeSorted(IFilter[] actionFilters, IFilter[] controllerFilters) private List<IFilter> MergeSorted(IFilter[] filtersFromAction, IFilter[] filtersFromController)
{ {
var list = new List<IFilter>(); var list = new List<IFilter>();
var count = actionFilters.Length + controllerFilters.Length; var count = filtersFromAction.Length + filtersFromController.Length;
for (int i = 0, j = 0; i + j < count; ) for (int i = 0, j = 0; i + j < count; )
{ {
if (i >= actionFilters.Length) if (i >= filtersFromAction.Length)
{ {
list.Add(controllerFilters[j++]); list.Add(filtersFromController[j++]);
} }
else if (j >= controllerFilters.Length) else if (j >= filtersFromController.Length)
{ {
list.Add(actionFilters[i++]); list.Add(filtersFromAction[i++]);
} }
else if (actionFilters[i].Order >= controllerFilters[j].Order) else if (filtersFromAction[i].Order >= filtersFromController[j].Order)
{ {
list.Add(actionFilters[i++]); list.Add(filtersFromAction[i++]);
} }
else else
{ {
list.Add(controllerFilters[j++]); list.Add(filtersFromController[j++]);
} }
} }