Skip to content

Commit 620a7a7

Browse files
MaffoochMaffooch
authored
Merge branch 'dev' into merge-bugfix-into-dev-2.20.0
2 parents e885857 + 9b3d902 commit 620a7a7

Some content is hidden

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

59 files changed

+14013
-501
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
update_release_draft:
2020
runs-on: ubuntu-latest
2121
steps:
22-
- uses: release-drafter/release-drafter@v5.22.0
22+
- uses: release-drafter/release-drafter@v5.23.0
2323
with:
2424
version: ${{github.event.inputs.version}}
2525
env:

‎.github/workflows/release-x-manual-docker-containers.yml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ jobs:
2929
matrix:
3030
docker-image: [django, nginx]
3131
os: [alpine, debian]
32+
platform: [amd64, arm64]
3233
steps:
3334
- name: Login to DockerHub
3435
uses: docker/login-action@v2
@@ -87,6 +88,7 @@ jobs:
8788
context: .
8889
cache-from: type=local,src=/tmp/.buildx-cache-${{ env.docker-image }}
8990
cache-to: type=local,dest=/tmp/.buildx-cache-${{ env.docker-image }}
91+
platforms: ${{ matrix.platform }}
9092

9193
- name: Image digest
9294
run: echo ${{ steps.docker_build.outputs.digest }}

‎components/package.json‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,11 @@
1414
"chosen-js": "^1.8.7",
1515
"clipboard": "^2.0.11",
1616
"components-jqueryui": "^1.0.0",
17-
"datatables.net": "^1.13.2",
18-
"datatables.net-buttons-bs": "^2.3.4",
19-
"datatables.net-buttons-dt": "^2.3.4",
17+
"datatables.net": "^1.13.3",
18+
"datatables.net-buttons-bs": "^2.3.5",
19+
"datatables.net-buttons-dt": "^2.3.5",
2020
"datatables.net-colreorder": "^1.6.1",
21-
"datatables.net-dt": "^1.13.2",
21+
"datatables.net-dt": "^1.13.3",
2222
"drmonty-datatables-plugins": "^1.0.0",
2323
"drmonty-datatables-responsive": "^1.0.0",
2424
"easymde": "^2.18.0",

‎components/yarn.lock‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -277,19 +277,19 @@ datatables.net-bs@>=1.12.1:
277277
datatables.net ">=1.12.1"
278278
jquery ">=1.7"
279279

280-
datatables.net-buttons-bs@^2.3.4:
281-
version "2.3.4"
282-
resolved "https://registry.yarnpkg.com/datatables.net-buttons-bs/-/datatables.net-buttons-bs-2.3.4.tgz#a813f4c4e5eea3ca67e6833ffd097c7f988e26a3"
283-
integrity sha512-3+4gu0QGrfGW7UuIlHTFuUuXTOAO1zOy5pMrgzK9WIg4lrmtgjsbXQOSvSD+q49wAxnw/FJ3E2fhXIZK8xfYRA==
280+
datatables.net-buttons-bs@^2.3.5:
281+
version "2.3.5"
282+
resolved "https://registry.yarnpkg.com/datatables.net-buttons-bs/-/datatables.net-buttons-bs-2.3.5.tgz#1c2d49ebdaba551fec63c732619aec305e7b0834"
283+
integrity sha512-jWe9KP355Z7IETjeMv/NDjyVaokIIyfuZN6sCothfCaMuOFO6Vhr3tlngsFmNYBZzBsTZhBRS04t24bPYJbD4w==
284284
dependencies:
285285
datatables.net-bs ">=1.12.1"
286286
datatables.net-buttons ">=2.2.3"
287287
jquery ">=1.7"
288288

