Release: Merge release into master from: release/2.46.1 (#12402)

* Update versions in application files

* ui: fix "retrieve my username" typo (#12368)

* Minor Semgrep connector docs tweaks (#12373)

* jira push: log inactive/verified message to debug (#12376)

* helm chart publisher: use proper ref for checkout (#12392)

* 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

* Update versions in application files

---------

Co-authored-by: DefectDojo release bot <[email protected]>
Co-authored-by: Cody Maffucci <[email protected]>
Co-authored-by: Jean-François YUEN <[email protected]>
Co-authored-by: Charles Neill <[email protected]>
Co-authored-by: valentijnscholten <[email protected]>

Author: 5 people

.github/workflows/release-x-manual-helm-chart.yml

@@ -30,7 +30,7 @@ jobs:
       - name: Checkout
         uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
         with:
-          ref: master
+          ref: ${{ inputs.release_number }}
           fetch-depth: 0
 
       # This action is deprecated. Not sure if it is even being used anymore...

components/package.json

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

docs/content/en/connecting_your_tools/connectors/connectors_tool_reference.md

@@ -133,19 +133,19 @@ This connector uses the Probely REST API to fetch data.
 You can find an API key under the User \> API Keys menu in Probely.  
 See [Probely documentation](https://help.probely.com/en/articles/8592281-how-to-generate-an-api-key) for more info.
 
-## **SemGrep**
+## **Semgrep**
 
-This connector uses the SemGrep REST API to fetch data. 
+This connector uses the Semgrep REST API to fetch data.
 
 #### Connector Mappings
 
-Enter https://semgrep.dev/api/v1/in the **Location** field.
+Enter `https://semgrep.dev/api/v1/` in the **Location** field.
 
 1. Enter a valid API key in the **Secret** field. You can find this on the Tokens page:   
 ​  
 "Settings" in the left navbar \> Tokens \> Create new token ([https://semgrep.dev/orgs/\-/settings/tokens](https://semgrep.dev/orgs/-/settings/tokens))
 
-See [SemGrep documentation](https://semgrep.dev/docs/semgrep-cloud-platform/semgrep-api/#tag__badge-list) for more info.
+See [Semgrep documentation](https://semgrep.dev/docs/semgrep-cloud-platform/semgrep-api/#tag__badge-list) for more info.
 
 ## SonarQube
 

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

dojo/finding/views.py

@@ -658,7 +658,7 @@ def get_jira_data(self, finding: Finding):
         ) = jira_helper.can_be_pushed_to_jira(finding)
         # Check the error code
         if error_code:
-            logger.error(error_code)
+            logger.debug(error_code)
 
         return {
             "can_be_pushed_to_jira": can_be_pushed_to_jira,

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/locale/en/LC_MESSAGES/django.po

@@ -3198,7 +3198,7 @@ msgid ""
 msgstr ""
 
 #: dojo/templates/dojo/forgot_username.html
-msgid "Retreive my username"
+msgid "Retrieve my username"
 msgstr ""
 
 #: dojo/templates/dojo/forgot_username_done.html

dojo/templates/login/forgot_username.html

@@ -9,7 +9,7 @@ <h3>{% translate 'Retrieve Username' %}</h3>
         {% include "dojo/form_fields.html" with form=form %}
         <div class="form-group">
         <div class="col-sm-offset-1 col-sm-1">
-            <button id="reset-password" class="btn btn-success">{% translate 'Retreive my username' %}</button>
+            <button id="reset-password" class="btn btn-success">{% translate 'Retrieve my username' %}</button>
         </div>
         </div>
     </fieldset>

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)

helm/defectdojo/Chart.yaml

@@ -1,8 +1,8 @@
 apiVersion: v2
-appVersion: "2.46.0"
+appVersion: "2.46.1"
 description: A Helm chart for Kubernetes to install DefectDojo
 name: defectdojo
-version: 1.6.185
+version: 1.6.186
 icon: https://www.defectdojo.org/img/favicon.ico
 maintainers:
   - name: madchap