Skip to content

Commit bfa20c9

Browse files
MaffoochMaffooch
authored
Merge pull request #10417 from DefectDojo/release/2.35.3
Release: Merge release into master from: release/2.35.3
2 parents ba2003c + 955e43a commit bfa20c9

13 files changed

Lines changed: 96 additions & 32 deletions

File tree

‎.github/ISSUE_TEMPLATE/bug_report.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ assignees: ''
77

88
---
99
**Slack us first!**
10-
The easiest and fastest way to help you is via Slack. There's a free and easy signup to join our #defectdojo channel in the OWASP Slack workspace: [Get Access.](https://owasp-slack.herokuapp.com/)
10+
The easiest and fastest way to help you is via Slack. There's a free and easy signup to join our #defectdojo channel in the OWASP Slack workspace: [Get Access.](https://owasp.org/slack/invite)
1111
If you're confident you've found a bug, or are allergic to Slack, you can submit an issue anyway.
1212

1313
**Be informative**

‎components/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "defectdojo",
3-
"version": "2.35.2",
3+
"version": "2.35.3",
44
"license" : "BSD-3-Clause",
55
"private": true,
66
"dependencies": {

‎docs/package-lock.json‎

Lines changed: 14 additions & 14 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎dojo/__init__.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,6 @@
44
# Django starts so that shared_task will use this app.
55
from .celery import app as celery_app # noqa: F401
66

7-
__version__ = '2.35.2'
7+
__version__ = '2.35.3'
88
__url__ = 'https://github.com/DefectDojo/django-DefectDojo'
99
__docs__ = 'https://documentation.defectdojo.com'

‎dojo/notifications/helper.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -127,11 +127,11 @@ def create_notification(event=None, **kwargs):
127127
def create_description(event, *args, **kwargs):
128128
if "description" not in kwargs.keys():
129129
if event == 'product_added':
130-
kwargs["description"] = _('Product {title} has been created successfully.'.format(title=kwargs['title']))
130+
kwargs["description"] = _('Product %s has been created successfully.') % kwargs['title']
131131
elif event == 'product_type_added':
132-
kwargs["description"] = _('Product Type {title} has been created successfully.'.format(title=kwargs['title']))
132+
kwargs["description"] = _('Product Type %s has been created successfully.') % kwargs['title']
133133
else:
134-
kwargs["description"] = _('Event {event} has occurred.'.format(event=str(event)))
134+
kwargs["description"] = _('Event %s has occurred.') % str(event)
135135

136136
return kwargs["description"]
137137

‎dojo/settings/.settings.dist.py.sha256sum‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
c0f6db3774e94fcfd22a5861d47e42cdd52839d01dd99ce361ecfd44f42b221c
1+
e9aab91c011f6aa1933791c57e7c37b165e5369606c459f772c4269c56212b53

‎dojo/settings/settings.dist.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1222,7 +1222,7 @@ def saml2_attrib_map_format(dict):
12221222
'DSOP Scan': ['vulnerability_ids'],
12231223
'Acunetix Scan': ['title', 'description'],
12241224
'Terrascan Scan': ['vuln_id_from_tool', 'title', 'severity', 'file_path', 'line', 'component_name'],
1225-
'Trivy Operator Scan': ['title', 'severity', 'vulnerability_ids'],
1225+
'Trivy Operator Scan': ['title', 'severity', 'vulnerability_ids', 'description'],
12261226
'Trivy Scan': ['title', 'severity', 'vulnerability_ids', 'cwe', 'description'],
12271227
'TFSec Scan': ['severity', 'vuln_id_from_tool', 'file_path', 'line'],
12281228
'Snyk Scan': ['vuln_id_from_tool', 'file_path', 'component_name', 'component_version'],

‎dojo/templates/issue-trackers/jira_full/jira-finding-group-description.tpl‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
{% load navigation_tags %}
22
{% load display_tags %}
33
{% url 'view_finding_group' finding_group.id as finding_group_url %}
4-
{% url 'view_product' finding.test.engagement.product.id as product_url %}
5-
{% url 'view_engagement' finding.test.engagement.id as engagement_url %}
6-
{% url 'view_test' finding.test.id as test_url %}
4+
{% url 'view_product' finding_group.test.engagement.product.id as product_url %}
5+
{% url 'view_engagement' finding_group.test.engagement.id as engagement_url %}
6+
{% url 'view_test' finding_group.test.id as test_url %}
77

88
A group of Findings has been pushed to JIRA to be investigated and fixed:
99

@@ -12,7 +12,7 @@ h2. Group
1212

1313

1414
|| Severity || CVE || CWE || Component || Version || Title || Status ||{% for finding in finding_group.findings.all %}
15-
| {{finding.severity}} | {% if finding.cve %}[{{finding.cve}}|{{finding.cve|vulnerability_url}}]{% else %}None{% endif %} | [{{finding.cwe}}|{{finding.cwe|cwe_url}}] | {{finding.component_name|jiraencode_component}} | {{finding.component_version}} | [{{ finding.title|jiraencode}}|{{ finding_url|full_url }}] | {{ finding.status }} |{% endfor %}
15+
| {{finding.severity}} | {% if finding.cve %}[{{finding.cve}}|{{finding.cve|vulnerability_url}}]{% else %}None{% endif %} | [{{finding.cwe}}|{{finding.cwe|cwe_url}}] | {{finding.component_name|jiraencode_component}} | {{finding.component_version}} | {% url 'view_finding' finding.id as finding_url %}[{{ finding.title|jiraencode}}|{{ finding_url|full_url }}] | {{ finding.status }} |{% endfor %}
1616

1717
*Severity:* {{ finding_group.severity }}
1818

‎dojo/templates/issue-trackers/jira_limited/jira-finding-group-description.tpl‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,17 @@
11
{% load navigation_tags %}
22
{% load display_tags %}
33
{% url 'view_finding_group' finding_group.id as finding_group_url %}
4-
{% url 'view_product' finding.test.engagement.product.id as product_url %}
5-
{% url 'view_engagement' finding.test.engagement.id as engagement_url %}
6-
{% url 'view_test' finding.test.id as test_url %}
4+
{% url 'view_product' finding_group.test.engagement.product.id as product_url %}
5+
{% url 'view_engagement' finding_group.test.engagement.id as engagement_url %}
6+
{% url 'view_test' finding_group.test.id as test_url %}
77

88
A group of Findings has been pushed to JIRA to be investigated and fixed:
99

1010
*Group*: [{{ finding_group.name|jiraencode}}|{{ finding_group_url|full_url }}] in [{{ finding_group.test.engagement.product.name|jiraencode }}|{{ product_url|full_url }}] / [{{ finding_group.test.engagement.name|jiraencode }}|{{ engagement_url|full_url }}] / [{{ finding_group.test|stringformat:'s'|jiraencode }}|{{ test_url|full_url }}]
1111

1212
Findings:
1313
{% for finding in finding_group.findings.all %}
14+
{% url 'view_finding' finding.id as finding_url %}
1415
- [{{ finding.title|jiraencode}}|{{ finding_url|full_url }}]{% endfor %}
1516

1617
{% if finding_group.test.engagement.branch_tag %}

‎dojo/tools/acunetix/parse_acunetix360_json.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ def get_findings(self, filename, test):
1919
for item in data["Vulnerabilities"]:
2020
title = item["Name"]
2121
findingdetail = text_maker.handle(item.get("Description", ""))
22-
if "Cwe" in item["Classification"]:
22+
if item["Classification"] is not None and "Cwe" in item["Classification"]:
2323
try:
2424
cwe = int(item["Classification"]["Cwe"].split(",")[0])
2525
except BaseException:

0 commit comments

Comments
 (0)