Skip to content

Commit 6bacb88

Browse files
Merge branch 'dev' into feat/improve-helm-chart
2 parents 596b0c9 + 218a29a commit 6bacb88

91 files changed

Lines changed: 535 additions & 197 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.

.github/workflows/gh-pages.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,13 @@ jobs:
1515
- name: Setup Hugo
1616
uses: peaceiris/actions-hugo@75d2e84710de30f6ff7268e08f310b60ef14033f # v3.0.0
1717
with:
18-
hugo-version: '0.125.3'
18+
hugo-version: '0.140.1'
1919
extended: true
2020

2121
- name: Setup Node
2222
uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4.4.0
2323
with:
24-
node-version: '22.18.0'
24+
node-version: '22.19.0'
2525

2626
- name: Cache dependencies
2727
uses: actions/cache@0400d5f644dc74513175e3cd8d07132dd4860809 # v4.2.4

.github/workflows/k8s-tests.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,6 @@ jobs:
6565
6666
- name: Configure HELM repos
6767
run: |-
68-
helm repo add bitnami https://charts.bitnami.com/bitnami
6968
helm dependency list ./helm/defectdojo
7069
helm dependency update ./helm/defectdojo
7170

.github/workflows/validate_docs_build.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,13 @@ jobs:
1212
- name: Setup Hugo
1313
uses: peaceiris/actions-hugo@75d2e84710de30f6ff7268e08f310b60ef14033f # v3.0.0
1414
with:
15-
hugo-version: '0.125.3'
15+
hugo-version: '0.140.1'
1616
extended: true
1717

1818
- name: Setup Node
1919
uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4.4.0
2020
with:
21-
node-version: '22.18.0'
21+
node-version: '22.19.0'
2222

2323
- name: Cache dependencies
2424
uses: actions/cache@0400d5f644dc74513175e3cd8d07132dd4860809 # v4.2.4
@@ -38,4 +38,4 @@ jobs:
3838
env:
3939
HUGO_ENVIRONMENT: production
4040
HUGO_ENV: production
41-
run: cd docs && npm ci && hugo --minify --gc --config config/production/hugo.toml
41+
run: cd docs && npm ci && hugo --minify --gc --config config/production/hugo.toml

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.11.11-slim-bookworm@sha256:42420f737ba91d509fc60d5ed65ed0492678a90c561e1fa08786ae8ba8b52eda AS base
8+
FROM python:3.11.13-slim-trixie@sha256:1d6131b5d479888b43200645e03a78443c7157efbdb730e6b48129740727c312 AS base
99
FROM base AS build
1010
WORKDIR /app
1111
RUN \

Dockerfile.integration-tests-debian

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
FROM openapitools/openapi-generator-cli:v7.15.0@sha256:509f01c3c7eee9d1ad286506a7b6aa4624a95b410be9a238a306d209e900621f AS openapitools
55
# currently only supports x64, no arm yet due to chrome and selenium dependencies
6-
FROM python:3.11.11-slim-bookworm@sha256:42420f737ba91d509fc60d5ed65ed0492678a90c561e1fa08786ae8ba8b52eda AS build
6+
FROM python:3.11.13-slim-trixie@sha256:1d6131b5d479888b43200645e03a78443c7157efbdb730e6b48129740727c312 AS build
77
WORKDIR /app
88
RUN \
99
apt-get -y update && \
@@ -47,11 +47,11 @@ RUN \
4747
apt-get -y install $missing_chrome_deps
4848

4949
# Install a suggested list of additional packages (https://stackoverflow.com/a/76734752)
50-
RUN apt-get install -y libxi6 libgconf-2-4 jq libjq1 libonig5 libxkbcommon0 libxss1 libglib2.0-0 libnss3 \
51-
libfontconfig1 libatk-bridge2.0-0 libatspi2.0-0 libgtk-3-0 libpango-1.0-0 libgdk-pixbuf2.0-0 libxcomposite1 \
50+
RUN apt-get install -y libxi6 jq libjq1 libonig5 libxkbcommon0 libxss1 libglib2.0-0 libnss3 \
51+
libfontconfig1 libatk-bridge2.0-0 libatspi2.0-0 libgtk-3-0 libpango-1.0-0 libxcomposite1 \
5252
libxcursor1 libxdamage1 libxtst6 libappindicator3-1 libasound2 libatk1.0-0 libc6 libcairo2 libcups2 libxfixes3 \
5353
libdbus-1-3 libexpat1 libgcc1 libnspr4 libgbm1 libpangocairo-1.0-0 libstdc++6 libx11-6 libx11-xcb1 libxcb1 libxext6 \
54-
libxrandr2 libxrender1 gconf-service ca-certificates fonts-liberation libappindicator1 lsb-release xdg-utils
54+
libxrandr2 libxrender1 ca-certificates fonts-liberation lsb-release xdg-utils
5555

