Merge pull request #8418 from DefectDojo/release/2.24.3

Release: Merge release into master from: release/2.24.3
DefectDojo · Jul 24, 2023 · d827299 · d827299
2 parents dff45ea + b470884
commit d827299
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 10 deletions.
diff --git a/Dockerfile.integration-tests-debian b/Dockerfile.integration-tests-debian
@@ -11,6 +11,7 @@ RUN \
     curl \
     unzip \
     gpg \
+    jq \ 
     && \
   apt-get clean && \
   rm -rf /var/lib/apt/lists && \
@@ -28,12 +29,17 @@ RUN \
   rm -rf /var/lib/apt/lists && \
   true
 
-RUN pip install --no-cache-dir selenium==4.9.0 requests chromedriver-autoinstaller
+RUN pip install --no-cache-dir selenium==4.9.0 requests
 
 # Installing Chromedriver
 WORKDIR /opt/chrome-driver
 RUN \
-  python -c "import chromedriver_autoinstaller; chromedriver_autoinstaller.install(cwd=True)" && \
+  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 && \
+  unzip -j chromedriver-linux64.zip chromedriver-linux64/chromedriver && \
+  rm -rf chromedriver-linux64.zip && \
   chmod -R 0755 .
 WORKDIR /app
 

diff --git a/components/package.json b/components/package.json
@@ -1,6 +1,6 @@
 {
   "name": "defectdojo",
-  "version": "2.24.2",
+  "version": "2.24.3",
   "license" : "BSD-3-Clause",
   "private": true,
   "dependencies": {

diff --git a/components/yarn.lock b/components/yarn.lock
@@ -1075,9 +1075,9 @@ util-deprecate@~1.0.1:
   integrity sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==
 
 word-wrap@~1.2.3:
-  version "1.2.3"
-  resolved "https://registry.yarnpkg.com/word-wrap/-/word-wrap-1.2.3.tgz#610636f6b1f703891bd34771ccb17fb93b47079c"
-  integrity sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ==
+  version "1.2.4"
+  resolved "https://registry.yarnpkg.com/word-wrap/-/word-wrap-1.2.4.tgz#cb4b50ec9aca570abd1f52f33cd45b6c61739a9f"
+  integrity sha512-2V81OA4ugVo5pRo46hAoD2ivUJx8jXmWXfUkY4KFNw0hEptvN0QfH3K4nHiwzGeKl5rFKedV48QVoqYavy4YpA==
 
 xmldoc@^1.1.2:
   version "1.2.0"

diff --git a/dojo/__init__.py b/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
 
-__version__ = '2.24.2'
+__version__ = '2.24.3'
 __url__ = 'https://github.com/DefectDojo/django-DefectDojo'
 __docs__ = 'https://documentation.defectdojo.com'
diff --git a/helm/defectdojo/Chart.yaml b/helm/defectdojo/Chart.yaml
@@ -1,8 +1,8 @@
 apiVersion: v2
-appVersion: "2.24.2"
+appVersion: "2.24.3"
 description: A Helm chart for Kubernetes to install DefectDojo
 name: defectdojo
-version: 1.6.76
+version: 1.6.77
 icon: https://www.defectdojo.org/img/favicon.ico
 maintainers:
   - name: madchap

diff --git a/requirements.txt b/requirements.txt
@@ -38,7 +38,7 @@ openpyxl==3.1.2
 xlrd==1.2.0
 Pillow==9.5.0  # required by django-imagekit
 psycopg2-binary==2.9.6
-cryptography==41.0.1
+cryptography==41.0.2
 python-dateutil==2.8.2
 pytz==2023.3
 redis==4.6.0