289-
datatables.net-buttons-dt@^2.3.4:
290-
version "2.3.4"
291-
resolved "https://registry.yarnpkg.com/datatables.net-buttons-dt/-/datatables.net-buttons-dt-2.3.4.tgz#764d35c48da3c86a90d182a93d35975214f834aa"
292-
integrity sha512-Lea5X3peCUCIa1ddrwuSg87WwXMjha3GpChsyFDun9wRbl6WgIdXC7AjmdgAqfOy4KLptT161xnlQknrUIPUFA==
289+
datatables.net-buttons-dt@^2.3.5:
290+
version "2.3.5"
291+
resolved "https://registry.yarnpkg.com/datatables.net-buttons-dt/-/datatables.net-buttons-dt-2.3.5.tgz#4cf98d65bf2077ddb989ff64afc6386ab719cdd3"
292+
integrity sha512-hAIujO+rryijw00JxKJq7inBFcIqVvKGRSBaCuMNNsCfG/9GqovfHLPBLQif85LUEV7uLGH4S7g9sgTNlx+dzA==
293293
dependencies:
294294
datatables.net-buttons ">=2.2.3"
295295
datatables.net-dt ">=1.12.1"
@@ -311,18 +311,18 @@ datatables.net-colreorder@^1.6.1:
311311
datatables.net ">=1.12.1"
312312
jquery ">=1.7"
313313

314-
datatables.net-dt@>=1.12.1, datatables.net-dt@^1.13.2:
315-
version "1.13.2"
316-
resolved "https://registry.yarnpkg.com/datatables.net-dt/-/datatables.net-dt-1.13.2.tgz#fae827ad0e8b94d835bf68189ce6f97c79283ae2"
317-
integrity sha512-+akHG1Up2xd+HiayCO/u94JhNLsVroLPUWAG5t+UPos4OXwg0LVNEYcmy0noy6xJPOt0fP/SJ6GOmHXCU1Opcg==
314+
datatables.net-dt@>=1.12.1, datatables.net-dt@^1.13.3:
315+
version "1.13.3"
316+
resolved "https://registry.yarnpkg.com/datatables.net-dt/-/datatables.net-dt-1.13.3.tgz#8f230f0f749b8df0539f84361cf15d76278e4f95"
317+
integrity sha512-cyJP7a+cGkJmv/NvF6ypoiibN67MIbdsoSqiMl4wxpmIkN8VF0i0jXw5WzRIpE70o/wsiLWantmoNRf+A7+uiw==
318318
dependencies:
319319
datatables.net ">=1.12.1"
320320
jquery ">=1.7"
321321

322-
datatables.net@>=1.12.1, datatables.net@^1.13.2:
323-
version "1.13.2"
324-
resolved "https://registry.yarnpkg.com/datatables.net/-/datatables.net-1.13.2.tgz#48f7035b1696a29cb70909db1f2e0ebd5f946f3e"
325-
integrity sha512-u5nOU+C9SBp1SyPmd6G+niozZtrBwo1E8xzdOk3JJaAkFYgX/KxF3Gd79R8YLbUfmIs2OLnLe5gaz/qs5U8UDA==
322+
datatables.net@>=1.12.1, datatables.net@^1.13.3:
323+
version "1.13.3"
324+
resolved "https://registry.yarnpkg.com/datatables.net/-/datatables.net-1.13.3.tgz#ee7d7b16b479b5075412b104d980184693b4325b"
325+
integrity sha512-YVnz02oJsaP/OfnclBlqHkuV1il60sSVa+a0Xvs5gyiDLftmAxc+rvVAwCm7O0OpKo09N43k6EcCAf3L9WYI7g==
326326
dependencies:
327327
jquery ">=1.7"
328328

‎docker-compose.override.integration_tests.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ services:
44
integration-tests:
55
build:
66
context: ./
7-
dockerfile: "${INTEGRATION-TESTS_DOCKERFILE:-Dockerfile.integration-tests-debian}"
7+
dockerfile: ${INTEGRATION_TESTS_DOCKERFILE:-Dockerfile.integration-tests-debian}
88
image: "defectdojo/defectdojo-integration-tests:${INTEGRATION_TESTS_VERSION:-latest}"
99
profiles:
1010
- mysql-rabbitmq

