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

Fix missing Trim in Roles and Schemes split

This commit is contained in:
Vincent Lainé 2015-12-28 14:47:15 +01:00
parent 2d21b72561
commit 6850e3b3b6
2 changed files with 40 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/Microsoft.AspNet.Authorization/AuthorizationPolicy.cs
View File

@ -88,6 +88,9 @@ namespace Microsoft.AspNet.Authorization
var rolesSplit = authorizeAttribute.Roles?.Split(',');
if (rolesSplit != null && rolesSplit.Any())
{
for (int i = 0; i < rolesSplit.Length; ++i)
rolesSplit[i] = rolesSplit[i]?.Trim();
policyBuilder.RequireRole(rolesSplit);
useDefaultPolicy = false;
}
@ -96,7 +99,9 @@ namespace Microsoft.AspNet.Authorization
{
foreach (var authType in authTypesSplit)
{
policyBuilder.AuthenticationSchemes.Add(authType);
if (string.IsNullOrEmpty(authType))
continue;
policyBuilder.AuthenticationSchemes.Add(authType.Trim());
}
}
if (useDefaultPolicy)

34
test/Microsoft.AspNet.Authorization.Test/AuthorizationPolicyFacts.cs
View File

@ -67,5 +67,39 @@ namespace Microsoft.AspNet.Authroization.Test
Assert.False(combined.Requirements.Any(r => r is DenyAnonymousAuthorizationRequirement));
Assert.Equal(2, combined.Requirements.OfType<ClaimsAuthorizationRequirement>().Count());
}
[Fact]
public void CombineMustTrimRoles()
{
// Arrange
var attributes = new AuthorizeAttribute[] {
new AuthorizeAttribute("2") { Roles = "r1 , r2" }
};
var options = new AuthorizationOptions();
var combined = AuthorizationPolicy.Combine(options, attributes);
Assert.True(combined.Requirements.Any(r => r is RolesAuthorizationRequirement));
var rolesAuthorizationRequirement = combined.Requirements.OfType<RolesAuthorizationRequirement>().First();
Assert.Equal(2, rolesAuthorizationRequirement.AllowedRoles.Count());
Assert.True(rolesAuthorizationRequirement.AllowedRoles.Any(r => r.Equals("r1")));
Assert.True(rolesAuthorizationRequirement.AllowedRoles.Any(r => r.Equals("r2")));
}
[Fact]
public void CombineMustTrimAuthenticationScheme()
{
// Arrange
var attributes = new AuthorizeAttribute[] {
new AuthorizeAttribute("2") { ActiveAuthenticationSchemes = "a1 , a2" }
};
var options = new AuthorizationOptions();
var combined = AuthorizationPolicy.Combine(options, attributes);
Assert.Equal(2, combined.AuthenticationSchemes.Count());
Assert.True(combined.AuthenticationSchemes.Any(a => a.Equals("a1")));
Assert.True(combined.AuthenticationSchemes.Any(a => a.Equals("a2")));
}
}
}