Merge remote-tracking branch 'origin/dev' into pr-15089

Author: Maffooch

.github/workflows/gh-pages.yml

@@ -27,7 +27,7 @@ jobs:
           node-version: '24.18.0' # TODO: Renovate helper might not be needed here - needs to be fully tested
 
       - name: Cache dependencies
-        uses: actions/cache@2c8a9bd7457de244a408f35966fab2fb45fda9c8 # v6.0.0
+        uses: actions/cache@55cc8345863c7cc4c66a329aec7e433d2d1c52a9 # v6.1.0
         with:
           path: ~/.npm
           key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }}

.github/workflows/release-drafter.yml

@@ -23,7 +23,7 @@ jobs:
   update_release_draft:
     runs-on: ubuntu-latest
     outputs:
-      upload_url: ${{ steps.create_release.outputs.upload_url }}
+      tag_name: ${{ steps.create_release.outputs.tag_name }}
     steps:
       - name: Create Release
         id: create_release
@@ -51,26 +51,12 @@ jobs:
         with:
           pattern: oas-*
 
-      - name: Upload Release Asset - OpenAPI Specification - YAML
-        id: upload-release-asset-yaml
-        uses: actions/upload-release-asset@e8f9f06c4b078e705bd2ea027f0926603fc9b4d5 # v1.0.2
+      - name: Upload OAS schemas to release
         env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        with:
-          upload_url: ${{ needs.update_release_draft.outputs.upload_url }}
-          asset_path: ./oas-yaml/oas.yaml
-          asset_name: oas.yaml
-          asset_content_type: application/vnd.oai.openapi
-
-      - name: Upload Release Asset - OpenAPI Specification - JSON
-        id: upload-release-asset-json
-        uses: actions/upload-release-asset@e8f9f06c4b078e705bd2ea027f0926603fc9b4d5 # v1.0.2
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        with:
-          upload_url: ${{ needs.update_release_draft.outputs.upload_url }}
-          asset_path: ./oas-json/oas.json
-          asset_name: oas.json
-          asset_content_type: application/json
+          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        run: |
+          gh release upload "${{ needs.update_release_draft.outputs.tag_name }}" \
+            ./oas-yaml/oas.yaml ./oas-json/oas.json \
+            --clobber --repo "${{ github.repository }}"
 
 

.github/workflows/renovate.yaml

@@ -21,4 +21,4 @@ jobs:
         uses: suzuki-shunsuke/github-action-renovate-config-validator@ee9f69e1f683ed0d08225086482b34fc9abe9300 # v2.1.0
         with:
           strict: "true"
-          validator_version: 43.240.0 # renovate: datasource=github-releases depName=renovatebot/renovate
+          validator_version: 43.248.0 # renovate: datasource=github-releases depName=renovatebot/renovate

.github/workflows/validate_docs_build.yml

@@ -22,7 +22,7 @@ jobs:
           node-version: '24.18.0' # TODO: Renovate helper might not be needed here - needs to be fully tested
 
       - name: Cache dependencies
-        uses: actions/cache@2c8a9bd7457de244a408f35966fab2fb45fda9c8 # v6.0.0
+        uses: actions/cache@55cc8345863c7cc4c66a329aec7e433d2d1c52a9 # v6.1.0
         with:
           path: ~/.npm
           key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }}

.gitmodules

@@ -5,7 +5,7 @@
 # Dockerfile.nginx to use the caching mechanism of Docker.
 
 # Ref: https://devguide.python.org/#branchstatus
-FROM python:3.14.6-slim-trixie@sha256:63a4c7f612a00f92042cbdcc7cdc6a306f38485af0a200b9c89de7d9b1607d15 AS base
+FROM python:3.14.6-slim-trixie@sha256:b877e50bd90de10af8d82c57a022fc2e0dc731c5320d762a27986facfc3355c1 AS base
 FROM base AS build
 WORKDIR /app
 RUN \

Dockerfile.django-debian

