Skip to content
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

Jump to bottom

Update helper.py to fix #8785 #8786

Merged
merged 3 commits into from
Dec 12, 2023
Merged

Update helper.py to fix #8785 #8786

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a793eae
Update helper.py to fix #8785
devsecopsale Oct 3, 2023
fb3350e
Update helper.py
devsecopsale Oct 12, 2023
86e5d68
Update helper.py to fix flake8 issues
devsecopsale Nov 7, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
36 changes: 22 additions & 14 deletions dojo/jira_link/helper.py
View file
Open in desktop
Expand Up @@ -99,7 +99,7 @@ def can_be_pushed_to_jira(obj, form=None):
# findings or groups already having an existing jira issue can always be pushed
return True, None, None

if type(obj) == Finding:
if type(obj) is Finding:
if form:
active = form['active'].value()
verified = form['verified'].value()
Expand All @@ -122,7 +122,7 @@ def can_be_pushed_to_jira(obj, form=None):
if jira_minimum_threshold and jira_minimum_threshold > Finding.get_number_severity(severity):
logger.debug('Finding below the minimum JIRA severity threshold (%s).' % System_Settings.objects.get().jira_minimum_severity)
return False, 'Finding below the minimum JIRA severity threshold (%s).' % System_Settings.objects.get().jira_minimum_severity, 'below_minimum_threshold'
elif type(obj) == Finding_Group:
elif type(obj) is Finding_Group:
if not obj.findings.all():
return False, '%s cannot be pushed to jira as it is empty.' % to_str_typed(obj), 'error_empty'
if 'Active' not in obj.status():
Expand Down Expand Up @@ -521,10 +521,10 @@ def get_labels(obj):
labels.append(prod_name_label)

if system_settings.add_vulnerability_id_to_jira_label or jira_project and jira_project.add_vulnerability_id_to_jira_label:
if type(obj) == Finding and obj.vulnerability_ids:
if type(obj) is Finding and obj.vulnerability_ids:
for id in obj.vulnerability_ids:
labels.append(id)
elif type(obj) == Finding_Group:
elif type(obj) is Finding_Group:
for finding in obj.findings.all():
for id in finding.vulnerability_ids:
labels.append(id)
Expand All @@ -540,7 +540,7 @@ def get_tags(obj):
if obj_tags:
for tag in obj_tags:
tags.append(str(tag.name.replace(' ', '-')))
if type(obj) == Finding_Group:
if type(obj) is Finding_Group:
for finding in obj.findings.all():
obj_tags = finding.tags.all()
if obj_tags:
Expand All @@ -554,10 +554,10 @@ def get_tags(obj):
def jira_summary(obj):
summary = ''

if type(obj) == Finding:
if type(obj) is Finding:
summary = obj.title

if type(obj) == Finding_Group:
if type(obj) is Finding_Group:
summary = obj.name

return summary.replace('\r', '').replace('\n', '')[:255]
Expand All @@ -584,9 +584,9 @@ def jira_priority(obj):


def jira_environment(obj):
if type(obj) == Finding:
if type(obj) is Finding:
return "\n".join([str(endpoint) for endpoint in obj.endpoints.all()])
elif type(obj) == Finding_Group:
elif type(obj) is Finding_Group:
return "\n".join([jira_environment(finding) for finding in obj.findings.all()])
else:
return ''
Expand Down Expand Up @@ -660,6 +660,7 @@ def prepare_jira_issue_fields(
environment=None,
priority_name=None,
epic_name_field=None,
default_assignee=None,
duedate=None,
issuetype_fields=[]):

Expand Down Expand Up @@ -691,6 +692,9 @@ def prepare_jira_issue_fields(
if duedate and 'duedate' in issuetype_fields:
fields['duedate'] = duedate.strftime('%Y-%m-%d')

if default_assignee:
fields['assignee'] = {'name': default_assignee}

return fields


Expand All @@ -711,7 +715,7 @@ def add_jira_issue(obj, *args, **kwargs):

obj_can_be_pushed_to_jira, error_message, error_code = can_be_pushed_to_jira(obj)
if not obj_can_be_pushed_to_jira:
if type(obj) == Finding and obj.duplicate and not obj.active:
if type(obj) is Finding and obj.duplicate and not obj.active:
logger.warning("%s will not be pushed to JIRA as it's a duplicate finding", to_str_typed(obj))
else:
log_jira_alert(error_message, obj)
Expand Down Expand Up @@ -745,16 +749,20 @@ def add_jira_issue(obj, *args, **kwargs):
priority_name=jira_priority(obj),
epic_name_field=get_epic_name_field_name(jira_instance),
duedate=duedate,
issuetype_fields=issuetype_fields)
issuetype_fields=issuetype_fields,
default_assignee=jira_project.default_assignee)

logger.debug('sending fields to JIRA: %s', fields)
new_issue = jira.create_issue(fields)
if jira_project.default_assignee:
jira.assign_issue(new_issue.key, jira_project.default_assignee)
created_assignee = str(new_issue.get_field('assignee'))
logger.debug("new issue created with assignee %s", created_assignee)
if created_assignee != jira_project.default_assignee:
jira.assign_issue(new_issue.key, jira_project.default_assignee)

# Upload dojo finding screenshots to Jira
findings = [obj]
if type(obj) == Finding_Group:
if type(obj) is Finding_Group:
findings = obj.findings.all()

for find in findings:
Expand Down Expand Up @@ -876,7 +884,7 @@ def update_jira_issue(obj, *args, **kwargs):

# Upload dojo finding screenshots to Jira
findings = [obj]
if type(obj) == Finding_Group:
if type(obj) is Finding_Group:
findings = obj.findings.all()

for find in findings:
Expand Down