Merge pull request #8656 from DefectDojo/master-into-dev/2.26.2-2.27.…

…0-dev

Release: Merge back 2.26.2 into dev from: master-into-dev/2.26.2-2.27.0-dev

Dockerfile.integration-tests-debian

@@ -39,7 +39,7 @@ RUN \
   chrome_version=$(apt-cache show google-chrome-stable | grep Version | awk '{print $2}' | cut -d '-' -f 1) && \
   chrome_version_blob=$(curl -k https://googlechromelabs.github.io/chrome-for-testing/known-good-versions-with-downloads.json | jq ".versions[] | select(.version==\"$chrome_version\")") && \
   chromedriver_url=$(echo $chrome_version_blob | jq -r ".downloads.chromedriver[] | select(.platform==\"linux64\") | .url") && \
-  wget https://edgedl.me.gvt1.com/edgedl/chrome/chrome-for-testing/115.0.5790.98/linux64/chromedriver-linux64.zip && \
+  wget $chromedriver_url && \
   unzip -j chromedriver-linux64.zip chromedriver-linux64/chromedriver && \
   rm -rf chromedriver-linux64.zip && \
   chmod -R 0755 .

dojo/engagement/views.py

@@ -575,7 +575,7 @@ def add_tests(request, eid):
 
 # Cant use the easy decorator because of the potential for either eid/pid being used
 def import_scan_results(request, eid=None, pid=None):
-    environment = Development_Environment.objects.get(name='Development')
+    environment = Development_Environment.objects.filter(name='Development').first()  # If 'Development' was removed, None is used
     engagement = None
     form = ImportScanForm(initial={'environment': environment})
     cred_form = CredMappingForm()

dojo/tools/veracode/json_parser.py

@@ -25,6 +25,7 @@ class VeracodeJSONParser(object):
     """
 
     severity_mapping = {
+        0: "Info",
         1: "Info",
         2: "Low",
         3: "Medium",
@@ -89,7 +90,7 @@ def get_items(self, tree, test):
 
     def create_finding_from_details(self, finding_details, scan_type, policy_violated) -> Finding:
         # Fetch the common attributes that should be in every scan type
-        severity = self.severity_mapping.get(finding_details.get("severity", 1))
+        severity = self.severity_mapping.get(finding_details.get("severity", 1), 1)
         # Set up the finding with just severity for now
         finding = Finding(
             title=f"{scan_type} Finding",

helm/defectdojo/Chart.yaml

@@ -2,7 +2,7 @@ apiVersion: v2
 appVersion: "2.27.0-dev"
 description: A Helm chart for Kubernetes to install DefectDojo
 name: defectdojo
-version: 1.6.86-dev
+version: 1.6.87-dev
 icon: https://www.defectdojo.org/img/favicon.ico
 maintainers:
   - name: madchap

requirements.txt

@@ -24,7 +24,7 @@ django-slack==5.19.0
 git+https://github.com/DefectDojo/django-tagging@develop#egg=django-tagging
 django-watson==1.6.3
 django-prometheus==2.3.1
-Django==4.1.10
+Django==4.1.11
 djangorestframework==3.14.0
 gunicorn==21.2.0
 html2text==2020.1.16