Skip to content

fix(policy): Update violation remediation logic and enhance tests #175

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

Merged
merged 2 commits into from
Jun 30, 2025
Merged

fix(policy): Update violation remediation logic and enhance tests #175

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
97a2f3b
fix(policy): Update violation remediation logic and enhance tests for…
GeekMasher Jun 27, 2025
6eebc22
style: Update formatting
GeekMasher Jun 27, 2025
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
2 changes: 1 addition & 1 deletion ghascompliance/policy.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -328,7 +328,7 @@ def checkViolation(
severity, remediate_policy, creation_time
)
if self.policy.get(technology, {}).get("level"):
return violation_remediation and self.checkViolationAgainstPolicy(
return violation_remediation or self.checkViolationAgainstPolicy(
severity, technology, names=names, ids=ids
)
else:
Expand Down
45 changes: 45 additions & 0 deletions tests/test_policy_remediate.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ def setUp(self):
self.example = {
"general": {"remediate": {"error": 1}},
"codescanning": {"level": "error"},
"dependabot": {"level": "critical"},
}

return super().setUp()
Expand Down Expand Up @@ -46,6 +47,12 @@ def testOverwritingPolicies(self):
self.policy.policy.get("dependabot", {}).get("remediate"),
my_policy.get("dependabot", {}).get("remediate"),
)
self.assertEqual(
self.policy.policy.get("codescanning", {})
.get("remediate", {})
.get("error"),
1,
)

self.assertEqual(
self.policy.policy.get("dependabot", {}).get("remediate", {}).get("high"), 7
Expand Down Expand Up @@ -116,3 +123,41 @@ def testUnspecifiedSeverity(self):
sevendaysago,
)
self.assertTrue(result)

def testDepdendabotRemediationUsingGeneral(self):
self.policy.loadPolicy(self.example)

self.assertEqual(
self.policy.policy.get("dependabot", {}).get("remediate"),
self.policy.policy.get("general", {}).get("remediate"),
)
self.assertEqual(
self.policy.policy.get("dependabot", {}).get("remediate", {}).get("error"),
1,
)

five_days_ago = datetime.datetime.now() - datetime.timedelta(days=5)

result = self.policy.checkViolationRemediation(
"error",
self.policy.policy.get("dependabot", {}).get("remediate"),
five_days_ago,
)
self.assertTrue(result)

def testCheckViolationWithRemediationUsingDependabotAlert(self):
self.policy.loadPolicy(self.example)

five_days_ago = datetime.datetime.now() - datetime.timedelta(days=5)

result = self.policy.checkViolation(
"error", "dependabot", names=["test"], creation_time=five_days_ago
)
self.assertTrue(result)

today = datetime.datetime.now()

result = self.policy.checkViolation(
"error", "dependabot", names=["test"], creation_time=today
)
self.assertFalse(result)
Loading