Fixes #13555 AND logic not present when filtering Findings via two or more tags

components/package.json

@@ -1,6 +1,6 @@
 {
   "name": "defectdojo",
-  "version": "2.52.3",
+  "version": "2.53.0-dev",
   "license" : "BSD-3-Clause",
   "private": true,
   "dependencies": {

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.52.3"
+__version__ = "2.53.0-dev"
 __url__ = "https://github.com/DefectDojo/django-DefectDojo"
 __docs__ = "https://documentation.defectdojo.com"

dojo/filters.py

@@ -532,23 +532,68 @@ class FindingTagFilter(DojoFilter):
         field_name="tags__name",
         to_field_name="name",
         queryset=Finding.tags.tag_model.objects.all().order_by("name"),
-        help_text="Filter Findings by the selected tags")
+        help_text="Filter Findings by the selected tags (OR logic)",
+    )
+
+    tags_and = ModelMultipleChoiceFilter(
+        field_name="tags__name",
+        to_field_name="name",
+        queryset=Finding.tags.tag_model.objects.all().order_by("name"),
+        help_text="Filter Findings by the selected tags (AND logic)",
+        label="Tags (AND)",
+        conjoined=True,
+    )
+
     test__tags = ModelMultipleChoiceFilter(
         field_name="test__tags__name",
         to_field_name="name",
         queryset=Test.tags.tag_model.objects.all().order_by("name"),
-        help_text="Filter Tests by the selected tags")
+        help_text="Filter Findings by the selected Test tags (OR logic)",
+        label="Test Tags",
+    )
+
+    test__tags_and = ModelMultipleChoiceFilter(
+        field_name="test__tags__name",
+        to_field_name="name",
+        queryset=Test.tags.tag_model.objects.all().order_by("name"),
+        help_text="Filter Findings by the selected Test tags (AND logic)",
+        label="Test Tags (AND)",
+        conjoined=True,
+    )
+
     test__engagement__tags = ModelMultipleChoiceFilter(
         field_name="test__engagement__tags__name",
         to_field_name="name",
         queryset=Engagement.tags.tag_model.objects.all().order_by("name"),
-        help_text="Filter Engagements by the selected tags")
+        help_text="Filter Findings by the selected Engagement tags (OR logic)",
+        label="Engagement Tags",
+    )
+
+    test__engagement__tags_and = ModelMultipleChoiceFilter(
+        field_name="test__engagement__tags__name",
+        to_field_name="name",
+        queryset=Engagement.tags.tag_model.objects.all().order_by("name"),
+        help_text="Filter Findings by the selected Engagement tags (AND logic)",
+        label="Engagement Tags (AND)",
+        conjoined=True,
+    )
+
     test__engagement__product__tags = ModelMultipleChoiceFilter(
         field_name="test__engagement__product__tags__name",
         to_field_name="name",
         queryset=Product.tags.tag_model.objects.all().order_by("name"),
-        label=labels.ASSET_FILTERS_TAGS_FILTER_LABEL,
-        help_text=labels.ASSET_FILTERS_TAGS_FILTER_HELP)
+        help_text="Filter Findings by the selected Product tags (OR logic)",
+        label="Product Tags",
+    )
+
+    test__engagement__product__tags_and = ModelMultipleChoiceFilter(
+        field_name="test__engagement__product__tags__name",
+        to_field_name="name",
+        queryset=Product.tags.tag_model.objects.all().order_by("name"),
+        help_text="Filter Findings by the selected Product tags (AND logic)",
+        label="Product Tags (AND)",
+        conjoined=True,
+    )
 
     not_tags = ModelMultipleChoiceFilter(
         field_name="tags__name",

helm/defectdojo/Chart.yaml

@@ -1,8 +1,8 @@
 apiVersion: v2
-appVersion: "2.52.3"
+appVersion: "2.53.0-dev"
 description: A Helm chart for Kubernetes to install DefectDojo
 name: defectdojo
-version: 1.8.3
+version: 1.8.4-dev
 icon: https://defectdojo.com/hubfs/DefectDojo_favicon.png
 maintainers:
   - name: madchap
@@ -33,5 +33,5 @@ dependencies:
 #   - kind: security
 #     description: Critical bug
 annotations:
-  artifacthub.io/prerelease: "false"
-  artifacthub.io/changes: "- kind: changed\n  description: Bump DefectDojo to 2.52.3\n"
+  artifacthub.io/prerelease: "true"
+  artifacthub.io/changes: ""

helm/defectdojo/README.md

@@ -512,7 +512,7 @@ The HELM schema will be generated for you.
 
 # General information about chart values
 
-![Version: 1.8.3](https://img.shields.io/badge/Version-1.8.3-informational?style=flat-square) ![AppVersion: 2.52.3](https://img.shields.io/badge/AppVersion-2.52.3-informational?style=flat-square)
+![Version: 1.8.4-dev](https://img.shields.io/badge/Version-1.8.4--dev-informational?style=flat-square) ![AppVersion: 2.53.0-dev](https://img.shields.io/badge/AppVersion-2.53.0--dev-informational?style=flat-square)
 
 A Helm chart for Kubernetes to install DefectDojo