Skip to content

Commit 85e0e46

Browse files
dependabot[bot]paulOsinskiPaul OsinskiMaffooch
authored
Bump asteval from 1.0.5 to 1.0.6 (#11633)
* Bump vite from 6.0.7 to 6.0.9 in /docs (#11610) Bumps [vite](https://github.com/vitejs/vite/tree/HEAD/packages/vite) from 6.0.7 to 6.0.9. - [Release notes](https://github.com/vitejs/vite/releases) - [Changelog](https://github.com/vitejs/vite/blob/main/packages/vite/CHANGELOG.md) - [Commits](https://github.com/vitejs/vite/commits/v6.0.9/packages/vite) --- updated-dependencies: - dependency-name: vite dependency-type: direct:development ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Pro Release Notes 2.42.2 (#11611) * update changelog 2.42.2 * add additional 2.42.1 features --------- Co-authored-by: Paul Osinski <paul.m.osinski@gmail.com> * Update .dryrunsecurity.yaml (#11617) * Readme docs - followup PR (#11525) * follow on to readme update * remove broken /pricing link * chg local_settings refs ldap-authentication.md --------- Co-authored-by: Paul Osinski <paul.m.osinski@gmail.com> * Bump asteval from 1.0.5 to 1.0.6 Bumps [asteval](https://github.com/lmfit/asteval) from 1.0.5 to 1.0.6. - [Release notes](https://github.com/lmfit/asteval/releases) - [Commits](lmfit/asteval@1.0.5...1.0.6) --- updated-dependencies: - dependency-name: asteval dependency-type: direct:production ... Signed-off-by: dependabot[bot] <support@github.com> --------- Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Paul Osinski <42211303+paulOsinski@users.noreply.github.com> Co-authored-by: Paul Osinski <paul.m.osinski@gmail.com> Co-authored-by: Cody Maffucci <46459665+Maffooch@users.noreply.github.com>
1 parent 0e5cbe3 commit 85e0e46

8 files changed

Lines changed: 29 additions & 19 deletions

File tree

.dryrunsecurity.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,7 @@ allowedAuthors:
6767
- dsever
6868
- dogboat
6969
- hblankenship
70+
- valentijnscholten
7071
notificationList:
7172
- '@mtesauro'
7273
- '@grendel513'

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ of DefectDojo as we begin work on v3. Please see our [contributing guidelines](r
113113
information. Check out our latest update on v3 [here](https://github.com/DefectDojo/django-DefectDojo/discussions/8974).
114114

115115
## Pro Edition
116-
[Upgrade to DefectDojo Pro](https://www.defectdojo.com/pricing) today to take your DevSecOps to 11. DefectDojo Pro is
116+
[Upgrade to DefectDojo Pro](https://www.defectdojo.com/) today to take your DevSecOps to 11. DefectDojo Pro is
117117
designed to meet you wherever you are on your security journey and help you scale, with enhanced dashboards, additional
118118
smart features, tunable deduplication, and support from DevSecOps experts.
119119

docs/content/en/changelog/changelog.md

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,14 @@ Here are the release notes for **DefectDojo Pro (Cloud Version)**. These release
77

88
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](../../open_source/upgrading/upgrading_guide).
99

10+
## Jan 21, 2025: v2.42.2
11+
12+
- **(Classic UI)** Corrected link to Smart Upload form.
13+
- **(CLI Tools)** Fixed issue with .exe extensions not getting added to Windows binaries
14+
- **(Findings)** `Mitigated` filter now uses datetime instead of date for filtering.
15+
- **(OAuth)** Clarified Azure AD labels to better align with Azure's language. Default value for Azure Resource is now set. <span style="background-color:rgba(242, 86, 29, 0.5)">(Pro)</span>
16+
- **(RBAC)** Request Review now applies RBAC properly with regard to User Groups.
17+
1018
## Jan 13, 2025: v2.42.1
1119

1220
- **(API)** Pro users can now specify the fields they want to return in a given API payload. For example, this request will only return the title, severity and description fields for each Finding. <span style="background-color:rgba(242, 86, 29, 0.5)">(Pro)</span>
@@ -15,6 +23,10 @@ curl -X 'GET' \
1523
'https://localhost/api/v2/findings/?response_fields=title,severity,description' \
1624
-H 'accept: application/json'
1725
```
26+
- **(Findings)** Excel and CSV exports now include tags.
27+
- **(Reports)** Reports now exclude unenforced SLAs from Executive Summary to avoid confusion.
28+
- **(Risk Acceptance)** Simple Risk Acceptances now have a 'paper trail' created - when they are added or removed, a note will be added to the Finding to log the action.
29+
- **(Tools)** ImageTags are now included with AWS SecurityHub and AWS inspector parsers.
1830

1931
## Jan 6, 2025: v2.42.0
2032

docs/content/en/open_source/api-v2-docs.md

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,10 @@ draft: false
55
weight: 2
66
---
77

8-
9-
10-
118
DefectDojo\'s API is created using [Django Rest
129
Framework](http://www.django-rest-framework.org/). The documentation of
1310
each endpoint is available within each DefectDojo installation at
14-
[`/api/v2/doc/`](https://demo.defectdojo.org/api/v2/) and can be accessed by choosing the API v2
11+
[`/api/v2/oa3/swagger-ui`](https://demo.defectdojo.org/api/v2/oa3/swagger-ui/)) and can be accessed by choosing the API v2
1512
Docs link on the user drop down menu in the header.
1613

1714
![image](../../images/api_v2_1.png)
@@ -45,7 +42,7 @@ For example: :
4542

4643
### Alternative authentication method
4744

48-
If you use [an alternative authentication method](../social-authentication/) for users, you may want to disable DefectDojo API tokens because it could bypass your authentication concept. \
45+
If you use [an alternative authentication method](../archived_docs/integrations/social-authentication/) for users, you may want to disable DefectDojo API tokens because it could bypass your authentication concept. \
4946
Using of DefectDojo API tokens can be disabled by specifying the environment variable `DD_API_TOKENS_ENABLED` to `False`.
5047
Or only `api/v2/api-token-auth/` endpoint can be disabled by setting `DD_API_TOKEN_AUTH_ENDPOINT_ENABLED` to `False`.
5148

@@ -128,7 +125,7 @@ The json object result is: :
128125
{{< /highlight >}}
129126

130127
See [Django Rest Framework\'s documentation on interacting with an
131-
API](http://www.django-rest-framework.org/topics/api-clients/) for
128+
API](https://www.django-rest-framework.org/) for
132129
additional examples and tips.
133130

134131
## Manually calling the API

docs/content/en/open_source/ldap-authentication.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ We will need to modify a grand total of 4-5 files, depending on how you want to
1717
- Dockerfile.django-*
1818
- Dockerfile.nginx-*
1919
- requirements.txt
20-
- settings.dist.py
20+
- local_settings.py
2121
- docker-compose.yml *(Optional)*
2222

2323

@@ -36,8 +36,8 @@ ldap-utils \
3636

3737
Please check for the latest version of these requirements at the time of implementation on pypi.org and use those if you can.
3838

39-
- [https://pypi.org/project/python-ldap/](python-ldap)
40-
- [https://pypi.org/project/django-auth-ldap/](django-auth-ldap)
39+
- [python-ldap](https://pypi.org/project/python-ldap/)
40+
- [django-auth-ldap](https://pypi.org/project/django-auth-ldap/)
4141

4242
Otherwise add the following to requirements.txt:
4343

@@ -47,9 +47,9 @@ django-auth-ldap==4.1.0
4747
```
4848

4949

50-
#### settings.dist.py
50+
#### local_settings.py
5151

52-
Find the settings file (hint: `/dojo/settings/settings.dist.py`) and add the following:
52+
Find the settings file (hint: check in `/dojo/settings/settings.py` for instructions for how to use `/dojo/settings/local_settings.py`, if the file does not already exist) and add the following:
5353

5454
At the top of the file:
5555
```python
@@ -116,7 +116,7 @@ Read the docs for Django Authentication with LDAP here: https://django-auth-ldap
116116

117117
#### docker-compose.yml
118118

119-
In order to pass the variables to the settings.dist.py file via docker, it's a good idea to add these to the docker compose file.
119+
In order to pass the variables to the local_settings.py file via docker, it's a good idea to add these to the docker compose file.
120120

121121
You can do this by adding the following variables to the environment section for the uwsgi image:
122122
```yaml

docs/package-lock.json

Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

docs/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
},
2222
"devDependencies": {
2323
"prettier": "^3.3.3",
24-
"vite": "^6.0.0"
24+
"vite": "^6.0.9"
2525
},
2626
"engines": {
2727
"node": ">=20.11.0"

requirements.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# requirements.txt for DefectDojo using Python 3.x
2-
asteval==1.0.5
2+
asteval==1.0.6
33
bleach==6.2.0
44
bleach[css]
55
celery==5.4.0

0 commit comments

Comments
 (0)