Skip to content

Commit 358dde8

Browse files
MaffoochMaffooch
authored
Merge pull request DefectDojo#8679 from DefectDojo/release/2.26.3
Release: Merge release into master from: release/2.26.3
2 parents 82f26c3 + cbaca61 commit 358dde8

File tree

6 files changed

+47
-47
lines changed

6 files changed

+47
-47
lines changed

‎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.26.2",
3+
"version": "2.26.3",
44
"license" : "BSD-3-Clause",
55
"private": true,
66
"dependencies": {

‎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
66

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

‎dojo/templates/dojo/product.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -338,7 +338,7 @@ <h3 class="has-filters">
338338
},
339339
colReorder: true,
340340
"columns": [
341-
{ "data": "action" },
341+
{ "data": "action", "searchable": false },
342342
{ "data": "product" },
343343
{ "data": "tags" },
344344
{ "data": "criticality" , render: function (data, type, row) {

‎dojo/test/views.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
ReImportScanForm, JIRAFindingForm, JIRAImportScanForm, \
2626
FindingBulkUpdateForm, CopyTestForm
2727
from dojo.models import IMPORT_UNTOUCHED_FINDING, Finding, Finding_Group, Test, Note_Type, BurpRawRequestResponse, Endpoint, Stub_Finding, \
28-
Finding_Template, Cred_Mapping, System_Settings, Test_Import, Product_API_Scan_Configuration, Test_Import_Finding_Action
28+
Finding_Template, Cred_Mapping, Test_Import, Product_API_Scan_Configuration, Test_Import_Finding_Action
2929

3030
from dojo.tools.factory import get_choices_sorted, get_scan_types_sorted
3131
from dojo.utils import add_error_message_to_response, add_field_errors_to_response, add_success_message_to_response, get_page_items, get_page_items_and_count, add_breadcrumb, get_cal_event, process_notifications, get_system_setting, \
@@ -74,7 +74,6 @@ def view_test(request, tid):
7474
stub_findings = Stub_Finding.objects.filter(test=test)
7575
cred_test = Cred_Mapping.objects.filter(test=test).select_related('cred_id').order_by('cred_id')
7676
creds = Cred_Mapping.objects.filter(engagement=test.engagement).select_related('cred_id').order_by('cred_id')
77-
system_settings = get_object_or_404(System_Settings, id=1)
7877
if request.method == 'POST':
7978
user_has_permission_or_403(request.user, test, Permissions.Note_Add)
8079
if note_type_activation:

‎dojo/tools/anchorectl_policies/parser.py

Lines changed: 41 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -30,46 +30,47 @@ def get_findings(self, filename, test):
3030
items = list()
3131
try:
3232
for image in data:
33-
for result in image["detail"]:
34-
try:
35-
gate = result["gate"]
36-
description = result["description"]
37-
policy_id = result["policyId"]
38-
status = result["status"]
39-
image_name = result["tag"]
40-
trigger_id = result["triggerId"]
41-
repo, tag = image_name.split(":", 2)
42-
severity = map_gate_action_to_severity(status)
43-
vulnerability_id = extract_vulnerability_id(trigger_id)
44-
title = (
45-
policy_id
46-
+ " - gate|"
47-
+ gate
48-
+ " - trigger|"
49-
+ trigger_id
50-
)
51-
find = Finding(
52-
title=title,
53-
test=test,
54-
description=description,
55-
severity=severity,
56-
references="Policy ID: {}\nTrigger ID: {}".format(
57-
policy_id, trigger_id
58-
),
59-
file_path=search_filepath(description),
60-
component_name=repo,
61-
component_version=tag,
62-
date=find_date,
63-
static_finding=True,
64-
dynamic_finding=False,
65-
)
66-
if vulnerability_id:
67-
find.unsaved_vulnerability_ids = [vulnerability_id]
68-
items.append(find)
69-
except (KeyError, IndexError) as err:
70-
raise ValueError(
71-
"Invalid format: {} key not found".format(err)
72-
)
33+
if image['detail'] is not None:
34+
for result in image["detail"]:
35+
try:
36+
gate = result["gate"]
37+
description = result["description"]
38+
policy_id = result["policyId"]
39+
status = result["status"]
40+
image_name = result["tag"]
41+
trigger_id = result["triggerId"]
42+
repo, tag = image_name.split(":", 2)
43+
severity = map_gate_action_to_severity(status)
44+
vulnerability_id = extract_vulnerability_id(trigger_id)
45+
title = (
46+
policy_id
47+
+ " - gate|"
48+
+ gate
49+
+ " - trigger|"
50+
+ trigger_id
51+
)
52+
find = Finding(
53+
title=title,
54+
test=test,
55+
description=description,
56+
severity=severity,
57+
references="Policy ID: {}\nTrigger ID: {}".format(
58+
policy_id, trigger_id
59+
),
60+
file_path=search_filepath(description),
61+
component_name=repo,
62+
component_version=tag,
63+
date=find_date,
64+
static_finding=True,
65+
dynamic_finding=False,
66+
)
67+
if vulnerability_id:
68+
find.unsaved_vulnerability_ids = [vulnerability_id]
69+
items.append(find)
70+
except (KeyError, IndexError) as err:
71+
raise ValueError(
72+
"Invalid format: {} key not found".format(err)
73+
)
7374
except AttributeError as err:
7475
# import empty policies without error (e.g. policies or images
7576
# objects are not a dictionary)

‎helm/defectdojo/Chart.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
apiVersion: v2
2-
appVersion: "2.26.2"
2+
appVersion: "2.26.3"
33
description: A Helm chart for Kubernetes to install DefectDojo
44
name: defectdojo
5-
version: 1.6.86
5+
version: 1.6.87
66
icon: https://www.defectdojo.org/img/favicon.ico
77
maintainers:
88
- name: madchap

0 commit comments

Comments
 (0)