Skip to content

Commit a406968

Browse files
authored
Merge pull request #12674 from DefectDojo/release/2.47.3
Release: Merge release into master from: release/2.47.3
2 parents a81cf78 + 515d9e0 commit a406968

File tree

30 files changed

+186
-76
lines changed

30 files changed

+186
-76
lines changed

.github/pull_request_template.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
## :warning: Note on feature completeness :warning:
1+
## :warning: Pre-Approval check :warning:
22

3-
We are narrowing the scope of acceptable enhancements to DefectDojo in preparation for v3. Learn more here:
4-
https://github.com/DefectDojo/django-DefectDojo/blob/master/readme-docs/CONTRIBUTING.md
3+
We don't want to waste your time, so if you're unsure whether your hypothetical enhancement meets the criteria for approval, please file an issue to get pre-approval before beginning work on a PR.
4+
Learn more here: https://github.com/DefectDojo/django-DefectDojo/blob/master/readme-docs/CONTRIBUTING.md#submission-pre-approval
55

66
**Description**
77

88
Describe the feature / bug fix implemented by this PR.
9-
If this is a new parser, [the parser guide](https://documentation.defectdojo.com/contributing/how-to-write-a-parser/) may be worth (re)reading.
9+
If this is a new parser, [the parser guide](https://docs.defectdojo.com/en/open_source/contributing/how-to-write-a-parser/) may be worth (re)reading.
1010

1111
**Test results**
1212

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.47.2",
3+
"version": "2.47.3",
44
"license" : "BSD-3-Clause",
55
"private": true,
66
"dependencies": {
52.4 KB
Loading

docs/content/en/about_defectdojo/examples_of_use.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ weight: 2
66
chapter: true
77
---
88

9-
This article is based on DefectDojo Inc's February Office Hours: "Tackling Common-Use Cases".
9+
This article is based on DefectDojo Inc's February 2025 Office Hours: "Tackling Common-Use Cases".
1010
<iframe width="560" height="315" src="https://www.youtube.com/embed/44vv-KspHBs?si=ilRBlfo-wvX5DPVg" title="YouTube video player" frameborder="0" allow="accelerometer; autoplay; clipboard-write; encrypted-media; gyroscope; picture-in-picture; web-share" referrerpolicy="strict-origin-when-cross-origin" allowfullscreen></iframe>
1111

1212
## Examples of Use-Cases

docs/content/en/about_defectdojo/pro_features.md

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,10 @@ See our [Pro UI Guide](../ui_pro_vs_os) for more information.
1717

1818
![image](images/enabling_deduplication_within_an_engagement_2.png)
1919

20+
### Finding Priority
21+
DefectDojo Pro can pre-triage your Findings by Priority and Risk, allowing your team to identify and fix your most critical issues first.
22+
See our [Finding Priority Guide](/en/working_with_findings/finding_priority/) for more details.
23+
2024
### Rules Engine
2125
DefectDojo Pro's Rules Engine allows you to set up a script of automated bulk actions - no programming experience required.
2226
Build custom workflows and bulk actions to handle Findings and other objects.
@@ -28,7 +32,7 @@ See our [Rules Engine Guide](/en/customize_dojo/rules_engine) for more info.
2832
Generate [instant reports and metrics](../ui_pro_vs_os/#new-dashboards) to share the security posture of your apps and repos. Evaluate your security tools and your team's performance in addressing security issues.
2933

3034
### Deduplication Tuning
31-
Fine-tune how DefectDojo identifies and manages duplicate findings with advanced deduplication settings. Adjust same-tool, cross-tool, and reimport deduplication for precision matching between all your chosen security tools and vulnerability findings.
35+
Fine-tune how DefectDojo identifies and manages duplicate findings with advanced deduplication settings. Adjust same-tool, **cross-tool**, and reimport deduplication for precision matching between all your chosen security tools and vulnerability findings.
3236
See our [Deduplication Tuning Guide](/en/working_with_findings/finding_deduplication/tune_deduplication/) for more information.
3337

3438
![image](images/deduplication_tuning.png)

docs/content/en/connecting_your_tools/external_tools.md

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -623,11 +623,11 @@ Use the import command to import new findings into DefectDojo.
623623
#### Usage
624624

625625
```
626-
defectdojo-cli [global options] import <required flags> [optional flags]
627-
or: defectdojo-cli [global options] import --config ./config-file-path
628-
or: defectdojo-cli import [-h | --help]
629-
or: defectdojo-cli import example [subcommand options]
630-
or: defectdojo-cli import example [-h | --help]
626+
universal-importer [global options] import <required flags> [optional flags]
627+
or: universal-importer [global options] import --config ./config-file-path
628+
or: universal-importer import [-h | --help]
629+
or: universal-importer import example [subcommand options]
630+
or: universal-importer import example [-h | --help]
631631
632632
>> The API token must be set in the environment variable `DD_IMPORTER_DOJO_API_TOKEN`.
633633
```
@@ -657,13 +657,13 @@ You can use `deduplication-on-engagement` to restrict deduplication for imported
657657
**Import Basic syntax:**
658658

659659
```
660-
defectdojo-cli import [options]
660+
universal-importer import [options]
661661
```
662662

663663
#### **Import Example:**
664664

665665
```
666-
defectdojo-cli import \
666+
universal-importer import \
667667
--defectdojo-url "https://YOUR_INSTANCE.cloud.defectdojo.com/" \
668668
--scan-type "burp scan" \
669669
--report-path "./examples/burp_findings.xml" \
@@ -772,19 +772,19 @@ You can use `deduplication-on-engagement` to restrict deduplication for imported
772772
#### Usage
773773

774774
```
775-
defectdojo-cli [global options] reimport <required flags> [optional flags]
776-
or: defectdojo-cli [global options] reimport --config ./config-file-path
777-
or: defectdojo-cli reimport [-h | --help]
778-
or: defectdojo-cli reimport example [subcommand options]
779-
or: defectdojo-cli reimport example [-h | --help]
775+
universal-importer [global options] reimport <required flags> [optional flags]
776+
or: universal-importer [global options] reimport --config ./config-file-path
777+
or: universal-importer reimport [-h | --help]
778+
or: universal-importer reimport example [subcommand options]
779+
or: universal-importer reimport example [-h | --help]
780780
781781
>> The API token must be set in the environment variable `DD_IMPORTER_DOJO_API_TOKEN`.
782782
```
783783

784784
#### **Reimport Example:**
785785

786786
```
787-
defectdojo-cli reimport \
787+
universal-importer reimport \
788788
--defectdojo-url "https://YOUR_INSTANCE.cloud.defectdojo.com/" \
789789
--scan-type "Nancy Scan" \
790790
--report-path "./examples/nancy_findings.json" \
@@ -873,9 +873,9 @@ Interactive mode allows you to configure import and reimport process, step-by-st
873873
#### Usage
874874

875875
```
876-
defectdojo-cli interactive
877-
or: defectdojo-cli interactive [--skip-intro] [--no-full-screen] [--log-path]
878-
or: defectdojo-cli interactive [-h | --help]
876+
universal-importer interactive
877+
or: universal-importer interactive [--skip-intro] [--no-full-screen] [--log-path]
878+
or: universal-importer interactive [-h | --help]
879879
```
880880

881881
#### Options

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ toc_hide: true
44
---
55
### File Types
66
DefectDojo parser accepts Burp Issue data as an .xml file.
7-
To parse an HTML file instead, use this method: https://documentation.defectdojo.com/integrations/parsers/file/burp_enterprise/
7+
To parse an HTML file instead, use this method: https://documentation.defectdojo.com/integrations/parsers/file/burp_suite_dast/
88

99
When the Burp report is generated, **the recommended option is Base64
1010
encoding both the request and response fields** - e.g. check the box

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
---
2-
title: "Burp GraphQL"
2+
title: "Burp Suite DAST GraphQL"
33
toc_hide: true
44
---
5-
Import the JSON data returned from the BurpSuite Enterprise GraphQL API. Append all the
5+
Import the JSON data returned from the BurpSuite DAST GraphQL API. Append all the
66
issues returned to a list and save it as the value for the key "Issues". There is no need
77
to filter duplicates, the parser will automatically combine issues with the same name.
88

docs/content/en/connecting_your_tools/parsers/file/burp_enterprise.md renamed to docs/content/en/connecting_your_tools/parsers/file/burp_suite_dast.md

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,26 @@
11
---
2-
title: "Burp Enterprise Scan"
2+
title: "Burp Suite DAST Scan (formerly known as Burp Enterprise)"
33
toc_hide: true
44
---
55

66
## Overview
7-
The Burp Enterprise Scan parser processes HTML reports from Burp Enterprise Edition and imports the findings into DefectDojo. The parser extracts vulnerability details, severity ratings, descriptions, remediation steps, and other metadata from the HTML report.
7+
The Burp Suite DAST Scan parser processes HTML reports from Burp Suite DAST and imports the findings into DefectDojo. The parser extracts vulnerability details, severity ratings, descriptions, remediation steps, and other metadata from the HTML report.
88

99
## Supported File Types
1010
The parser accepts a Standard Report as an HTML file. To parse an XML file instead, use the [Burp XML parser](https://docs.defectdojo.com/en/connecting_your_tools/parsers/file/burp/).
1111

12-
See the Burp documentation for information on how to export a Standard Report: [PortSwigger Enterprise Edition Downloading reports](https://portswigger.net/burp/documentation/enterprise/work-with-scan-results/generate-reports)
12+
See the Burp documentation for information on how to export a Standard Report: [Burp Suite DAST Downloading reports](https://portswigger.net/burp/documentation/dast/user-guide/work-with-scan-results/generate-reports)
1313

1414
## Standard Format HTML (Main Format)
1515

1616
### Total Fields in HTML
17-
- Total data fields in Burp Enterprise Scan HTML output: 15
17+
- Total data fields in Burp Suite DAST Scan HTML output: 15
1818
- Total data fields parsed into DefectDojo finding: 13
1919
- Total data fields NOT parsed: 2
2020

2121
### Standard Format Field Mapping Details
2222

23-
| Data Field # | Burp Enterprise Scan Data Field | DefectDojo Finding Field | Parser Line # | Notes |
23+
| Data Field # | Burp Suite DAST Scan Data Field | DefectDojo Finding Field | Parser Line # | Notes |
2424
|-------------|--------------------------------|--------------------------|--------------|-------|
2525
| 1 | Title | title | 101, 165 | Extracted from issue container h2 element and table rows with "issue-type-row" class |
2626
| 2 | Severity | severity | 101, 168 | Extracted from table rows, mapped directly (High/Medium/Low/Info) |
@@ -39,7 +39,7 @@ See the Burp documentation for information on how to export a Standard Report: [
3939
| 15 | Issue ID/Anchor | Not Parsed | - | HTML anchor tags like "#7459896704422157312" are not extracted |
4040

4141
### Field Mapping Details
42-
The parser has different handling logic for various sections of the Burp Enterprise report:
42+
The parser has different handling logic for various sections of the Burp Suite DAST report:
4343

4444
- For table content sections (using `table_contents_xpath`), the parser extracts:
4545
- Base endpoint from h1 elements (e.g., "https://instance.example.com")
@@ -101,7 +101,7 @@ This parser has special handling for different section types within the HTML rep
101101
- It extracts CWE numbers and vulnerability classifications from reference sections
102102

103103
### Sample Scan Data
104-
Sample Burp Enterprise Scan scans can be found [here](https://github.com/DefectDojo/django-DefectDojo/tree/master/unittests/scans/burp_enterprise).
104+
Sample Burp Suite DAST Scan scans can be found [here](https://github.com/DefectDojo/django-DefectDojo/tree/master/unittests/scans/burp_suite_dast).
105105

106106
### Link to Tool
107-
[Burp Enterprise Edition](https://portswigger.net/burp/enterprise)
107+
[Burp Suite DAST](https://portswigger.net/burp/dast)

docs/content/en/open_source/contributing/how-to-write-a-parser.md

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -280,12 +280,7 @@ This ensures the file is closed at the end of the with statement, even if an exc
280280

281281
### Test database
282282

283-
To test your unit tests locally, you first need to grant some rights. Get your MySQL root password from the docker compose logs, login as root and issue the following commands:
284-
285-
{{< highlight mysql >}}
286-
MYSQL> grant all privileges on test_defectdojo.* to defectdojo@'%';
287-
MYSQL> flush privileges;
288-
{{< /highlight >}}
283+
Django uses a separate test database for running unit tests called `test_defectdojo`. It's automatically created and initialized with a basic set of test data.
289284

290285
### Run your tests
291286

0 commit comments

Comments
 (0)