Skip to content
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

[ODS-3401] Cycles in claims taxonomy (security metadata for resource claims) causes requests to hang #993

Merged
merged 14 commits into from
Mar 8, 2024
Merged

[ODS-3401] Cycles in claims taxonomy (security metadata for resource claims) causes requests to hang #993

Changes from 5 commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
9762658
Implement validation of resource claim lineage
mjaksn Mar 5, 2024
88ab693
Empty-commit
mjaksn Mar 5, 2024
2315f4b
Fix unit tests
mjaksn Mar 5, 2024
7ea64e0
Refactor implementation
mjaksn Mar 5, 2024
0b578c7
Cleanup
mjaksn Mar 5, 2024
8723099
Switch HashSet to List and improve error message detail
mjaksn Mar 5, 2024
813d2f8
Add unit test
mjaksn Mar 5, 2024
4ab3b19
Fix error message
mjaksn Mar 5, 2024
70f4abf
Fix recursion logic
mjaksn Mar 5, 2024
0beab6d
Use consistent arrows in error message
mjaksn Mar 6, 2024
644a964
Check error message content in unit test
mjaksn Mar 6, 2024
58a5237
Fix unit test
mjaksn Mar 7, 2024
9a4ad5d
Update Contains statement to use Resource Claim name
mjaksn Mar 8, 2024
ba1758f
Address changes
mjaksn Mar 8, 2024
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
12 changes: 7 additions & 5 deletions Application/EdFi.Security.DataAccess/Repositories/SecurityRepository.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,6 @@ public virtual AuthorizationStrategy GetAuthorizationStrategyByName(string autho

public virtual IList<ClaimSetResourceClaimAction> GetClaimsForClaimSet(string claimSetName)
{

return _securityTableGateway.GetClaimSetResourceClaimActions()
.Where(c => c.ClaimSet.ClaimSetName.Equals(claimSetName, StringComparison.OrdinalIgnoreCase))
.ToList();
Expand All @@ -54,9 +53,9 @@ public virtual IList<string> GetResourceClaimLineage(string resourceClaimUri)
.ToList();
}

private IEnumerable<ResourceClaim> GetResourceClaimLineageForResourceClaim(string resourceClaimUri)
private IEnumerable<ResourceClaim> GetResourceClaimLineageForResourceClaim(string resourceClaimUri, HashSet<ResourceClaim> resourceClaimLineage = null)
{
var resourceClaimLineage = new List<ResourceClaim>();
resourceClaimLineage ??= new HashSet<ResourceClaim>();

ResourceClaim resourceClaim;

Expand All @@ -74,11 +73,14 @@ private IEnumerable<ResourceClaim> GetResourceClaimLineageForResourceClaim(strin

if (resourceClaim != null)
{
resourceClaimLineage.Add(resourceClaim);
if (!resourceClaimLineage.Add(resourceClaim))
{
throw new InvalidOperationException($"The lineage for resource claim '{resourceClaimUri}' is not well-formed. A cycle was detected in the resource claim lineage.");
}

if (resourceClaim.ParentResourceClaim != null)
{
resourceClaimLineage.AddRange(GetResourceClaimLineageForResourceClaim(resourceClaim.ParentResourceClaim.ClaimName));
resourceClaimLineage.UnionWith(GetResourceClaimLineageForResourceClaim(resourceClaim.ParentResourceClaim.ClaimName, resourceClaimLineage));
}
}

Expand Down
Loading