Skip to content

Commit 84716d0

Browse files
paulOsinskipaulOsinski
authored
Merge branch 'dev' into docs/improve-snyk-documentation
2 parents f1611d7 + 5deca76 commit 84716d0

286 files changed

Lines changed: 10078 additions & 3899 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.dryrunsecurity.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,8 @@ sensitiveCodepaths:
4141
- 'dojo/middleware.py'
4242
- 'dojo/models.py'
4343
- 'dojo/okta.py'
44-
- 'dojo/pipeline.py'
45-
- 'dojo/remote_user.py'
44+
- 'dojo/sso/pipeline.py'
45+
- 'dojo/sso/remote_user.py'
4646
- 'dojo/tasks.py'
4747
- 'dojo/urls.py'
4848
- 'dojo/utils.py'

‎.github/workflows/pr-labeler.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
name: "Autolabeler"
1616
runs-on: ubuntu-latest
1717
steps:
18-
- uses: actions/labeler@634933edcd8ababfe52f92936142cc22ac488b1b # v6.0.1
18+
- uses: actions/labeler@f27b608878404679385c85cfa523b85ccb86e213 # v6.1.0
1919
with:
2020
repo-token: "${{ secrets.GITHUB_TOKEN }}"
2121
sync-labels: true

‎.github/workflows/release-1-create-pr.yml‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ jobs:
9393
grep -H version helm/defectdojo/Chart.yaml
9494
9595
- name: Run helm-docs
96-
uses: losisin/helm-docs-github-action@2ccf3e77eb70dc80d62f8cc26f15d0a96b75fef4 # v1.8.0
96+
uses: losisin/helm-docs-github-action@3a4528e97c49a5e83de6b78c50c61c8ee5c9f944 # v2
9797
with:
9898
chart-search-root: "helm/defectdojo"
9999

