Skip to content

Adds the ability to support list of claim values, of the same claim type #46464

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
DefinitelyADev wants to merge 11 commits into from
Closed

Adds the ability to support list of claim values, of the same claim type #46464

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
2c77b33
add support for an array of claim values in the hasclaim method
DefinitelyADev Dec 30, 2020
76ed524
Add test
DefinitelyADev Dec 30, 2020
bd75522
add a using
DefinitelyADev Dec 30, 2020
3292468
improve checks to support claims with "["
DefinitelyADev Dec 30, 2020
35dff0d
add more tests
DefinitelyADev Dec 30, 2020
2f2944a
fix brackets
DefinitelyADev Dec 30, 2020
4cca94c
fix zero with utf8 character
DefinitelyADev Dec 30, 2020
632382b
fix zero with utf8 character second try...
DefinitelyADev Dec 30, 2020
72edfff
add json ref
DefinitelyADev Dec 30, 2020
f57101e
remove null check
DefinitelyADev Dec 30, 2020
cbd2527
fixed a bug that returns false before checking the rest claims and im…
DefinitelyADev Dec 30, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions src/libraries/System.Security.Claims/src/System.Security.Claims.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,5 +18,6 @@
<Reference Include="System.Runtime.Extensions" />
<Reference Include="System.Security.Principal" />
<Reference Include="System.Threading.Thread" />
<Reference Include="System.Text.Json" />
</ItemGroup>
</Project>
35 changes: 30 additions & 5 deletions src/libraries/System.Security.Claims/src/System/Security/Claims/ClaimsIdentity.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
using System.IO;
using System.Runtime.Serialization;
using System.Security.Principal;
using System.Text.Json;

namespace System.Security.Claims
{
Expand Down Expand Up @@ -698,14 +699,38 @@ public virtual bool HasClaim(string type, string value)

foreach (Claim claim in Claims)
{
if (claim != null
&& string.Equals(claim.Type, type, StringComparison.OrdinalIgnoreCase)
&& string.Equals(claim.Value, value, StringComparison.Ordinal))
if (string.Equals(claim.Type, type, StringComparison.OrdinalIgnoreCase))
{
return true;
if (claim.Value != null)
{
if (string.Equals(claim.Value, value, StringComparison.Ordinal))
{
return true;
}
else if (claim.Value.Trim().StartsWith("[") && claim.Value.Trim().EndsWith("]"))
{
try
{
string[]? claimValues = JsonSerializer.Deserialize<string[]>(claim.Value.ToString());

if (claimValues != null)
{
foreach (string claimValue in claimValues)
{
if (string.Equals(claimValue, value, StringComparison.Ordinal))
{
return true;
}
}
}
}
catch (JsonException)
{
}
}
}
}
}

return false;
}

Expand Down
23 changes: 23 additions & 0 deletions src/libraries/System.Security.Claims/tests/ClaimsIdentityTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -506,6 +506,29 @@ public void HasClaim_TypeValue()
Assert.False(id.HasClaim("claim_type", "Xclaim_value"));
}

[Fact]
public void HasClaim_TypeArrayValue()
{
var id = new ClaimsIdentity(
new[] {
new Claim ("claim_type", "claim_value"),
new Claim ("multi_value_type", "[\"claim_value1\",\"claim_value2\"]"),
new Claim ("claim_type_with_symbol", "[claim_value]"),
}, "test_authority");

Assert.True(id.HasClaim("claim_type_with_symbol", "[claim_value]"));
Assert.True(id.HasClaim("Claim_type_with_symbOl", "[claim_value]"));
Assert.True(id.HasClaim("multi_value_type", "claim_value1"));
Assert.True(id.HasClaim("multi_value_type", "claim_value2"));
Assert.True(id.HasClaim("multi_Value_tyPe", "claim_value1"));
Assert.True(id.HasClaim("mUlti_vaLue_type", "claim_value2"));
Assert.False(id.HasClaim("claim_type_with_symbol", "claim_value1"));
Assert.False(id.HasClaim("claim_type_with_symbol", "[clAim_vaLue]"));
Assert.False(id.HasClaim("multi_value_type", "cLaIm_VaLuE1"));
Assert.False(id.HasClaim("Xmulti_value_type", "claim_value1"));
Assert.False(id.HasClaim("multi_value_type", "Xclaim_value1"));
}

[Serializable]
private sealed class CustomClaimsIdentity : ClaimsIdentity, ISerializable
{
Expand Down