Skip to content

JIRA helper: respect simple/full risk acceptance on webhook processiing #12594

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
mtesauro merged 1 commit into from
Jun 12, 2025
Merged

JIRA helper: respect simple/full risk acceptance on webhook processiing #12594

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
21 changes: 13 additions & 8 deletions dojo/jira_link/helper.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1674,19 +1674,24 @@ def process_resolution_from_jira(finding, resolution_id, resolution_name, assign
jira_instance = get_jira_instance(finding)

if resolved:
if jira_instance and resolution_name in jira_instance.accepted_resolutions:
if jira_instance and resolution_name in jira_instance.accepted_resolutions and (finding.test.engagement.product.enable_simple_risk_acceptance or finding.test.engagement.enable_full_risk_acceptance):
if not finding.risk_accepted:
logger.debug(f"Marking related finding of {jira_issue.jira_key} as accepted. Creating risk acceptance.")
logger.debug(f"Marking related finding of {jira_issue.jira_key} as accepted.")
finding.risk_accepted = True
finding.active = False
finding.mitigated = None
finding.is_mitigated = False
finding.false_p = False
ra = Risk_Acceptance.objects.create(
accepted_by=assignee_name,
owner=finding.reporter,
)
finding.test.engagement.risk_acceptance.add(ra)
ra_helper.add_findings_to_risk_acceptance(User.objects.get_or_create(username="JIRA")[0], ra, [finding])

if finding.test.engagement.product.enable_full_risk_acceptance:
logger.debug(f"Creating risk acceptance for finding linked to {jira_issue.jira_key}.")
ra = Risk_Acceptance.objects.create(
accepted_by=assignee_name,
owner=finding.reporter,
decision_details=f"Risk Acceptance automatically created from JIRA issue {jira_issue.jira_key} with resolution {resolution_name}",
)
finding.test.engagement.risk_acceptance.add(ra)
ra_helper.add_findings_to_risk_acceptance(User.objects.get_or_create(username="JIRA")[0], ra, [finding])
status_changed = True
elif jira_instance and resolution_name in jira_instance.false_positive_resolutions:
if not finding.false_p:
Expand Down