@@ -111,11 +111,17 @@ jobs:
111111
with:
112112
github-token: ${{ secrets.GITHUB_TOKEN }}
113113
script: |
114-
github.rest.pulls.create({
114+
const pr = await github.rest.pulls.create({
115115
owner: '${{ env.GITHUB_ORG }}',
116116
repo: 'django-DefectDojo',
117117
title: 'Release: Merge release into master from: ${{ env.NEW_BRANCH }}',
118118
body: `Release triggered by \`${ process.env.GITHUB_ACTOR }\``,
119119
head: '${{ env.NEW_BRANCH }}',
120120
base: 'master'
121121
})
122+
await github.rest.issues.addLabels({
123+
owner: '${{ env.GITHUB_ORG }}',
124+
repo: 'django-DefectDojo',
125+
issue_number: pr.data.number,
126+
labels: ['release-management']
127+
})

‎.github/workflows/release-3-master-into-dev.yml‎

Lines changed: 16 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ jobs:
8181
yq -i '.annotations."artifacthub.io/changes" = ""' helm/defectdojo/Chart.yaml
8282
8383
- name: Run helm-docs
84-
uses: losisin/helm-docs-github-action@2ccf3e77eb70dc80d62f8cc26f15d0a96b75fef4 # v1.8.0
84+
uses: losisin/helm-docs-github-action@3a4528e97c49a5e83de6b78c50c61c8ee5c9f944 # v2
8585
with:
8686
chart-search-root: "helm/defectdojo"
8787

@@ -99,14 +99,20 @@ jobs:
9999
with:
100100
github-token: ${{ secrets.GITHUB_TOKEN }}
101101
script: |
102-
github.rest.pulls.create({
102+
const pr = await github.rest.pulls.create({
103103
owner: '${{ env.GITHUB_ORG }}',
104104
repo: 'django-DefectDojo',
105105
title: 'Release: Merge back ${{ inputs.release_number_new }} into dev from: ${{ env.NEW_BRANCH }}',
106106
body: `Release triggered by \`${ process.env.GITHUB_ACTOR }\``,
107107
head: '${{ env.NEW_BRANCH }}',
108108
base: 'dev'
109109
})
110+
await github.rest.issues.addLabels({
111+
owner: '${{ env.GITHUB_ORG }}',
112+
repo: 'django-DefectDojo',
113+
issue_number: pr.data.number,
114+
labels: ['release-management']
115+
})
110116
111117
create_pr_for_merge_back_into_bugfix:
112118
runs-on: ubuntu-latest
@@ -157,7 +163,7 @@ jobs:
157163
yq -i '.annotations."artifacthub.io/changes" = ""' helm/defectdojo/Chart.yaml
158164
159165
- name: Run helm-docs
160-
uses: losisin/helm-docs-github-action@2ccf3e77eb70dc80d62f8cc26f15d0a96b75fef4 # v1.8.0
166+
uses: losisin/helm-docs-github-action@3a4528e97c49a5e83de6b78c50c61c8ee5c9f944 # v2
161167
with:
162168
chart-search-root: "helm/defectdojo"
163169

@@ -175,11 +181,17 @@ jobs:
175181
with:
176182
github-token: ${{ secrets.GITHUB_TOKEN }}
177183
script: |
178-
github.rest.pulls.create({
184+
const pr = await github.rest.pulls.create({
179185
owner: '${{ env.GITHUB_ORG }}',
180186
repo: 'django-DefectDojo',
181187
title: 'Release: Merge back ${{ inputs.release_number_new }} into bugfix from: ${{ env.NEW_BRANCH }}',
182188
body: `Release triggered by \`${ process.env.GITHUB_ACTOR }\``,
183189
head: '${{ env.NEW_BRANCH }}',
184190
base: 'bugfix'
185191
})
192+
await github.rest.issues.addLabels({
193+
owner: '${{ env.GITHUB_ORG }}',
194+
repo: 'django-DefectDojo',
195+
issue_number: pr.data.number,
196+
labels: ['release-management']
197+
})

‎.github/workflows/release-drafter.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ jobs:
2727
steps:
2828
- name: Create Release
2929
id: create_release
30-
uses: release-drafter/release-drafter@5de93583980a40bd78603b6dfdcda5b4df377b32 # v7.2.0
30+
uses: release-drafter/release-drafter@563bf132657a13ded0b01fcb723c5a58cdd824e2 # v7.2.1
3131
with:
3232
version: ${{ inputs.version }}
3333
env:

‎.github/workflows/renovate.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,4 +21,4 @@ jobs:
2121
uses: suzuki-shunsuke/github-action-renovate-config-validator@ee9f69e1f683ed0d08225086482b34fc9abe9300 # v2.1.0
2222
with:
2323
strict: "true"
24-
validator_version: 43.139.4 # renovate: datasource=github-releases depName=renovatebot/renovate
24+
validator_version: 43.141.6 # renovate: datasource=github-releases depName=renovatebot/renovate

‎.github/workflows/test-helm-chart.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -129,14 +129,14 @@ jobs:
129129
git commit -m "ci: update Chart annotations from PR #${{ github.event.pull_request.number }}" || echo "No changes to commit"
130130
131131
- name: Run helm-docs (update)
132-
uses: losisin/helm-docs-github-action@2ccf3e77eb70dc80d62f8cc26f15d0a96b75fef4 # v1.8.0
132+
uses: losisin/helm-docs-github-action@3a4528e97c49a5e83de6b78c50c61c8ee5c9f944 # v2
133133
if: startsWith(github.head_ref, 'renovate/') || startsWith(github.head_ref, 'dependabot/')
134134
with:
135135
chart-search-root: "helm/defectdojo"
136136
git-push: true
137137

138138
- name: Run helm-docs (check)
139-
uses: losisin/helm-docs-github-action@2ccf3e77eb70dc80d62f8cc26f15d0a96b75fef4 # v1.8.0
139+
uses: losisin/helm-docs-github-action@3a4528e97c49a5e83de6b78c50c61c8ee5c9f944 # v2
140140
if: ${{ !(startsWith(github.head_ref, 'renovate/') || startsWith(github.head_ref, 'dependabot/')) }}
141141
with:
142142
fail-on-diff: true
@@ -155,7 +155,7 @@ jobs:
155155
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
156156

157157
- name: Generate values schema json
158-
uses: losisin/helm-values-schema-json-action@02bda41b469ccfb3f0abb35f4211e598b0b6ea3e # v2.5.0
158+
uses: losisin/helm-values-schema-json-action@39cdf80504f6c95ad3c4f317e2135e2509ea56bb # v3
159159
with:
160160
fail-on-diff: true
161161
working-directory: "helm/defectdojo"

‎Dockerfile.django-debian‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
# Dockerfile.nginx to use the caching mechanism of Docker.
66

77
# Ref: https://devguide.python.org/#branchstatus
8-
FROM python:3.13.13-slim-trixie@sha256:9213d136547f0602c3337ff48291e937f9cc43060b3e123402cf2aaff1a08b75 AS base
8+
FROM python:3.13.13-slim-trixie@sha256:d2462a6bed37b4fc6cabecf5a2132ae70df772fe03c7393c4d98a0c2fb48aa2e AS base
99
FROM base AS build
1010
WORKDIR /app
1111
RUN \

‎Dockerfile.integration-tests-debian‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11

22
# code: language=Dockerfile
33

4-
FROM openapitools/openapi-generator-cli:v7.21.0@sha256:ce308310f3c1f8761e65338b8ab87b651bf4862c6acb80de510f381fffc4510b AS openapitools
4+
FROM openapitools/openapi-generator-cli:v7.22.0@sha256:1f459499a7c794aa0ea769c3c9b0eb54806c5ad2f68510a0ebb9338d0a626ced AS openapitools
55
# currently only supports x64, no arm yet due to chrome and selenium dependencies
6-
FROM python:3.13.13-slim-trixie@sha256:9213d136547f0602c3337ff48291e937f9cc43060b3e123402cf2aaff1a08b75 AS build
6+
FROM python:3.13.13-slim-trixie@sha256:d2462a6bed37b4fc6cabecf5a2132ae70df772fe03c7393c4d98a0c2fb48aa2e AS build
77
WORKDIR /app
88
RUN \
99
apt-get -y update && \

‎components/package.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "defectdojo",
3-
"version": "2.58.0-dev",
3+
"version": "2.59.0-dev",
44
"license" : "BSD-3-Clause",
55
"private": true,
66
"dependencies": {
@@ -12,12 +12,12 @@
1212
"chosen-bootstrap": "https://github.com/dbtek/chosen-bootstrap",
1313
"chosen-js": "^1.8.7",
1414
"clipboard": "^2.0.11",
15-
"datatables.net": "^2.3.7",
15+
"datatables.net": "^2.3.8",
1616
"datatables.net-buttons-bs": "^3.2.6",
1717
"datatables.net-colreorder": "^2.1.2",
1818
"drmonty-datatables-plugins": "^1.0.0",
1919
"drmonty-datatables-responsive": "^1.0.0",
20-
"easymde": "^2.20.0",
20+
"easymde": "^2.21.0",
2121
"flot": "flot/flot#~0.8.3",
2222
"font-awesome": "^4.0.0",
2323
"fullcalendar": "^3.10.2",

0 commit comments

Comments
 (0)