‎docker-compose.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@ services:
130130
source: ./docker/extra_settings
131131
target: /app/docker/extra_settings
132132
mysql:
133-
image: mysql:5.7.41@sha256:7fe02bf3592e9ec218e17f0bf39bd3fc7a118c6426e63bea849ef358b798c74b
133+
image: mysql:5.7.41@sha256:8cf035b14977b26f4a47d98e85949a7dd35e641f88fc24aa4b466b36beecf9d6
134134
profiles:
135135
- mysql-rabbitmq
136136
- mysql-redis
@@ -143,7 +143,7 @@ services:
143143
volumes:
144144
- defectdojo_data:/var/lib/mysql
145145
postgres:
146-
image: postgres:15.1-alpine@sha256:07c3361c9e8e1d734dfc51e239327b11d25196347be630fbdc556ca41f219184
146+
image: postgres:15.2-alpine@sha256:e4058d3b9c4cc7c65a4663a6f3c26662fdd3cd403a4522bb9f290f5beba34956
147147
profiles:
148148
- postgres-rabbitmq
149149
- postgres-redis
@@ -154,14 +154,14 @@ services:
154154
volumes:
155155
- defectdojo_postgres:/var/lib/postgresql/data
156156
rabbitmq:
157-
image: rabbitmq:3.11.8-alpine@sha256:8ad05c5297b48815cf1b75fa6d848a33a04b07b7dc37992c4a63c7f261addb80
157+
image: rabbitmq:3.11.10-alpine@sha256:1cd39c67af78cf9557fe4e4d695c2896048c99d688068aac0501e76f7b26fbb5
158158
profiles:
159159
- mysql-rabbitmq
160160
- postgres-rabbitmq
161161
volumes:
162162
- defectdojo_rabbitmq:/var/lib/rabbitmq
163163
redis:
164-
image: redis:7.0.8-alpine@sha256:5ae5799117d680a13dd35184f26db66549605e220f1af52f4b7557f77830aa17
164+
image: redis:7.0.9-alpine@sha256:8201775852e31262823ac8da9d76d0c8f36583f1a028b4800c35fc319c75289f
165165
profiles:
166166
- mysql-redis
167167
- postgres-redis

‎docs/content/en/getting_started/upgrading.md‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,10 @@ godojo installations
6868
6969
If you have installed DefectDojo on "iron" and wish to upgrade the installation, please see the [instructions in the repo](https://github.com/DefectDojo/godojo/blob/master/docs-and-scripts/upgrading.md).
7070
71+
## Upgrading to DefectDojo Version 2.20.x.
72+
73+
There are no special instruction for upgrading to 2.20.0. Check the [Release Notes](https://github.com/DefectDojo/django-DefectDojo/releases/tag/2.17.0) for the contents of the release.
74+
7175
## Upgrading to DefectDojo Version 2.19.x
7276
7377
There are new docker images based on alpine with fewer third party dependencies. Related to the new images the current docker files had to be renamed and have a "-debian" or the new images a "-alpine" at the end. Furthermore there are new docker tags [DefectdojoVersion]-[OS]. For example 2.19.0-alpine or 2.19.0-debian. The currend tags (latest and [DefectdojoVersion]) are still based on the "old" images. Be aware that the new alpine images are not heavily tested and may contain bugs.
@@ -76,7 +80,7 @@ There are new docker images based on alpine with fewer third party dependencies.
7680
7781
In version 2.19.3, the GitHub OAuth integration has been removed to prevent configurations that may allow more access than intended.
7882
79-
Advisory with details to follow shortly.
83+
[DefectDojo Security Advisory: Severity Medium | Potential GitHub Authentication Misconfiguration](https://github.com/DefectDojo/django-DefectDojo/security/advisories/GHSA-hfp4-q5pg-2p7r)
8084
8185
## Upgrading to DefectDojo Version 2.18.x
8286

‎docs/content/en/integrations/parsers/api_push/_index.md‎

Lines changed: 0 additions & 6 deletions
This file was deleted.

‎docs/content/en/integrations/parsers/api_push/pobely.md‎

Lines changed: 0 additions & 17 deletions
This file was deleted.

‎docs/content/en/integrations/parsers/file/codechecker.md‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
---
2+
title: "Codechecker Report native"
3+
toc_hide: true
4+
---
5+
Import Codechecker static analyzer report in JSON format: https://codechecker.readthedocs.io/en/latest/
6+
Report format described here: https://codechecker.readthedocs.io/en/latest/analyzer/user_guide/#parse
7+
8+
One could make Codechecker JSON report using command like this:
9+
```shell
10+
CodeChecker parse /path/to/codechecker/analyzer/output/directory -e json -o /path/to/output/file.json
11+
```
12+
13+
Before this step you should build your project with Codechecker build process interception,
14+
```shell
15+
odeChecker log -b "make -j8" -o ./my.project.codechecker.log
16+
```
17+
18+
then analyze it
19+
```shell
20+
CodeChecker analyze ./codechecker.log -o /path/to/codechecker/analyzer/output/directory
21+
```

0 commit comments

Comments
 (0)