Skip to content

Commit 580681e

Browse files
authored
Merge pull request #13135 from DefectDojo/release/2.50.1
Release: Merge release into master from: release/2.50.1
2 parents 52ef305 + f72cb99 commit 580681e

Some content is hidden

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

43 files changed

+1298
-143
lines changed

Dockerfile.django-alpine

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -132,8 +132,8 @@ ENV \
132132
DD_INITIALIZE=true \
133133
DD_UWSGI_MODE="socket" \
134134
DD_UWSGI_ENDPOINT="0.0.0.0:3031" \
135-
DD_UWSGI_NUM_OF_PROCESSES="2" \
136-
DD_UWSGI_NUM_OF_THREADS="2"
135+
DD_UWSGI_NUM_OF_PROCESSES="4" \
136+
DD_UWSGI_NUM_OF_THREADS="4"
137137
ENTRYPOINT ["/entrypoint-uwsgi.sh"]
138138

139139
FROM django AS django-unittests

Dockerfile.django-debian

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -135,8 +135,8 @@ ENV \
135135
DD_INITIALIZE=true \
136136
DD_UWSGI_MODE="socket" \
137137
DD_UWSGI_ENDPOINT="0.0.0.0:3031" \
138-
DD_UWSGI_NUM_OF_PROCESSES="2" \
139-
DD_UWSGI_NUM_OF_THREADS="2"
138+
DD_UWSGI_NUM_OF_PROCESSES="4" \
139+
DD_UWSGI_NUM_OF_THREADS="4"
140140
ENTRYPOINT ["/entrypoint-uwsgi.sh"]
141141

142142
FROM django AS django-unittests

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",
3+
"version": "2.50.1",
44
"license" : "BSD-3-Clause",
55
"private": true,
66
"dependencies": {

docker/entrypoint-uwsgi-dev.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,8 @@ exec uwsgi \
3434
--protocol uwsgi \
3535
--wsgi dojo.wsgi:application \
3636
--enable-threads \
37-
--processes "${DD_UWSGI_NUM_OF_PROCESSES:-2}" \
38-
--threads "${DD_UWSGI_NUM_OF_THREADS:-2}" \
37+
--processes "${DD_UWSGI_NUM_OF_PROCESSES:-4}" \
38+
--threads "${DD_UWSGI_NUM_OF_THREADS:-4}" \
3939
--reload-mercy 1 \
4040
--worker-reload-mercy 1 \
4141
--py-autoreload 1 \

docker/entrypoint-uwsgi.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,8 @@ exec uwsgi \
3636
"--${DD_UWSGI_MODE}" "${DD_UWSGI_ENDPOINT}" \
3737
--protocol uwsgi \
3838
--enable-threads \
39-
--processes "${DD_UWSGI_NUM_OF_PROCESSES:-2}" \
40-
--threads "${DD_UWSGI_NUM_OF_THREADS:-2}" \
39+
--processes "${DD_UWSGI_NUM_OF_PROCESSES:-4}" \
40+
--threads "${DD_UWSGI_NUM_OF_THREADS:-4}" \
4141
--wsgi dojo.wsgi:application \
4242
--buffer-size="${DD_UWSGI_BUFFER_SIZE:-8192}" \
4343
--http 0.0.0.0:8081 --http-to "${DD_UWSGI_ENDPOINT}" \

docs/content/en/changelog/changelog.md

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,14 @@ 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+
## Sept 2025: v2.50
12+
13+
### Sept 2, 2025: v2.50.0
14+
15+
* **(Pro UI)** "Date During" filter has been added to the UI, allowing users to filter by a range of dates
16+
* **(Pro UI)** Vulnerability ID column can now be sorted, however the sorting only considers the **first** vulnerability ID.
17+
* **(Pro UI)** Request/Response pairs can now be added / updated / deleted via the Edit Finding form.
18+
1119
## August 2025: v2.49
1220

1321
The Pro UI has been significantly reorganized, with changes to page organization.
Lines changed: 60 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,60 @@
1+
---
2+
title: "Semgrep Pro JSON Report"
3+
toc_hide: true
4+
---
5+
Import Semgrep Pro findings in JSON format.
6+
7+
### Sample Scan Data
8+
Sample Semgrep Pro JSON Report scans can be found [here](https://github.com/DefectDojo/django-DefectDojo/tree/master/unittests/scans/semgrep_pro).
9+
10+
### Default Deduplication
11+
By default, DefectDojo uses the `match_based_id` from Semgrep Pro for deduplication. If this is not available, it falls back to using a combination of:
12+
- title
13+
- file path
14+
- line number
15+
16+
### Fields Mapped
17+
The following fields are mapped from the Semgrep Pro JSON report:
18+
19+
#### Basic Information
20+
- title: Mapped from `rule_name`
21+
- severity: Mapped from Semgrep Pro severity levels (ERROR/HIGH → High, WARNING/MEDIUM → Medium, INFO/LOW → Low)
22+
- file_path: Path to the affected file from `location.file_path`
23+
- line: Line number from `location.line`
24+
- unique_id_from_tool: Mapped from `match_based_id`
25+
26+
#### Status Fields
27+
- active: Set to false if status is "fixed" or "removed"
28+
- verified: Set to true if triage_state is not "untriaged"
29+
30+
#### Rich Content Fields
31+
- description: Includes:
32+
- Rule message and details
33+
- CWE references
34+
- OWASP references
35+
- Categories
36+
- Triage information
37+
- impact: Includes:
38+
- Vulnerability classes
39+
- Confidence level
40+
- Repository information
41+
- mitigation: Includes:
42+
- Guidance summary
43+
- Detailed instructions
44+
- Auto-fix suggestions
45+
- Auto-triage information
46+
- Component details and risk level
47+
- references: Includes:
48+
- Line of code URL
49+
- CWE references
50+
- OWASP references
51+
- External ticket information
52+
53+
#### Component Information
54+
- component_name: Mapped from `assistant.component.tag`
55+
56+
#### Additional Fields
57+
- static_finding: Always set to true
58+
- dynamic_finding: Always set to false
59+
- cwe: Extracted from first CWE reference if available
60+
- date: Mapped from `created_at`

docs/content/en/open_source/installation/running-in-production.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,9 +58,9 @@ handle 4 concurrent connections.
5858
Based on your resource settings, you can tweak:
5959

6060
- `DD_UWSGI_NUM_OF_PROCESSES` for the number of spawned processes.
61-
(default 2)
61+
(default 4)
6262
- `DD_UWSGI_NUM_OF_THREADS` for the number of threads in these
63-
processes. (default 2)
63+
processes. (default 4)
6464

6565
For example, you may have 4 processes with 6 threads each, yielding 24
6666
concurrent connections.

docs/content/en/open_source/performance.md

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

dojo/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,6 @@
44
# Django starts so that shared_task will use this app.
55
from .celery import app as celery_app # noqa: F401
66

7-
__version__ = "2.50.0"
7+
__version__ = "2.50.1"
88
__url__ = "https://github.com/DefectDojo/django-DefectDojo"
99
__docs__ = "https://documentation.defectdojo.com"

0 commit comments

Comments
 (0)