From 3d941e1b1d45b48e42163011aaa221ab896029ef Mon Sep 17 00:00:00 2001 From: DefectDojo release bot Date: Tue, 2 Jan 2024 18:31:08 +0000 Subject: [PATCH 1/4] Update versions in application files --- components/package.json | 2 +- dojo/__init__.py | 2 +- helm/defectdojo/Chart.yaml | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/components/package.json b/components/package.json index 2d6cc4e9cb4..262ef7e6f3b 100644 --- a/components/package.json +++ b/components/package.json @@ -1,6 +1,6 @@ { "name": "defectdojo", - "version": "2.30.0", + "version": "2.31.0-dev", "license" : "BSD-3-Clause", "private": true, "dependencies": { diff --git a/dojo/__init__.py b/dojo/__init__.py index 401210d004f..9406e56f475 100644 --- a/dojo/__init__.py +++ b/dojo/__init__.py @@ -4,6 +4,6 @@ # Django starts so that shared_task will use this app. from .celery import app as celery_app # noqa -__version__ = '2.30.0' +__version__ = '2.31.0-dev' __url__ = 'https://github.com/DefectDojo/django-DefectDojo' __docs__ = 'https://documentation.defectdojo.com' diff --git a/helm/defectdojo/Chart.yaml b/helm/defectdojo/Chart.yaml index 7cfe0cdda77..d69a469198c 100644 --- a/helm/defectdojo/Chart.yaml +++ b/helm/defectdojo/Chart.yaml @@ -1,8 +1,8 @@ apiVersion: v2 -appVersion: "2.30.0" +appVersion: "2.31.0-dev" description: A Helm chart for Kubernetes to install DefectDojo name: defectdojo -version: 1.6.103 +version: 1.6.104-dev icon: https://www.defectdojo.org/img/favicon.ico maintainers: - name: madchap From bca24c6daff840a3f62f1101e20f132cd531f927 Mon Sep 17 00:00:00 2001 From: Paul Osinski <42211303+paulOsinski@users.noreply.github.com> Date: Tue, 2 Jan 2024 11:41:21 -0700 Subject: [PATCH 2/4] Update checkov.md with corrected typo (#9247) --- .../en/integrations/parsers/file/checkov.md | 49 ++++++++++++++++++- 1 file changed, 48 insertions(+), 1 deletion(-) diff --git a/docs/content/en/integrations/parsers/file/checkov.md b/docs/content/en/integrations/parsers/file/checkov.md index 37461ae81f2..8a34d1e969f 100644 --- a/docs/content/en/integrations/parsers/file/checkov.md +++ b/docs/content/en/integrations/parsers/file/checkov.md @@ -2,4 +2,51 @@ title: "Checkov Report" toc_hide: true --- -Import JSON reports of Infrastructure as Code vulnerabilities. \ No newline at end of file +### File Types +DefectDojo parser accepts Checkov scan data as a .JSON file. + +JSON files can be created from the Checkov CLI: https://www.checkov.io/2.Basics/CLI%20Command%20Reference.html + +### Acceptable JSON Format + +~~~ +{ + "check_type": "terraform", + "results": { + "passed_checks": [ + ], + "failed_checks": [ + { + "check_id": "CKV_AZURE_41", + "check_name": "Ensure the key vault is recoverable", + "check_result": { + "result": "FAILED" + }, + "code_block": [ + ], + "file_path": "file_path", + "file_line_range": [ + 1, + 16 + ], + "resource": "azurerm_key_vault.main", + "check_class": "checkov.terraform.checks.resource.azure.KeyvaultRecoveryEnabled", + "guideline": "https://docs.bridgecrew.io/docs/ensure-the-key-vault-is-recoverable" + }, + ... + ], + "skipped_checks": [], + "parsing_errors": [] + }, + "summary": { + "passed": 0, + "failed": 2, + "skipped": 0, + "parsing_errors": 0, + "checkov_version": "1.0.467" + } +} +~~~ + +### Sample Scan Data +Sample Checkov scans can be found at https://github.com/DefectDojo/django-DefectDojo/tree/master/unittests/scans/checkov From cf49d5c4e0801d449614709e626a1ef4e2aca784 Mon Sep 17 00:00:00 2001 From: DefectDojo release bot Date: Mon, 8 Jan 2024 16:19:43 +0000 Subject: [PATCH 3/4] Update versions in application files --- components/package.json | 2 +- dojo/__init__.py | 2 +- helm/defectdojo/Chart.yaml | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/components/package.json b/components/package.json index 262ef7e6f3b..44e6547597f 100644 --- a/components/package.json +++ b/components/package.json @@ -1,6 +1,6 @@ { "name": "defectdojo", - "version": "2.31.0-dev", + "version": "2.30.1", "license" : "BSD-3-Clause", "private": true, "dependencies": { diff --git a/dojo/__init__.py b/dojo/__init__.py index 9406e56f475..2371e94834f 100644 --- a/dojo/__init__.py +++ b/dojo/__init__.py @@ -4,6 +4,6 @@ # Django starts so that shared_task will use this app. from .celery import app as celery_app # noqa -__version__ = '2.31.0-dev' +__version__ = '2.30.1' __url__ = 'https://github.com/DefectDojo/django-DefectDojo' __docs__ = 'https://documentation.defectdojo.com' diff --git a/helm/defectdojo/Chart.yaml b/helm/defectdojo/Chart.yaml index d69a469198c..e9c97b973a1 100644 --- a/helm/defectdojo/Chart.yaml +++ b/helm/defectdojo/Chart.yaml @@ -1,8 +1,8 @@ apiVersion: v2 -appVersion: "2.31.0-dev" +appVersion: "2.30.1" description: A Helm chart for Kubernetes to install DefectDojo name: defectdojo -version: 1.6.104-dev +version: 1.6.104 icon: https://www.defectdojo.org/img/favicon.ico maintainers: - name: madchap From ee02a671d829a7fdfc676d8ba2a04d7b60030f02 Mon Sep 17 00:00:00 2001 From: DefectDojo release bot Date: Mon, 8 Jan 2024 17:22:21 +0000 Subject: [PATCH 4/4] Update versions in application files --- components/package.json | 2 +- dojo/__init__.py | 2 +- helm/defectdojo/Chart.yaml | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/components/package.json b/components/package.json index 44e6547597f..262ef7e6f3b 100644 --- a/components/package.json +++ b/components/package.json @@ -1,6 +1,6 @@ { "name": "defectdojo", - "version": "2.30.1", + "version": "2.31.0-dev", "license" : "BSD-3-Clause", "private": true, "dependencies": { diff --git a/dojo/__init__.py b/dojo/__init__.py index 2371e94834f..9406e56f475 100644 --- a/dojo/__init__.py +++ b/dojo/__init__.py @@ -4,6 +4,6 @@ # Django starts so that shared_task will use this app. from .celery import app as celery_app # noqa -__version__ = '2.30.1' +__version__ = '2.31.0-dev' __url__ = 'https://github.com/DefectDojo/django-DefectDojo' __docs__ = 'https://documentation.defectdojo.com' diff --git a/helm/defectdojo/Chart.yaml b/helm/defectdojo/Chart.yaml index e9c97b973a1..a6478650057 100644 --- a/helm/defectdojo/Chart.yaml +++ b/helm/defectdojo/Chart.yaml @@ -1,8 +1,8 @@ apiVersion: v2 -appVersion: "2.30.1" +appVersion: "2.31.0-dev" description: A Helm chart for Kubernetes to install DefectDojo name: defectdojo -version: 1.6.104 +version: 1.6.105-dev icon: https://www.defectdojo.org/img/favicon.ico maintainers: - name: madchap