Skip to content

fix(risk_acceptance): reinstate findings when expiration date updated via API #15147

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

Open
Jino-T wants to merge 1 commit into
base: bugfix
Choose a base branch
from
+4 −0
Open

fix(risk_acceptance): reinstate findings when expiration date updated via API #15147

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 4 additions & 0 deletions dojo/api_v2/serializers.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1158,6 +1158,7 @@ def update(self, instance, validated_data):
findings_to_remove = set(existing_findings) - set(new_findings)
findings_to_add = Finding.objects.filter(id__in=[x.id for x in findings_to_add])
findings_to_remove = Finding.objects.filter(id__in=[x.id for x in findings_to_remove])
old_expiration_date = self.instance.expiration_date
# Make the update in the database
instance = super().update(instance, validated_data)
user = getattr(self.context.get("request", None), "user", None)
Expand All @@ -1167,6 +1168,9 @@ def update(self, instance, validated_data):
for finding in findings_to_remove:
ra_helper.remove_finding_from_risk_acceptance(user, instance, finding)

if instance.expiration_date != old_expiration_date:
ra_helper.reinstate(instance, old_expiration_date)

# Handle orphaned risk acceptances: link to engagement if it now has findings
# This is fine as Pro has its own model + relationshop to track links with engagements.
if instance.accepted_findings.exists() and not instance.engagement:
Expand Down
Loading