Merge pull request #3419 from DefectDojo/release/1.10.4

Release: Merge release into master from: release/1.10.4

Author: valentijnscholten

components/package.json

@@ -1,6 +1,6 @@
 {
   "name": "DefectDojo",
-  "version": "1.10.3",
+  "version": "1.10.4",
   "dependencies": {
     "JUMFlot": "jumjum123/JUMFlot#*",
     "bootstrap": "^3.4.0",

dojo/__init__.py

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

dojo/filters.py

@@ -1257,6 +1257,17 @@ def __init__(self, *args, **kwargs):
                 Q(authorized_users__in=[self.user]) |
                 Q(prod_type__authorized_users__in=[self.user])).distinct().order_by('name')
 
+    @property
+    def qs(self):
+        parent = super(EndpointFilter, self).qs
+        if get_current_user() and not get_current_user().is_staff:
+            return parent.filter(
+                Q(product__authorized_users__in=[get_current_user()]) |
+                Q(product__prod_type__authorized_users__in=[get_current_user()])
+            )
+        else:
+            return parent
+
     class Meta:
         model = Endpoint
         exclude = ['mitigated', 'endpoint_status']

helm/defectdojo/Chart.yaml

@@ -1,5 +1,5 @@
 apiVersion: v1
-appVersion: "1.10.3"
+appVersion: "1.10.4"
 description: A Helm chart for Kubernetes to installs DefectDojo
 name: defectdojo
 version: 1.4.0

setup.py

@@ -4,7 +4,7 @@
 
 setup(
     name='DefectDojo',
-    version='1.10.3',
+    version='1.10.4',
     author='Greg Anderson',
     description="Tool for managing vulnerability engagements",
     install_requires=[