Merge pull request #9720 from DefectDojo/release/3.32.1

Release: Merge release into master from: release/3.32.1

.github/workflows/k8s-tests.yml

@@ -29,14 +29,6 @@ env:
     --set mysql.enabled=false \
     --set createPostgresqlSecret=true \
    "
-  HELM_PGHA_DATABASE_SETTINGS: " \
-    --set database=postgresqlha \
-    --set postgresql.enabled=false \
-    --set mysql.enabled=false \
-    --set postgresqlha.enabled=true \
-    --set createPostgresqlHaSecret=true \
-    --set createPostgresqlHaPgpoolSecret=true \
-   "
 jobs:
   setting_minikube_cluster:
     name: Kubernetes Deployment
@@ -64,10 +56,6 @@ jobs:
             brokers: redis
             k8s: 'v1.23.9'
             os: debian
-          - databases: pgsqlha
-            brokers: rabbit
-            k8s: 'v1.23.9'
-            os: debian
           - databases: pgsql
             brokers: rabbit
             k8s: 'v1.23.9'

components/package.json

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

components/yarn.lock

@@ -538,10 +538,6 @@ fast-levenshtein@~2.0.6:
   resolved "https://registry.yarnpkg.com/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz#3d8a5c66883a16a30ca8643e851f19baa7797917"
   integrity sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw==
 
-flot-axis@markrcote/flot-axislabels#*:
-  version "0.0.0"
-  resolved "https://codeload.github.com/markrcote/flot-axislabels/tar.gz/a181e09d04d120d05e5bc2baaa8738b5b3670428"
-
 flot@flot/flot#~0.8.3:
   version "0.8.3"
   resolved "https://codeload.github.com/flot/flot/tar.gz/453b017cc5acfd75e252b93e8635f57f4196d45d"

docs/content/en/integrations/parsers/file/checkmarx_one.md

@@ -0,0 +1,8 @@
+---
+title: "Checkmarx One Scan"
+toc_hide: true
+---
+Import JSON Checkmarx One scanner reports
+
+### Sample Scan Data
+Sample Checkmarx One scans can be found [here](https://github.com/DefectDojo/django-DefectDojo/tree/master/unittests/scans/checkmarx_one).

docs/content/en/integrations/parsers/file/crunch42.md

@@ -0,0 +1,8 @@
+---
+title: "Crunch42 Scan"
+toc_hide: true
+---
+Import JSON findings from Crunch42 vulnerability scan tool.
+
+### Sample Scan Data
+Sample Crunch42 Scan scans can be found [here](https://github.com/DefectDojo/django-DefectDojo/tree/master/unittests/scans/crunch42).

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: F401
 
-__version__ = '2.32.0'
+__version__ = '3.32.1'
 __url__ = 'https://github.com/DefectDojo/django-DefectDojo'
 __docs__ = 'https://documentation.defectdojo.com'

dojo/endpoint/views.py

@@ -33,12 +33,6 @@ def process_endpoints_view(request, host_view=False, vulnerable=False):
 
     if vulnerable:
         endpoints = Endpoint.objects.filter(
-            finding__active=True,
-            finding__verified=True,
-            finding__out_of_scope=False,
-            finding__mitigated__isnull=True,
-            finding__false_p=False,
-            finding__duplicate=False,
             status_endpoint__mitigated=False,
             status_endpoint__false_positive=False,
             status_endpoint__out_of_scope=False,
@@ -124,12 +118,12 @@ def process_endpoint_view(request, eid, host_view=False):
         endpoints = endpoint.host_endpoints()
         endpoint_metadata = None
         all_findings = endpoint.host_findings()
-        active_verified_findings = endpoint.host_active_verified_findings()
+        active_findings = endpoint.host_active_findings()
     else:
         endpoints = None
         endpoint_metadata = dict(endpoint.endpoint_meta.values_list('name', 'value'))
         all_findings = endpoint.findings.all()
-        active_verified_findings = endpoint.active_verified_findings()
+        active_findings = endpoint.active_findings()
 
     if all_findings:
         start_date = timezone.make_aware(datetime.combine(all_findings.last().date, datetime.min.time()))
@@ -148,12 +142,8 @@ def process_endpoint_view(request, eid, host_view=False):
     monthly_counts = get_period_counts(all_findings, closed_findings, None, months_between, start_date,
                                        relative_delta='months')
 
-    paged_findings = get_page_items(request, active_verified_findings, 25)
-
-    vulnerable = False
-
-    if active_verified_findings.count() != 0:
-        vulnerable = True
+    paged_findings = get_page_items(request, active_findings, 25)
+    vulnerable = active_findings.count() != 0
 
     product_tab = Product_Tab(endpoint.product, "Host" if host_view else "Endpoint", tab="endpoints")
     return render(request,