From 778098464a0b08e5b5b27dadbeda198a851bff98 Mon Sep 17 00:00:00 2001 From: DefectDojo release bot Date: Mon, 22 Jan 2024 16:39:01 +0000 Subject: [PATCH 1/3] 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 2e991bad243..262ef7e6f3b 100644 --- a/components/package.json +++ b/components/package.json @@ -1,6 +1,6 @@ { "name": "defectdojo", - "version": "2.30.3", + "version": "2.31.0-dev", "license" : "BSD-3-Clause", "private": true, "dependencies": { diff --git a/dojo/__init__.py b/dojo/__init__.py index bb1eda2eddf..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.3' +__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 18a03d690a5..5e613350165 100644 --- a/helm/defectdojo/Chart.yaml +++ b/helm/defectdojo/Chart.yaml @@ -1,8 +1,8 @@ apiVersion: v2 -appVersion: "2.30.3" +appVersion: "2.31.0-dev" description: A Helm chart for Kubernetes to install DefectDojo name: defectdojo -version: 1.6.106 +version: 1.6.107-dev icon: https://www.defectdojo.org/img/favicon.ico maintainers: - name: madchap From 7a4ab4c2211e9d65fe2cb06a1125a89346048906 Mon Sep 17 00:00:00 2001 From: Cody Maffucci <46459665+Maffooch@users.noreply.github.com> Date: Wed, 24 Jan 2024 14:56:19 -0600 Subject: [PATCH 2/3] Open attached files as bytes (#9402) Opening the file as bytes skips an extra step to encode the file [sc-3999] --- dojo/views.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dojo/views.py b/dojo/views.py index a16f7f7a2a0..829f749d64d 100755 --- a/dojo/views.py +++ b/dojo/views.py @@ -220,4 +220,4 @@ def access_file(request, fid, oid, obj_type, url=False): media_root=settings.MEDIA_ROOT, file_name=file.file.url.lstrip(settings.MEDIA_URL)) print(redirect_url) - return FileResponse(open(redirect_url)) + return FileResponse(open(redirect_url, "rb")) From 7d662df945f0398ec190bb2398c2f64f7c5f7b8f Mon Sep 17 00:00:00 2001 From: DefectDojo release bot Date: Mon, 29 Jan 2024 15:31:07 +0000 Subject: [PATCH 3/3] 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..3f7fe72f6dc 100644 --- a/components/package.json +++ b/components/package.json @@ -1,6 +1,6 @@ { "name": "defectdojo", - "version": "2.31.0-dev", + "version": "2.30.4", "license" : "BSD-3-Clause", "private": true, "dependencies": { diff --git a/dojo/__init__.py b/dojo/__init__.py index 9406e56f475..f5f755a23ad 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.4' __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 5e613350165..5ac25d323cc 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.4" description: A Helm chart for Kubernetes to install DefectDojo name: defectdojo -version: 1.6.107-dev +version: 1.6.107 icon: https://www.defectdojo.org/img/favicon.ico maintainers: - name: madchap