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

Fix coding style and handle case where empty roles & schemes are empty

This commit is contained in:
Vincent Lainé 2015-12-28 23:57:42 +01:00
parent ee6a57e9a2
commit 9a5da5861b
2 changed files with 53 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -85,23 +85,27 @@ namespace Microsoft.AspNet.Authorization
policyBuilder.Combine(policy); policyBuilder.Combine(policy);
useDefaultPolicy = false; useDefaultPolicy = false;
} }
var rolesSplit = authorizeAttribute.Roles?.Split(','); var rolesSplit = authorizeAttribute.Roles?.Split(new char[] { ',' }, StringSplitOptions.RemoveEmptyEntries);
if (rolesSplit != null && rolesSplit.Any()) if (rolesSplit != null && rolesSplit.Any())
{ {
for (int i = 0; i < rolesSplit.Length; ++i) for (int i = 0; i < rolesSplit.Length; ++i)
rolesSplit[i] = rolesSplit[i]?.Trim(); {
rolesSplit[i] = rolesSplit[i].Trim();
}
policyBuilder.RequireRole(rolesSplit); policyBuilder.RequireRole(rolesSplit.Where(r => !string.IsNullOrWhiteSpace(r)));
useDefaultPolicy = false; useDefaultPolicy = false;
} }
var authTypesSplit = authorizeAttribute.ActiveAuthenticationSchemes?.Split(','); var authTypesSplit = authorizeAttribute.ActiveAuthenticationSchemes?.Split(new char[] { ',' }, StringSplitOptions.RemoveEmptyEntries);
if (authTypesSplit != null && authTypesSplit.Any()) if (authTypesSplit != null && authTypesSplit.Any())
{ {
foreach (var authType in authTypesSplit) foreach (var authType in authTypesSplit)
{ {
if (string.IsNullOrEmpty(authType)) var trimmedAuthType = authType.Trim();
continue; if(!string.IsNullOrWhiteSpace(trimmedAuthType))
policyBuilder.AuthenticationSchemes.Add(authType.Trim()); {
policyBuilder.AuthenticationSchemes.Add(trimmedAuthType);
}
} }
} }
if (useDefaultPolicy) if (useDefaultPolicy)

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

@ -77,8 +77,10 @@ namespace Microsoft.AspNet.Authroization.Test
}; };
var options = new AuthorizationOptions(); var options = new AuthorizationOptions();
// Act
var combined = AuthorizationPolicy.Combine(options, attributes); var combined = AuthorizationPolicy.Combine(options, attributes);
// Assert
Assert.True(combined.Requirements.Any(r => r is RolesAuthorizationRequirement)); Assert.True(combined.Requirements.Any(r => r is RolesAuthorizationRequirement));
var rolesAuthorizationRequirement = combined.Requirements.OfType<RolesAuthorizationRequirement>().First(); var rolesAuthorizationRequirement = combined.Requirements.OfType<RolesAuthorizationRequirement>().First();
Assert.Equal(2, rolesAuthorizationRequirement.AllowedRoles.Count()); Assert.Equal(2, rolesAuthorizationRequirement.AllowedRoles.Count());
@ -95,11 +97,51 @@ namespace Microsoft.AspNet.Authroization.Test
}; };
var options = new AuthorizationOptions(); var options = new AuthorizationOptions();
// Act
var combined = AuthorizationPolicy.Combine(options, attributes); var combined = AuthorizationPolicy.Combine(options, attributes);
// Assert
Assert.Equal(2, combined.AuthenticationSchemes.Count()); Assert.Equal(2, combined.AuthenticationSchemes.Count());
Assert.True(combined.AuthenticationSchemes.Any(a => a.Equals("a1"))); Assert.True(combined.AuthenticationSchemes.Any(a => a.Equals("a1")));
Assert.True(combined.AuthenticationSchemes.Any(a => a.Equals("a2"))); Assert.True(combined.AuthenticationSchemes.Any(a => a.Equals("a2")));
} }
[Fact]
public void CombineMustIgnoreEmptyAuthenticationScheme()
{
// Arrange
var attributes = new AuthorizeAttribute[] {
new AuthorizeAttribute() { ActiveAuthenticationSchemes = "a1 , , ,,, a2" }
};
var options = new AuthorizationOptions();
// Act
var combined = AuthorizationPolicy.Combine(options, attributes);
// Assert
Assert.Equal(2, combined.AuthenticationSchemes.Count());
Assert.True(combined.AuthenticationSchemes.Any(a => a.Equals("a1")));
Assert.True(combined.AuthenticationSchemes.Any(a => a.Equals("a2")));
}
[Fact]
public void CombineMustIgnoreEmptyRoles()
{
// Arrange
var attributes = new AuthorizeAttribute[] {
new AuthorizeAttribute() { Roles = "r1 , ,, , r2" }
};
var options = new AuthorizationOptions();
// Act
var combined = AuthorizationPolicy.Combine(options, attributes);
// Assert
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")));
}
} }
} }