Skip to content
Draft
Changes from all commits
Commits
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
16 changes: 12 additions & 4 deletions roles/lib/files/FWO.Compliance/ComplianceCheck.cs
Original file line number Diff line number Diff line change
Expand Up @@ -587,8 +587,8 @@ public static List<Management> GetRelevantManagements(GlobalConfig globalConfig,

private async Task<bool> CheckMatrixCompliance(Rule rule, ComplianceCriterion criterion, List<NetworkObject> resolvedSources, List<NetworkObject> resolvedDestinations)
{
Task<List<(NetworkObject networkObject, List<IPAddressRange> ipRanges)>> fromsTask = GetNetworkObjectsWithIpRanges(resolvedSources);
Task<List<(NetworkObject networkObject, List<IPAddressRange> ipRanges)>> tosTask = GetNetworkObjectsWithIpRanges(resolvedDestinations);
Task<List<(NetworkObject networkObject, List<IPAddressRange> ipRanges)>> fromsTask = GetNetworkObjectsWithIpRanges(resolvedSources, negated: rule.SourceNegated);
Task<List<(NetworkObject networkObject, List<IPAddressRange> ipRanges)>> tosTask = GetNetworkObjectsWithIpRanges(resolvedDestinations, negated: rule.DestinationNegated);

await Task.WhenAll(fromsTask, tosTask);

Expand Down Expand Up @@ -750,13 +750,21 @@ private bool CheckForForbiddenService(Rule rule, ComplianceCriterion criterion)
return ruleIsCompliant;
}

private static Task<List<(NetworkObject networkObject, List<IPAddressRange> ipRanges)>> GetNetworkObjectsWithIpRanges(List<NetworkObject> networkObjects)
private static Task<List<(NetworkObject networkObject, List<IPAddressRange> ipRanges)>> GetNetworkObjectsWithIpRanges(List<NetworkObject> networkObjects, string? fullRangeString = "0.0.0.0/0", bool negated = false)
{
List<(NetworkObject networkObject, List<IPAddressRange> ipRanges)> networkObjectsWithIpRange = [];

foreach (NetworkObject networkObject in networkObjects)
{
networkObjectsWithIpRange.Add((networkObject, ParseIpRange(networkObject)));
List<IPAddressRange> ranges = ParseIpRange(networkObject);

if (negated)
{
IPAddressRange fullRange = IPAddressRange.Parse(fullRangeString);
ranges = fullRange.Subtract(ranges);
}

networkObjectsWithIpRange.Add((networkObject, ranges));
}

return Task.FromResult(networkObjectsWithIpRange);
Expand Down
Loading