5656
# Installing the latest stable Google Chrome driver release
5757
WORKDIR /opt/chrome-driver

components/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "defectdojo",
3-
"version": "2.50.0-dev",
3+
"version": "2.51.0-dev",
44
"license" : "BSD-3-Clause",
55
"private": true,
66
"dependencies": {

docs/assets/images/pro_ui_249.png

152 KB
Loading
101 KB
Loading

docs/content/en/changelog/changelog.md

Lines changed: 23 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,24 @@ Here are the release notes for **DefectDojo Pro (Cloud Version)**. These release
88

99
For Open Source release notes, please see the [Releases page on GitHub](https://github.com/DefectDojo/django-DefectDojo/releases), or alternatively consult the Open Source [upgrade notes](/en/open_source/upgrading/upgrading_guide/).
1010

11+
## August 2025: v2.49
12+
13+
The Pro UI has been significantly reorganized, with changes to page organization.
14+
![image](images/pro_ui_249.png)
15+
16+
### August 25: 2.49.3
17+
18+
[Integrations](/en/share_your_findings/integrations/) has been added to DefectDojo Pro, adding an Jira-style integrations for Azure DevOps, GitHub and GitLab boards.
19+
20+
* **(API)** Basic Auth Login has been removed from the swagger form. Only cookieAuth and tokenAuth are accepted.
21+
* **(API)** When MFA is enabled, an MFA code will be required to use the `/api-token-auth` endpoint.
22+
* **(Connectors)** "Location" has been renamed to "Location URL" in Connectors setup form.
23+
* **(Universal Parser)** Fixed an issue where a False value in an Active key still created an Active Finding.
24+
* **(Pro UI)** Unique ID from Tool has been added to the Findings list and Finding view
25+
* **(Pro UI)** Test Status added to Test View.
26+
* **(Pro UI)** Added additional Import/Reimport success messages to confirm successful test creation.
27+
28+
1129
## July 2025: v2.48
1230

1331
### July 21/22/28, 2025: v2.48.3 / v2.48.4 / v2.48.5
@@ -37,23 +55,23 @@ For Open Source release notes, please see the [Releases page on GitHub](https://
3755

3856
## June 2025: v2.47
3957

40-
### July 1, 2025: v2.47.4
58+
#### July 1, 2025: v2.47.4
4159

4260
- **(Pro UI)** Products, Engagements, Tests, Findings and Endpoints can be edited directly from their respective tables via a modal.
4361
- **(Pro UI)** Calendar view now supports additional query parameters for filtering Tests or Engagements.
4462
- **(Pro UI)** Engagements, Tests and the entire Calendar can be exported as .ics files.
4563

4664
![image](images/pro_ics_export.png)
4765

48-
### June 23, 2025: v2.47.3
66+
#### June 23, 2025: v2.47.3
4967

5068
- **(Pro UI)** Finding Templates can now be added in the Pro UI, from **Findings > Finding Templates** on the sidebar.
5169
- **(Pro UI)** A better error message is displayed when Jira Instance deletion is unsuccessful.
5270
- **(Pro UI)** Product Types can now be edited through a modal: **"⋮" > Edit Product Type** will open a pop-up modal window instead of taking a user to a new page.
5371

5472
![image](images/pro_product_type_modal.png)
5573

56-
### June 16, 2025: v2.47.2
74+
#### June 16, 2025: v2.47.2
5775

5876
- **(Pro UI)** Endpoint Metadata can now be uploaded to Products. You can now import a .csv list of all endpoints associated with a Product, from **View Product > Endpoints > Import Endpoint Metadata**
5977

@@ -69,7 +87,7 @@ For Open Source release notes, please see the [Releases page on GitHub](https://
6987

7088
![image](images/pro_login.png)
7189

72-
### June 9, 2025: v2.47.1
90+
#### June 9, 2025: v2.47.1
7391

7492
- **(Pro UI)** Vulnerable Endpoints table has now been added to Finding pages.
7593

@@ -78,7 +96,7 @@ For Open Source release notes, please see the [Releases page on GitHub](https://
7896
- **(Pro UI)** "Original Finding" link has been added to Finding Metadata table for Duplicate Findings.
7997
- **(Pro UI)** CI/CD Metadata has been added to Engagement view.
8098

81-
### June 2, 2025: v2.47.0
99+
#### June 2, 2025: v2.47.0
82100

83101
- **(Pro UI)** Finding review can now be set through the Pro UI. You can now Request Review or clear a Finding review from Finding tables, or from the Finding View.
84102

docs/content/en/connecting_your_tools/parsers/file/redhatsatellite.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,3 +12,6 @@ By default, DefectDojo identifies duplicate Findings using these [hashcode field
1212

1313
- description
1414
- severity
15+
16+
### Field fix_availabe
17+
The field 'fix_available' is set to true if the fix is installable.

0 commit comments

Comments
 (0)