tags: prevent validation from removing tags (#12400)

* tags: prevent validation from removing tags

* tags: prevent validation from removing tags smoke test

* tags: prevent validation from removing tags smoke test

* tags: prevent validation from removing tags remove ui test

Author: valentijnscholten

dojo/forms.py

@@ -341,6 +341,7 @@ class Meta:
 
     def clean_tags(self):
         tag_validator(self.cleaned_data.get("tags"))
+        return self.cleaned_data.get("tags")
 
 
 class DeleteProductForm(forms.ModelForm):
@@ -608,6 +609,7 @@ def clean(self):
 
     def clean_tags(self):
         tag_validator(self.cleaned_data.get("tags"))
+        return self.cleaned_data.get("tags")
 
     # date can only be today or in the past, not the future
     def clean_scan_date(self):
@@ -717,6 +719,7 @@ def clean(self):
 
     def clean_tags(self):
         tag_validator(self.cleaned_data.get("tags"))
+        return self.cleaned_data.get("tags")
 
     # date can only be today or in the past, not the future
     def clean_scan_date(self):
@@ -1033,6 +1036,7 @@ def is_valid(self):
 
     def clean_tags(self):
         tag_validator(self.cleaned_data.get("tags"))
+        return self.cleaned_data.get("tags")
 
     class Meta:
         model = Engagement
@@ -1091,6 +1095,7 @@ class Meta:
 
     def clean_tags(self):
         tag_validator(self.cleaned_data.get("tags"))
+        return self.cleaned_data.get("tags")
 
 
 class DeleteTestForm(forms.ModelForm):
@@ -1190,6 +1195,7 @@ def clean(self):
 
     def clean_tags(self):
         tag_validator(self.cleaned_data.get("tags"))
+        return self.cleaned_data.get("tags")
 
     class Meta:
         model = Finding
@@ -1270,6 +1276,7 @@ def clean(self):
 
     def clean_tags(self):
         tag_validator(self.cleaned_data.get("tags"))
+        return self.cleaned_data.get("tags")
 
     class Meta:
         model = Finding
@@ -1330,6 +1337,7 @@ def clean(self):
 
     def clean_tags(self):
         tag_validator(self.cleaned_data.get("tags"))
+        return self.cleaned_data.get("tags")
 
     class Meta:
         model = Finding
@@ -1455,6 +1463,7 @@ def clean(self):
 
     def clean_tags(self):
         tag_validator(self.cleaned_data.get("tags"))
+        return self.cleaned_data.get("tags")
 
     def _post_clean(self):
         super()._post_clean()
@@ -1534,6 +1543,7 @@ def clean(self):
 
     def clean_tags(self):
         tag_validator(self.cleaned_data.get("tags"))
+        return self.cleaned_data.get("tags")
 
     class Meta:
         fields = ["title", "cwe", "vulnerability_ids", "cvssv3", "severity", "description", "mitigation", "impact", "references", "tags"]
@@ -1567,6 +1577,7 @@ class Meta:
 
     def clean_tags(self):
         tag_validator(self.cleaned_data.get("tags"))
+        return self.cleaned_data.get("tags")
 
 
 class DeleteFindingTemplateForm(forms.ModelForm):
@@ -1623,6 +1634,7 @@ def clean(self):
 
     def clean_tags(self):
         tag_validator(self.cleaned_data.get("tags"))
+        return self.cleaned_data.get("tags")
 
     class Meta:
         model = Finding
@@ -1676,6 +1688,7 @@ def clean(self):
 
     def clean_tags(self):
         tag_validator(self.cleaned_data.get("tags"))
+        return self.cleaned_data.get("tags")
 
 
 class AddEndpointForm(forms.Form):
@@ -1742,6 +1755,7 @@ def clean(self):
 
     def clean_tags(self):
         tag_validator(self.cleaned_data.get("tags"))
+        return self.cleaned_data.get("tags")
 
 
 class DeleteEndpointForm(forms.ModelForm):

dojo/utils.py

@@ -2677,4 +2677,5 @@ def tag_validator(value: str | list[str], exception_class: Callable = Validation
         error_messages.append(f"Value must be a string or list of strings: {value} - {type(value)}.")
 
     if error_messages:
+        logger.debug(f"Tag validation failed: {error_messages}")
         raise exception_class(error_messages)