Merge pull request #14885 from DefectDojo/release/2.58.3

Release: Merge release into master from: release/2.58.3

Author: rossops

.github/workflows/integration-tests.yml

@@ -73,7 +73,6 @@ jobs:
           "tests/tool_type_test.py",
           "tests/user_profile_test.py",
           "tests/user_test.py",
-          # "tests/import_scanner_test.py",
           # "tests/zap.py",
         ]
         os: [debian]

.github/workflows/validate_docs_build.yml

@@ -44,6 +44,36 @@ jobs:
       - name: Check internal links
         uses: lycheeverse/lychee-action@8646ba30535128ac92d33dfc9133794bfdd9b411 # v2
         with:
-          args: --offline --no-progress --root-dir docs/public './docs/public/**/*.html'
+          # --remap makes lychee resolve absolute docs.defectdojo.com URLs against
+          # the freshly built site, so absURL-rendered links (e.g. nav menu items)
+          # are verified as 404s instead of being skipped as remote URLs.
+          args: >-
+            --offline --no-progress
+            --root-dir ${{ github.workspace }}/docs/public
+            --remap "https://docs.defectdojo.com file://${{ github.workspace }}/docs/public"
+            './docs/public/**/*.html'
           fail: true
 
+      - name: Check in-app docs help links
+        # Find every file under dojo/ that hardcodes a docs.defectdojo.com URL
+        # (templates, settings, etc.) and check those links against the freshly
+        # built site. --remap turns the absolute docs URLs into local file lookups;
+        # --exclude '%7[BD]' drops URL-encoded Django template tags ({% ... %})
+        # so only real external docs URLs are checked. lychee is on $PATH from
+        # the previous lychee-action step.
+        run: |
+          set -euo pipefail
+          mapfile -t files < <(grep -rl 'docs\.defectdojo\.com' dojo/ \
+            --include='*.html' --include='*.py' --include='*.tpl')
+          if [ "${#files[@]}" -eq 0 ]; then
+            echo "No files reference docs.defectdojo.com — pattern is stale." >&2
+            exit 1
+          fi
+          printf 'Checking in-app docs links in:\n'
+          printf '  %s\n' "${files[@]}"
+          lychee --offline --no-progress \
+            --root-dir "${GITHUB_WORKSPACE}/docs/public" \
+            --remap "https://docs.defectdojo.com file://${GITHUB_WORKSPACE}/docs/public" \
+            --exclude '%7[BD]' \
+            "${files[@]}"
+

CLAUDE.md AGENTS.mdCLAUDE.md renamed to AGENTS.md

@@ -67,7 +67,8 @@ RUN \
 	--no-cache-dir \
 	--no-index \
   --find-links=/tmp/wheels \
-  -r ./requirements.txt
+  -r ./requirements.txt && \
+  apt-get -y purge --auto-remove git
 
 COPY \
   docker/entrypoint-celery-beat.sh \

Dockerfile.django-debian

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

components/package.json

@@ -274,13 +274,6 @@ else
     # The below tests are commented out because they are still an unstable work in progress
     ## Once Ready they can be uncommented.
 
-    # echo "Import Scanner integration test"
-    # if python3 tests/import_scanner_test.py ; then
-    #     echo "Success: Import Scanner integration tests passed"
-    # else
-    #     echo "Error: Import Scanner integration test failed"; exit 1
-    # fi
-
     # echo "Zap integration test"
     # if python3 tests/zap.py ; then
     #     echo "Success: zap integration tests passed"