Skip to content

Commit 7d51357

Browse files
kiblikkiblik
committed
Quotes
1 parent 7b81a16 commit 7d51357

File tree

7 files changed

+75
-22
lines changed

7 files changed

+75
-22
lines changed

‎dojo/templates/notifications/webhooks/subtemplates/base.tpl‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
{% load display_tags %}
22
---
3-
description: "{{ description | default_if_none:'' }}"
4-
title: "{{ title | default_if_none:'' }}"
5-
user: {{ user | default_if_none:'' }}
3+
description: "{{ description | default_if_none:'' | tojson }}"
4+
title: "{{ title | default_if_none:'' | tojson }}"
5+
user: {{ user | default_if_none:'' | tojson }}
66
{% if url %}
7-
url_ui: {{ url|full_url }}
7+
url_ui: {{ url | full_url | tojson }}
88
{% endif %}
99
{% if url_api %}
10-
url_api: {{ url_api|full_url }}
10+
url_api: {{ url_api | full_url | tojson }}
1111
{% endif %}
1212
{% if system_settings.disclaimer_notifications and system_settings.disclaimer_notifications.strip %}
13-
disclaimer: {{ system_settings.disclaimer_notifications }}
13+
disclaimer: {{ system_settings.disclaimer_notifications | tojson }}
1414
{% endif %}

‎dojo/templates/notifications/webhooks/subtemplates/engagement.tpl‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
{% url 'view_engagement' engagement.id as engagement_url_ui %}
88
{% url 'engagement-detail' engagement.id as engagement_url_api %}
99
engagement:
10-
name: {{ engagement.name | default_if_none:'' }}
10+
name: {{ engagement.name | default_if_none:'' | tojson }}
1111
id: {{ engagement.pk }}
12-
url_ui: {{ engagement_url_ui|full_url }}
13-
url_api: {{ engagement_url_api|full_url }}
12+
url_ui: {{ engagement_url_ui | full_url | tojson }}
13+
url_api: {{ engagement_url_api | full_url | tojson }}

‎dojo/templates/notifications/webhooks/subtemplates/findings_list.tpl‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@
33
{% url 'view_finding' finding.id as finding_url_ui %}
44
{% url 'finding-detail' finding.id as finding_url_api %}
55
- id: {{ finding.pk }}
6-
title: {{ finding.title | default_if_none:'' }}
7-
severity: {{ finding.severity | default_if_none:'' }}
8-
url_ui: {{ finding_url_ui|full_url }}
9-
url_api: {{ finding_url_api|full_url }}
6+
title: {{ finding.title | default_if_none:'' | tojson }}
7+
severity: {{ finding.severity | default_if_none:'' | tojson }}
8+
url_ui: {{ finding_url_ui | full_url | tojson }}
9+
url_api: {{ finding_url_api | full_url | tojson }}
1010
{% empty %}
1111
[]
1212
{% endfor %}

‎dojo/templates/notifications/webhooks/subtemplates/product.tpl‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
{% url 'view_product' product.id as product_url_ui %}
88
{% url 'product-detail' product.id as product_url_api %}
99
product:
10-
name: {{ product.name | default_if_none:'' }}
10+
name: {{ product.name | default_if_none:'' | tojson }}
1111
id: {{ product.pk }}
12-
url_ui: {{ product_url_ui|full_url }}
13-
url_api: {{ product_url_api|full_url }}
12+
url_ui: {{ product_url_ui | full_url | tojson }}
13+
url_api: {{ product_url_api | full_url | tojson }}

‎dojo/templates/notifications/webhooks/subtemplates/product_type.tpl‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
{% url 'view_product_type' product_type.id as product_type_url_ui %}
33
{% url 'product_type-detail' product_type.id as product_type_url_api %}
44
product_type:
5-
name: {{ product_type.name | default_if_none:'' }}
5+
name: {{ product_type.name | default_if_none:'' | tojson }}
66
id: {{ product_type.pk }}
7-
url_ui: {{ product_type_url_ui|full_url }}
8-
url_api: {{ product_type_url_api|full_url }}
7+
url_ui: {{ product_type_url_ui | full_url | tojson }}
8+
url_api: {{ product_type_url_api | full_url | tojson }}

‎dojo/templates/notifications/webhooks/subtemplates/test.tpl‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
{% url 'view_test' test.id as test_url_ui %}
88
{% url 'test-detail' test.id as test_url_api %}
99
test:
10-
title: {{ test.title | default_if_none:'' }}
10+
title: {{ test.title | default_if_none:'' | tojson }}
1111
id: {{ test.pk }}
12-
url_ui: {{ test_url_ui|full_url }}
13-
url_api: {{ test_url_api|full_url }}
12+
url_ui: {{ test_url_ui | full_url | tojson }}
13+
url_api: {{ test_url_api | full_url | tojson }}

‎unittests/test_notifications.py‎

Lines changed: 53 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -923,3 +923,56 @@ def test_events_messages(self, mock):
923923
"url_ui": "http://localhost:8080/finding/235",
924924
}],
925925
})
926+
927+
with self.subTest("scan_added problematic titles"):
928+
BaseImporter(
929+
environment=Development_Environment.objects.get_or_create(name="Development")[0],
930+
scan_type="ZAP Scan",
931+
).notify_scan_added(
932+
test,
933+
updated_count=4,
934+
new_findings=[
935+
Finding.objects.create(test=test, title="Colon: New Finding", severity="Critical"),
936+
],
937+
findings_mitigated=[
938+
Finding.objects.create(test=test, title="[Brackets] Mitigated Finding", severity="Medium"),
939+
],
940+
findings_reactivated=[
941+
Finding.objects.create(test=test, title='"Quotation1" Reactivated Finding', severity="Low"),
942+
],
943+
findings_untouched=[
944+
Finding.objects.create(test=test, title="'Quotation2' Untouched Finding", severity="Info"),
945+
],
946+
)
947+
self.assertEqual(mock.call_args.kwargs["headers"]["X-DefectDojo-Event"], "scan_added")
948+
self.maxDiff = None
949+
self.assertEqual(mock.call_args.kwargs["json"]["findings"], {
950+
"new": [{
951+
"id": 232,
952+
"title": "Colon: New Finding",
953+
"severity": "Critical",
954+
"url_api": "http://localhost:8080/api/v2/findings/232/",
955+
"url_ui": "http://localhost:8080/finding/232",
956+
}],
957+
"mitigated": [{
958+
"id": 233,
959+
"title": "[Brackets] Mitigated Finding",
960+
"severity": "Medium",
961+
"url_api": "http://localhost:8080/api/v2/findings/233/",
962+
"url_ui": "http://localhost:8080/finding/233",
963+
}],
964+
"reactivated": [{
965+
"id": 234,
966+
"title": '"Quotation1" Reactivated Finding',
967+
"severity": "Low",
968+
"url_api": "http://localhost:8080/api/v2/findings/234/",
969+
"url_ui": "http://localhost:8080/finding/234",
970+
}],
971+
"untouched": [{
972+
"id": 235,
973+
"title": "'Quotation2' Untouched Finding",
974+
"severity": "Info",
975+
"url_api": "http://localhost:8080/api/v2/findings/235/",
976+
"url_ui": "http://localhost:8080/finding/235",
977+
}],
978+
})

0 commit comments

Comments
 (0)