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

Merge pull request #6578 from aspnet/rel/2.0.0 

Rel/2.0.0
This commit is contained in:
Pranav K 2017-07-21 10:51:10 -07:00 committed by GitHub
parent 1b69320c3c a5b55edb93
commit 6eba0e2128
6 changed files with 108 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Microsoft.AspNetCore.Mvc.Core/Authorization/AuthorizeFilter.cs
View File

@ -133,7 +133,7 @@ namespace Microsoft.AspNetCore.Mvc.Authorization
return;
}
var authorizeResult = await policyEvaluator.AuthorizeAsync(effectivePolicy, authenticateResult, context.HttpContext);
var authorizeResult = await policyEvaluator.AuthorizeAsync(effectivePolicy, authenticateResult, context.HttpContext, context);
if (authorizeResult.Challenged)
{

12
src/Microsoft.AspNetCore.Mvc.Core/Internal/FilterFactory.cs
View File

@ -3,6 +3,7 @@
using System;
using System.Collections.Generic;
using System.Linq;
using Microsoft.AspNetCore.Mvc.Filters;
namespace Microsoft.AspNetCore.Mvc.Internal
@ -26,9 +27,16 @@ namespace Microsoft.AspNetCore.Mvc.Internal
var actionDescriptor = actionContext.ActionDescriptor;
var staticFilterItems = new FilterItem[actionDescriptor.FilterDescriptors.Count];
for (var i = 0; i < actionDescriptor.FilterDescriptors.Count; i++)
var orderedFilters = actionDescriptor.FilterDescriptors
.OrderBy(
filter => filter,
FilterDescriptorOrderComparer.Comparer)
.ToList();
for (var i = 0; i < orderedFilters.Count; i++)
{
staticFilterItems[i] = new FilterItem(actionDescriptor.FilterDescriptors[i]);
staticFilterItems[i] = new FilterItem(orderedFilters[i]);
}
var allFilterItems = new List<FilterItem>(staticFilterItems);

14
test/Microsoft.AspNetCore.Mvc.Core.Test/Authorization/AuthorizeFilterTest.cs
View File

@ -201,6 +201,20 @@ namespace Microsoft.AspNetCore.Mvc.Authorization
Assert.Null(authorizationContext.Result);
}
[Fact]
public async Task AuthZResourceShouldBeAuthorizationFilterContext()
{
// Arrange
var authorizeFilter = new AuthorizeFilter(new AuthorizationPolicyBuilder().RequireAssertion(c => c.Resource is AuthorizationFilterContext).Build());
var authorizationContext = GetAuthorizationContext();
// Act
await authorizeFilter.OnAuthorizationAsync(authorizationContext);
// Assert
Assert.Null(authorizationContext.Result);
}
[Fact]
public async Task Invoke_RequireUnknownRoleShouldForbid()
{

61
test/Microsoft.AspNetCore.Mvc.Core.Test/Internal/FilterFactoryTest.cs
View File

@ -89,6 +89,62 @@ namespace Microsoft.AspNetCore.Mvc.Internal
f => Assert.Same(staticFilter2, f));
}
[Fact]
public void GetAllFilters_OrdersFilters()
{
// Arrange
var filter1 = new TestOrderedFilter { Order = 1000 };
var filter2 = new TestFilter();
var filter3 = new TestOrderedFilter { Order = 10 };
var actionContext = CreateActionContext(new[]
{
new FilterDescriptor(filter1, FilterScope.Action),
new FilterDescriptor(filter2, FilterScope.Action),
new FilterDescriptor(filter3, FilterScope.Action),
});
var filterProviders = new[] { new DefaultFilterProvider() };
// Act
var filterResult = FilterFactory.GetAllFilters(filterProviders, actionContext);
// Assert
Assert.Collection(
filterResult.Filters,
f => Assert.Same(filter2, f),
f => Assert.Same(filter3, f),
f => Assert.Same(filter1, f));
}
[Fact]
public void GetAllFilters_CachesFilterOrder()
{
// Arrange
var filter1 = new TestOrderedFilter { Order = 1000 };
var filter2 = new TestFilter();
var filter3 = new TestOrderedFilter { Order = 10 };
var actionContext = CreateActionContext(new[]
{
new FilterDescriptor(filter1, FilterScope.Action),
new FilterDescriptor(filter2, FilterScope.Action),
new FilterDescriptor(filter3, FilterScope.Action),
});
var filterProviders = new[] { new DefaultFilterProvider() };
// Act
var filterResult = FilterFactory.GetAllFilters(filterProviders, actionContext);
var requestFilters = FilterFactory.CreateUncachedFilters(
filterProviders,
actionContext,
filterResult.CacheableFilters);
// Assert
Assert.Collection(
requestFilters,
f => Assert.Same(filter2, f),
f => Assert.Same(filter3, f),
f => Assert.Same(filter1, f));
}
[Fact]
public void GetAllFilters_CachesFilterFromFactory()
{
@ -266,6 +322,11 @@ namespace Microsoft.AspNetCore.Mvc.Internal
}
}
private class TestOrderedFilter : IFilterMetadata, IOrderedFilter
{
public int Order { get; set; }
}
private static ActionContext CreateActionContext(FilterDescriptor[] filterDescriptors)
{
var actionDescriptor = new ActionDescriptor

11
test/Microsoft.AspNetCore.Mvc.FunctionalTests/RazorPagesTest.cs
View File

@ -1074,6 +1074,17 @@ Microsoft.AspNetCore.Mvc.ViewFeatures.ViewDataDictionary`1[AspNetCore._InjectedP
Assert.Equal("/Login?ReturnUrl=%2FModelWithAuthFilter", response.Headers.Location.PathAndQuery);
}
[Fact]
public async Task AuthorizeAttributeIsExecutedPriorToAutoAntiforgeryFilter()
{
// Act
var response = await Client.PostAsync("/Pages/Admin/Edit", new StringContent(""));
// Assert
Assert.Equal(HttpStatusCode.Redirect, response.StatusCode);
Assert.Equal("/Login?ReturnUrl=%2FPages%2FAdmin%2FEdit", response.Headers.Location.PathAndQuery);
}
[Fact]
public async Task PageFiltersAppliedToPageModel_AreExecuted()
{

11
test/WebSites/RazorPagesWebSite/Pages/Admin/Edit.cshtml Normal file
View File

@ -0,0 +1,11 @@
@page
@functions
{
public void OnPost()
{
}
}
<form method="post">
</form>