diff --git a/Dockerfile.integration-tests-debian b/Dockerfile.integration-tests-debian index 1f9ab1cf28a..6df200d628e 100644 --- a/Dockerfile.integration-tests-debian +++ b/Dockerfile.integration-tests-debian @@ -74,4 +74,4 @@ ENV \ DD_ADMIN_USER=admin \ DD_ADMIN_PASSWORD='' \ DD_BASE_URL="http://localhost:8080/" -CMD ["/entrypoint-integration-tests.sh"] +CMD ["/entrypoint-integration-tests.sh"] \ No newline at end of file diff --git a/docs/content/en/getting_started/upgrading.md b/docs/content/en/getting_started/upgrading.md index daeb9136c1f..03ba899c8e0 100644 --- a/docs/content/en/getting_started/upgrading.md +++ b/docs/content/en/getting_started/upgrading.md @@ -72,6 +72,10 @@ godojo installations If you have installed DefectDojo on "iron" and wish to upgrade the installation, please see the [instructions in the repo](https://github.com/DefectDojo/godojo/blob/master/docs-and-scripts/upgrading.md). +## Upgrading to DefectDojo Version 2.27.x. + +There are no special instruction for upgrading to 2.27.0. Check the [Release Notes](https://github.com/DefectDojo/django-DefectDojo/releases/tag/2.27.0) for the contents of the release. + ## Upgrading to DefectDojo Version 2.26.x. There are no special instruction for upgrading to 2.26.0. Check the [Release Notes](https://github.com/DefectDojo/django-DefectDojo/releases/tag/2.26.0) for the contents of the release. diff --git a/dojo/templates/dojo/product.html b/dojo/templates/dojo/product.html index f440037d4ca..e328557c87d 100644 --- a/dojo/templates/dojo/product.html +++ b/dojo/templates/dojo/product.html @@ -350,8 +350,14 @@

'Very Low': 1, 'None': 0 }; - return type === 'sort' ? criticals[getDojoExportValueFromTag(data, 'i', 'data-content')] : - type === 'export' ? getDojoExportValueFromTag(data, 'i', 'data-content') : data; + if (type === 'sort') { + return criticals[getDojoExportValueFromTag(data, 'i', 'data-content')] + } else if (type === 'export') { + return getDojoExportValueFromTag(data, 'i', 'data-content') + } else if (data != undefined||data != null) { + return data + } + return "" }}, { "data": "metadata", render: function (data, type, row) { return type === 'export' ? getDojoExportValueFromTag(data, 'i', 'data-content') : data; diff --git a/dojo/tools/jfrog_xray_api_summary_artifact/parser.py b/dojo/tools/jfrog_xray_api_summary_artifact/parser.py index 6c81ad864c6..f62d3532297 100644 --- a/dojo/tools/jfrog_xray_api_summary_artifact/parser.py +++ b/dojo/tools/jfrog_xray_api_summary_artifact/parser.py @@ -139,7 +139,7 @@ def get_item( # Add vulnerability ids vulnerability_ids = list() - if "cve" in cves[0]: + if cves and "cve" in cves[0]: vulnerability_ids.append(cves[0]["cve"]) if "issue_id" in vulnerability: vulnerability_ids.append(vulnerability["issue_id"]) diff --git a/helm/defectdojo/Chart.yaml b/helm/defectdojo/Chart.yaml index fbaead105b0..f21874e6dbc 100644 --- a/helm/defectdojo/Chart.yaml +++ b/helm/defectdojo/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 appVersion: "2.28.0-dev" description: A Helm chart for Kubernetes to install DefectDojo name: defectdojo -version: 1.6.90-dev +version: 1.6.91-dev icon: https://www.defectdojo.org/img/favicon.ico maintainers: - name: madchap diff --git a/requirements.txt b/requirements.txt index 6f39d17d742..451c7aa25fa 100644 --- a/requirements.txt +++ b/requirements.txt @@ -45,7 +45,7 @@ redis==5.0.1 requests==2.31.0 sqlalchemy==2.0.21 # Required by Celery broker transport supervisor==4.2.5 -urllib3==1.26.11 +urllib3==1.26.17 uWSGI==2.0.22 vobject==0.9.6.1 whitenoise==5.2.0