Merge pull request #5702 from DefectDojo/release/2.6.1

Release: Merge release into master from: release/2.6.1

Author: Maffooch

Dockerfile.django

@@ -29,6 +29,7 @@ RUN pip3 wheel --wheel-dir=/tmp/wheels -r ./requirements.txt
 FROM base as django
 WORKDIR /app
 ARG uid=1001
+ARG gid=1337
 ARG appuser=defectdojo
 ENV appuser ${appuser}
 RUN \
@@ -88,10 +89,14 @@ RUN \
   true
 USER root
 RUN \
+    addgroup --gid ${gid} ${appuser} && \
     adduser --system --no-create-home --disabled-password --gecos '' \
-        --uid ${uid} ${appuser} && \
+        --uid ${uid} --gid ${gid} ${appuser} && \
     chown -R root:root /app && \
     chmod -R u+rwX,go+rX,go-w /app && \
+    # Allow for bind mounting local_settings.py and other setting overrides
+    chown -R root:${appuser} /app/dojo/settings && \
+    chmod -R 775 /app/dojo/settings && \
     mkdir /var/run/${appuser} && \
     chown ${appuser} /var/run/${appuser} && \
 	  chmod g=u /var/run/${appuser} && \

components/package.json

@@ -1,6 +1,6 @@
 {
   "name": "defectdojo",
-  "version": "2.6.0",
+  "version": "2.6.1",
   "license" : "BSD-3-Clause",
   "private": true,
   "dependencies": {

dojo/__init__.py

@@ -6,6 +6,6 @@
 
 default_app_config = 'dojo.apps.DojoAppConfig'
 
-__version__ = '2.6.0'
+__version__ = '2.6.1'
 __url__ = 'https://github.com/DefectDojo/django-DefectDojo'
 __docs__ = 'https://defectdojo.github.io/django-DefectDojo'

dojo/api_v2/views.py

@@ -1516,7 +1516,7 @@ class DevelopmentEnvironmentViewSet(mixins.ListModelMixin,
     serializer_class = serializers.DevelopmentEnvironmentSerializer
     queryset = Development_Environment.objects.all()
     filter_backends = (DjangoFilterBackend,)
-    permission_classes = (permissions.UserHasConfigurationPermissionStaff, )
+    permission_classes = (IsAuthenticated, DjangoModelPermissions)
 
 
 # Authorization: object-based
@@ -1684,7 +1684,7 @@ class TestTypesViewSet(mixins.ListModelMixin,
     queryset = Test_Type.objects.all()
     filter_backends = (DjangoFilterBackend,)
     filter_fields = ('name',)
-    permission_classes = (permissions.UserHasConfigurationPermissionStaff, )
+    permission_classes = (IsAuthenticated, DjangoModelPermissions)
 
 
 @extend_schema_view(

helm/defectdojo/Chart.yaml

@@ -1,5 +1,5 @@
 apiVersion: v1
-appVersion: "2.6.0"
+appVersion: "2.6.1"
 description: A Helm chart for Kubernetes to install DefectDojo
 name: defectdojo
 version: 1.6.24