Skip to content

Commit

Permalink
dissallow already linked issue (#11298)
Browse files Browse the repository at this point in the history
* dissallow already linked issue

* Update dojo/jira_link/helper.py

* Update dojo/api_v2/serializers.py

---------

Co-authored-by: Cody Maffucci <[email protected]>
hblankenship and Maffooch authored Dec 3, 2024

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature.
1 parent 100a52d commit cdc060e
Showing 2 changed files with 12 additions and 0 deletions.
5 changes: 5 additions & 0 deletions dojo/api_v2/serializers.py
Original file line number Diff line number Diff line change
@@ -1324,6 +1324,11 @@ def validate(self, data):
msg = "Either engagement or finding or finding_group has to be set."
raise serializers.ValidationError(msg)

if finding:
if (linked_finding := jira_helper.jira_already_linked(finding, data.get("jira_key"), data.get("jira_id"))) is not None:
msg = "JIRA issue " + data.get("jira_key") + " already linked to " + reverse("view_finding", args=(linked_finding.id,))
raise serializers.ValidationError(msg)

return data


7 changes: 7 additions & 0 deletions dojo/jira_link/helper.py
Original file line number Diff line number Diff line change
@@ -1428,6 +1428,13 @@ def add_simple_jira_comment(jira_instance, jira_issue, comment):
return False


def jira_already_linked(finding, jira_issue_key, jira_id) -> Finding | None:
jira_issues = JIRA_Issue.objects.filter(jira_id=jira_id, jira_key=jira_issue_key).exclude(engagement__isnull=False)
jira_issues = jira_issues.exclude(finding=finding)

return jira_issues.first()


def finding_link_jira(request, finding, new_jira_issue_key):
logger.debug("linking existing jira issue %s for finding %i", new_jira_issue_key, finding.id)

0 comments on commit cdc060e

Please sign in to comment.