@@ -3,7 +3,7 @@
 
 FROM openapitools/openapi-generator-cli:v7.23.0@sha256:5ffccd3b0d4ac57eac443e1c9b3e2f2bb7f0a21ffe6c6701f3690d7edc78bf2d AS openapitools
 # currently only supports x64, no arm yet due to chrome and selenium dependencies
-FROM python:3.14.6-slim-trixie@sha256:63a4c7f612a00f92042cbdcc7cdc6a306f38485af0a200b9c89de7d9b1607d15 AS build
+FROM python:3.14.6-slim-trixie@sha256:b877e50bd90de10af8d82c57a022fc2e0dc731c5320d762a27986facfc3355c1 AS build
 WORKDIR /app
 RUN \
   apt-get -y update && \

Dockerfile.integration-tests-debian

@@ -34,7 +34,7 @@ Pro Edition: [pro.demo.defectdojo.com](https://pro.demo.defectdojo.com)
 
 OWASP Community Edition: [demo.defectdojo.org](https://demo.defectdojo.org)
 
-Either demo enviornment can be logged into with username `admin` and password `1Defectdojo@demo#appsec`. Please note that the demos are publicly accessible
+Either demo environment can be logged into with username `admin` and password `1Defectdojo@demo#appsec`. Please note that the demos are publicly accessible
 and reset every day. Do not put sensitive data in the demo. An easy way to test DefectDojo is to upload some [sample scan reports](https://github.com/DefectDojo/django-DefectDojo/tree/master/unittests/scans).
 
 ## Quick Start for Docker Compose

README.md

@@ -0,0 +1 @@
+<mxfile host="app.diagrams.net"><diagram name="Asset Hierarchy"><mxGraphModel dx="800" dy="600" grid="0" gridSize="10" guides="1" tooltips="1" connect="1" arrows="1" fold="1" page="1" pageScale="1" pageWidth="1100" pageHeight="680" math="0" shadow="0"><root><mxCell id="0"/><mxCell id="1" parent="0"/><mxCell id="n11" value="Organization" style="rounded=1;whiteSpace=wrap;html=1;arcSize=45;fillColor=#dae8fc;strokeColor=#6c8ebf;strokeWidth=2;fontColor=#000000;fontSize=18;fontFamily=Helvetica;" vertex="1" parent="1"><mxGeometry x="450" y="20" width="180" height="60" as="geometry"/></mxCell><mxCell id="n12" value="Asset" style="rounded=1;whiteSpace=wrap;html=1;arcSize=45;fillColor=#e1d5e7;strokeColor=#9673a6;strokeWidth=2;fontColor=#000000;fontSize=18;fontFamily=Helvetica;" vertex="1" parent="1"><mxGeometry x="20" y="120" width="160" height="60" as="geometry"/></mxCell><mxCell id="n13" value="Asset" style="rounded=1;whiteSpace=wrap;html=1;arcSize=45;fillColor=#e1d5e7;strokeColor=#9673a6;strokeWidth=2;fontColor=#000000;fontSize=18;fontFamily=Helvetica;" vertex="1" parent="1"><mxGeometry x="900" y="120" width="160" height="60" as="geometry"/></mxCell><mxCell id="n14" value="Engagement" style="rounded=1;whiteSpace=wrap;html=1;arcSize=45;fillColor=#d5e8d4;strokeColor=#82b366;strokeWidth=2;fontColor=#000000;fontSize=18;fontFamily=Helvetica;" vertex="1" parent="1"><mxGeometry x="15" y="220" width="170" height="60" as="geometry"/></mxCell><mxCell id="n15" value="Engagement" style="rounded=1;whiteSpace=wrap;html=1;arcSize=45;fillColor=#d5e8d4;strokeColor=#82b366;strokeWidth=2;fontColor=#000000;fontSize=18;fontFamily=Helvetica;" vertex="1" parent="1"><mxGeometry x="455" y="220" width="170" height="60" as="geometry"/></mxCell><mxCell id="n16" value="Engagement" style="rounded=1;whiteSpace=wrap;html=1;arcSize=45;fillColor=#d5e8d4;strokeColor=#82b366;strokeWidth=2;fontColor=#000000;fontSize=18;fontFamily=Helvetica;" vertex="1" parent="1"><mxGeometry x="895" y="220" width="170" height="60" as="geometry"/></mxCell><mxCell id="n17" value="Test" style="rounded=1;whiteSpace=wrap;html=1;arcSize=45;fillColor=#fff2cc;strokeColor=#d6b656;strokeWidth=2;fontColor=#000000;fontSize=18;fontFamily=Helvetica;" vertex="1" parent="1"><mxGeometry x="20" y="320" width="160" height="60" as="geometry"/></mxCell><mxCell id="n18" value="Test" style="rounded=1;whiteSpace=wrap;html=1;arcSize=45;fillColor=#fff2cc;strokeColor=#d6b656;strokeWidth=2;fontColor=#000000;fontSize=18;fontFamily=Helvetica;" vertex="1" parent="1"><mxGeometry x="240" y="320" width="160" height="60" as="geometry"/></mxCell><mxCell id="n19" value="Test" style="rounded=1;whiteSpace=wrap;html=1;arcSize=45;fillColor=#fff2cc;strokeColor=#d6b656;strokeWidth=2;fontColor=#000000;fontSize=18;fontFamily=Helvetica;" vertex="1" parent="1"><mxGeometry x="460" y="320" width="160" height="60" as="geometry"/></mxCell><mxCell id="n20" value="Test" style="rounded=1;whiteSpace=wrap;html=1;arcSize=45;fillColor=#fff2cc;strokeColor=#d6b656;strokeWidth=2;fontColor=#000000;fontSize=18;fontFamily=Helvetica;" vertex="1" parent="1"><mxGeometry x="680" y="320" width="160" height="60" as="geometry"/></mxCell><mxCell id="n21" value="Test" style="rounded=1;whiteSpace=wrap;html=1;arcSize=45;fillColor=#fff2cc;strokeColor=#d6b656;strokeWidth=2;fontColor=#000000;fontSize=18;fontFamily=Helvetica;" vertex="1" parent="1"><mxGeometry x="900" y="320" width="160" height="60" as="geometry"/></mxCell><mxCell id="n22" value="" style="rounded=1;whiteSpace=wrap;html=1;arcSize=45;fillColor=#f8cecc;strokeColor=#b85450;strokeWidth=2;" vertex="1" parent="1"><mxGeometry x="44" y="416" width="160" height="60" as="geometry"/></mxCell><mxCell id="n23" value="" style="rounded=1;whiteSpace=wrap;html=1;arcSize=45;fillColor=#f8cecc;strokeColor=#b85450;strokeWidth=2;" vertex="1" parent="1"><mxGeometry x="32" y="428" width="160" height="60" as="geometry"/></mxCell><mxCell id="n24" value="Finding" style="rounded=1;whiteSpace=wrap;html=1;arcSize=45;fillColor=#f8cecc;strokeColor=#b85450;strokeWidth=2;fontColor=#000000;fontSize=18;fontFamily=Helvetica;" vertex="1" parent="1"><mxGeometry x="20" y="440" width="160" height="60" as="geometry"/></mxCell><mxCell id="n25" value="" style="rounded=1;whiteSpace=wrap;html=1;arcSize=45;fillColor=#f8cecc;strokeColor=#b85450;strokeWidth=2;" vertex="1" parent="1"><mxGeometry x="264" y="416" width="160" height="60" as="geometry"/></mxCell><mxCell id="n26" value="" style="rounded=1;whiteSpace=wrap;html=1;arcSize=45;fillColor=#f8cecc;strokeColor=#b85450;strokeWidth=2;" vertex="1" parent="1"><mxGeometry x="252" y="428" width="160" height="60" as="geometry"/></mxCell><mxCell id="n27" value="Finding" style="rounded=1;whiteSpace=wrap;html=1;arcSize=45;fillColor=#f8cecc;strokeColor=#b85450;strokeWidth=2;fontColor=#000000;fontSize=18;fontFamily=Helvetica;" vertex="1" parent="1"><mxGeometry x="240" y="440" width="160" height="60" as="geometry"/></mxCell><mxCell id="n28" value="" style="rounded=1;whiteSpace=wrap;html=1;arcSize=45;fillColor=#f8cecc;strokeColor=#b85450;strokeWidth=2;" vertex="1" parent="1"><mxGeometry x="484" y="416" width="160" height="60" as="geometry"/></mxCell><mxCell id="n29" value="" style="rounded=1;whiteSpace=wrap;html=1;arcSize=45;fillColor=#f8cecc;strokeColor=#b85450;strokeWidth=2;" vertex="1" parent="1"><mxGeometry x="472" y="428" width="160" height="60" as="geometry"/></mxCell><mxCell id="n30" value="Finding" style="rounded=1;whiteSpace=wrap;html=1;arcSize=45;fillColor=#f8cecc;strokeColor=#b85450;strokeWidth=2;fontColor=#000000;fontSize=18;fontFamily=Helvetica;" vertex="1" parent="1"><mxGeometry x="460" y="440" width="160" height="60" as="geometry"/></mxCell><mxCell id="n31" value="" style="rounded=1;whiteSpace=wrap;html=1;arcSize=45;fillColor=#f8cecc;strokeColor=#b85450;strokeWidth=2;" vertex="1" parent="1"><mxGeometry x="924" y="416" width="160" height="60" as="geometry"/></mxCell><mxCell id="n32" value="" style="rounded=1;whiteSpace=wrap;html=1;arcSize=45;fillColor=#f8cecc;strokeColor=#b85450;strokeWidth=2;" vertex="1" parent="1"><mxGeometry x="912" y="428" width="160" height="60" as="geometry"/></mxCell><mxCell id="n33" value="Finding" style="rounded=1;whiteSpace=wrap;html=1;arcSize=45;fillColor=#f8cecc;strokeColor=#b85450;strokeWidth=2;fontColor=#000000;fontSize=18;fontFamily=Helvetica;" vertex="1" parent="1"><mxGeometry x="900" y="440" width="160" height="60" as="geometry"/></mxCell><mxCell id="n34" value="Endpoints" style="rounded=1;whiteSpace=wrap;html=1;arcSize=45;fillColor=#ffe6cc;strokeColor=#d79b00;strokeWidth=2;fontColor=#000000;fontSize=18;fontFamily=Helvetica;" vertex="1" parent="1"><mxGeometry x="20" y="580" width="160" height="60" as="geometry"/></mxCell><mxCell id="n35" value="Endpoints" style="rounded=1;whiteSpace=wrap;html=1;arcSize=45;fillColor=#ffe6cc;strokeColor=#d79b00;strokeWidth=2;fontColor=#000000;fontSize=18;fontFamily=Helvetica;" vertex="1" parent="1"><mxGeometry x="460" y="580" width="160" height="60" as="geometry"/></mxCell><mxCell id="n36" value="Endpoints" style="rounded=1;whiteSpace=wrap;html=1;arcSize=45;fillColor=#ffe6cc;strokeColor=#d79b00;strokeWidth=2;fontColor=#000000;fontSize=18;fontFamily=Helvetica;" vertex="1" parent="1"><mxGeometry x="900" y="580" width="160" height="60" as="geometry"/></mxCell><mxCell id="n37" style="endArrow=none;html=1;edgeStyle=orthogonalEdgeStyle;rounded=0;strokeColor=#000000;strokeWidth=4;exitX=0.5;exitY=1;exitDx=0;exitDy=0;entryX=0.5;entryY=0;entryDx=0;entryDy=0;" edge="1" parent="1" source="n11" target="n12"><mxGeometry relative="1" as="geometry"><Array as="points"><mxPoint x="540" y="100"/><mxPoint x="100" y="100"/></Array></mxGeometry></mxCell><mxCell id="n38" style="endArrow=none;html=1;edgeStyle=orthogonalEdgeStyle;rounded=0;strokeColor=#000000;strokeWidth=4;exitX=0.5;exitY=1;exitDx=0;exitDy=0;entryX=0.5;entryY=0;entryDx=0;entryDy=0;" edge="1" parent="1" source="n11" target="n13"><mxGeometry relative="1" as="geometry"><Array as="points"><mxPoint x="540" y="100"/><mxPoint x="980" y="100"/></Array></mxGeometry></mxCell><mxCell id="n39" style="endArrow=none;html=1;edgeStyle=orthogonalEdgeStyle;rounded=0;strokeColor=#000000;strokeWidth=4;exitX=0.5;exitY=1;exitDx=0;exitDy=0;entryX=0.5;entryY=0;entryDx=0;entryDy=0;" edge="1" parent="1" source="n12" target="n14"><mxGeometry relative="1" as="geometry"></mxGeometry></mxCell><mxCell id="n40" style="endArrow=none;html=1;edgeStyle=orthogonalEdgeStyle;rounded=0;strokeColor=#000000;strokeWidth=4;exitX=0.5;exitY=1;exitDx=0;exitDy=0;entryX=0.5;entryY=0;entryDx=0;entryDy=0;" edge="1" parent="1" source="n12" target="n15"><mxGeometry relative="1" as="geometry"><Array as="points"><mxPoint x="100" y="200"/><mxPoint x="540" y="200"/></Array></mxGeometry></mxCell><mxCell id="n41" style="endArrow=none;html=1;edgeStyle=orthogonalEdgeStyle;rounded=0;strokeColor=#000000;strokeWidth=4;exitX=0.5;exitY=1;exitDx=0;exitDy=0;entryX=0.5;entryY=0;entryDx=0;entryDy=0;" edge="1" parent="1" source="n13" target="n16"><mxGeometry relative="1" as="geometry"></mxGeometry></mxCell><mxCell id="n42" style="endArrow=none;html=1;edgeStyle=orthogonalEdgeStyle;rounded=0;strokeColor=#000000;strokeWidth=4;exitX=0.5;exitY=1;exitDx=0;exitDy=0;entryX=0.5;entryY=0;entryDx=0;entryDy=0;" edge="1" parent="1" source="n14" target="n17"><mxGeometry relative="1" as="geometry"></mxGeometry></mxCell><mxCell id="n43" style="endArrow=none;html=1;edgeStyle=orthogonalEdgeStyle;rounded=0;strokeColor=#000000;strokeWidth=4;exitX=0.5;exitY=1;exitDx=0;exitDy=0;entryX=0.5;entryY=0;entryDx=0;entryDy=0;" edge="1" parent="1" source="n14" target="n18"><mxGeometry relative="1" as="geometry"><Array as="points"><mxPoint x="100" y="300"/><mxPoint x="320" y="300"/></Array></mxGeometry></mxCell><mxCell id="n44" style="endArrow=none;html=1;edgeStyle=orthogonalEdgeStyle;rounded=0;strokeColor=#000000;strokeWidth=4;exitX=0.5;exitY=1;exitDx=0;exitDy=0;entryX=0.5;entryY=0;entryDx=0;entryDy=0;" edge="1" parent="1" source="n15" target="n19"><mxGeometry relative="1" as="geometry"></mxGeometry></mxCell><mxCell id="n45" style="endArrow=none;html=1;edgeStyle=orthogonalEdgeStyle;rounded=0;strokeColor=#000000;strokeWidth=4;exitX=0.5;exitY=1;exitDx=0;exitDy=0;entryX=0.5;entryY=0;entryDx=0;entryDy=0;" edge="1" parent="1" source="n15" target="n20"><mxGeometry relative="1" as="geometry"><Array as="points"><mxPoint x="540" y="300"/><mxPoint x="760" y="300"/></Array></mxGeometry></mxCell><mxCell id="n46" style="endArrow=none;html=1;edgeStyle=orthogonalEdgeStyle;rounded=0;strokeColor=#000000;strokeWidth=4;exitX=0.5;exitY=1;exitDx=0;exitDy=0;entryX=0.5;entryY=0;entryDx=0;entryDy=0;" edge="1" parent="1" source="n16" target="n21"><mxGeometry relative="1" as="geometry"></mxGeometry></mxCell><mxCell id="n47" style="endArrow=none;html=1;edgeStyle=orthogonalEdgeStyle;rounded=0;strokeColor=#000000;strokeWidth=4;exitX=0.5;exitY=1;exitDx=0;exitDy=0;entryX=0.5;entryY=0;entryDx=0;entryDy=0;" edge="1" parent="1" source="n17" target="n24"><mxGeometry relative="1" as="geometry"></mxGeometry></mxCell><mxCell id="n48" style="endArrow=none;html=1;edgeStyle=orthogonalEdgeStyle;rounded=0;strokeColor=#000000;strokeWidth=4;exitX=0.5;exitY=1;exitDx=0;exitDy=0;entryX=0.5;entryY=0;entryDx=0;entryDy=0;" edge="1" parent="1" source="n18" target="n27"><mxGeometry relative="1" as="geometry"></mxGeometry></mxCell><mxCell id="n49" style="endArrow=none;html=1;edgeStyle=orthogonalEdgeStyle;rounded=0;strokeColor=#000000;strokeWidth=4;exitX=0.5;exitY=1;exitDx=0;exitDy=0;entryX=0.5;entryY=0;entryDx=0;entryDy=0;" edge="1" parent="1" source="n19" target="n30"><mxGeometry relative="1" as="geometry"></mxGeometry></mxCell><mxCell id="n50" style="endArrow=none;html=1;edgeStyle=orthogonalEdgeStyle;rounded=0;strokeColor=#000000;strokeWidth=4;exitX=0.5;exitY=1;exitDx=0;exitDy=0;entryX=0.5;entryY=0;entryDx=0;entryDy=0;" edge="1" parent="1" source="n21" target="n33"><mxGeometry relative="1" as="geometry"></mxGeometry></mxCell><mxCell id="n51" style="endArrow=none;html=1;edgeStyle=orthogonalEdgeStyle;rounded=0;strokeColor=#000000;strokeWidth=4;exitX=0.5;exitY=1;exitDx=0;exitDy=0;entryX=0.5;entryY=0;entryDx=0;entryDy=0;" edge="1" parent="1" source="n24" target="n34"><mxGeometry relative="1" as="geometry"></mxGeometry></mxCell><mxCell id="n52" style="endArrow=none;html=1;edgeStyle=orthogonalEdgeStyle;rounded=0;strokeColor=#000000;strokeWidth=4;exitX=0.5;exitY=1;exitDx=0;exitDy=0;entryX=0.5;entryY=0;entryDx=0;entryDy=0;" edge="1" parent="1" source="n27" target="n34"><mxGeometry relative="1" as="geometry"><Array as="points"><mxPoint x="320" y="540"/><mxPoint x="100" y="540"/></Array></mxGeometry></mxCell><mxCell id="n53" style="endArrow=none;html=1;edgeStyle=orthogonalEdgeStyle;rounded=0;strokeColor=#000000;strokeWidth=4;exitX=0.5;exitY=1;exitDx=0;exitDy=0;entryX=0.5;entryY=0;entryDx=0;entryDy=0;" edge="1" parent="1" source="n30" target="n35"><mxGeometry relative="1" as="geometry"></mxGeometry></mxCell><mxCell id="n54" style="endArrow=none;html=1;edgeStyle=orthogonalEdgeStyle;rounded=0;strokeColor=#000000;strokeWidth=4;exitX=0.5;exitY=1;exitDx=0;exitDy=0;entryX=0.5;entryY=0;entryDx=0;entryDy=0;" edge="1" parent="1" source="n33" target="n36"><mxGeometry relative="1" as="geometry"></mxGeometry></mxCell></root></mxGraphModel></diagram></mxfile>