Skip to content

Release: Merge back 2.58.2 into dev from: master-into-dev/2.58.2-2.59.0-dev#14852

Merged
rossops merged 14 commits into
devfrom
master-into-dev/2.58.2-2.59.0-dev
May 11, 2026
Merged

Release: Merge back 2.58.2 into dev from: master-into-dev/2.58.2-2.59.0-dev#14852
rossops merged 14 commits into
devfrom
master-into-dev/2.58.2-2.59.0-dev

Conversation

@github-actions
Copy link
Copy Markdown
Contributor

Release triggered by rossops

DefectDojo release bot and others added 13 commits May 6, 2026 19:13
….59.0-dev

Release: Merge back 2.58.1 into bugfix from: master-into-bugfix/2.58.1-2.59.0-dev
* Update changelog for May 2026 release (v2.58.0) with new features and improvements

* Update changelog for v2.58.1 release with new features and bug fixes
…14838)

* Use a dedicated permission class for BurpRawRequestResponseViewSet

The top-level /api/v2/request_response_pairs/ viewset reused
UserHasFindingRelatedObjectPermission, which is shaped for
@action(detail=True) endpoints where DRF resolves the parent finding
from the URL. On a top-level POST there is no parent object resolved
yet, so the create flow only ran has_object_permission against the
not-yet-saved row and effectively skipped any check on the
client-supplied "finding" foreign key.

Introduce UserHasBurpRawRequestResponsePermission, which validates
the parent finding against Finding_Edit on POST via
check_post_permission, mirroring the pattern already used by
UserHasFindingPermission, UserHasProductPermission, and the other
parent-keyed viewsets. has_object_permission dereferences obj.finding
for retrieve/update/delete so list/detail/PUT/PATCH/DELETE behavior
is unchanged.

Add regression coverage in unittests/test_rest_framework.py asserting
the positive control still works, that an authenticated user without
membership cannot create a pair on a hidden finding, and that POSTs
missing the finding key are rejected.

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>

* Use versioned_fixtures for RequestResponsePairsAuthzTest

The dojo_testdata.json fixture contains Endpoint rows, which raise
NotImplementedError in Endpoint.__init__ when V3_FEATURE_LOCATIONS is
enabled. Mirror the surrounding API test classes by applying the
@versioned_fixtures decorator so the locations-aware fixture is loaded
on the V3 matrix leg.

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>

---------

Co-authored-by: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
Bumps [django](https://github.com/django/django) from 5.2.13 to 5.2.14.
- [Commits](django/django@5.2.13...5.2.14)

---
updated-dependencies:
- dependency-name: django
  dependency-version: 5.2.14
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
…14844)

Bumps [@babel/plugin-transform-modules-systemjs](https://github.com/babel/babel/tree/HEAD/packages/babel-plugin-transform-modules-systemjs) from 7.29.0 to 7.29.4.
- [Release notes](https://github.com/babel/babel/releases)
- [Changelog](https://github.com/babel/babel/blob/main/CHANGELOG.md)
- [Commits](https://github.com/babel/babel/commits/v7.29.4/packages/babel-plugin-transform-modules-systemjs)

---
updated-dependencies:
- dependency-name: "@babel/plugin-transform-modules-systemjs"
  dependency-version: 7.29.4
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Bumps [django](https://github.com/django/django) from 5.2.13 to 5.2.14.
- [Commits](django/django@5.2.13...5.2.14)

---
updated-dependencies:
- dependency-name: django
  dependency-version: 5.2.14
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Bumps [gitpython](https://github.com/gitpython-developers/GitPython) from 3.1.49 to 3.1.50.
- [Release notes](https://github.com/gitpython-developers/GitPython/releases)
- [Changelog](https://github.com/gitpython-developers/GitPython/blob/main/CHANGES)
- [Commits](gitpython-developers/GitPython@3.1.49...3.1.50)

---
updated-dependencies:
- dependency-name: gitpython
  dependency-version: 3.1.50
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
* Add Pro badge to sidebar items with audience: pro

Render a small "Pro" badge next to sidebar entries whose page has
audience: pro, styled with the existing Torii Orange brand color
used by the version selector (with a dark-mode variant).

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>

* Restrict Pro sidebar badge to parent pages with children

Only render the Pro badge in the <summary> of folders backed by an
_index.md (i.e., pages with child pages); leaf article links no
longer carry the badge.

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>

* add locations docs

* split hierarchy into pro and os

* Size Pro badge to one line-height of surrounding text

Switch the badge to inline-flex with `height: 1lh` and `box-sizing:
border-box` so the badge box (including border) is exactly one
line-height tall, matching the text it sits next to. Drops the
hand-tuned `line-height: 1.4` and vertical padding that made it
slightly taller than the adjacent text.

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>

* fix failing docs paths

---------

Co-authored-by: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
Release: Merge release into master from: release/2.58.2
@github-actions github-actions Bot requested a review from Maffooch as a code owner May 11, 2026 16:05
@github-actions github-actions Bot added the release-management Automated release-train PR label May 11, 2026
@github-actions github-actions Bot requested a review from mtesauro as a code owner May 11, 2026 16:05
@dryrunsecurity
Copy link
Copy Markdown

dryrunsecurity Bot commented May 11, 2026

DryRun Security

This pull request includes sensitive edits to critical code paths in dojo/api_v2/permissions.py and dojo/api_v2/views.py, which were flagged multiple times by the scanner as high-risk changes. No blocking issues were reported, but these files should be reviewed carefully and, if needed, restricted via .dryrunsecurity.yaml.

🔴 Configured Codepaths Edit in dojo/api_v2/permissions.py (drs_8f875959)
Vulnerability Configured Codepaths Edit
Description Sensitive edits detected for this file. Sensitive file paths and allowed authors can be configured in .dryrunsecurity.yaml.
🔴 Configured Codepaths Edit in dojo/api_v2/views.py (drs_a82c808a)
Vulnerability Configured Codepaths Edit
Description Sensitive edits detected for this file. Sensitive file paths and allowed authors can be configured in .dryrunsecurity.yaml.
🔴 Configured Codepaths Edit in dojo/api_v2/permissions.py (drs_172d47ea)
Vulnerability Configured Codepaths Edit
Description Sensitive edits detected for this file. Sensitive file paths and allowed authors can be configured in .dryrunsecurity.yaml.
🔴 Configured Codepaths Edit in dojo/api_v2/views.py (drs_90306e63)
Vulnerability Configured Codepaths Edit
Description Sensitive edits detected for this file. Sensitive file paths and allowed authors can be configured in .dryrunsecurity.yaml.

We've notified @mtesauro.


Comment to provide feedback on these findings.

Report false positive: @dryrunsecurity fp [FINDING ID] [FEEDBACK]
Report low-impact: @dryrunsecurity nit [FINDING ID] [FEEDBACK]

Example: @dryrunsecurity fp drs_90eda195 This code is not user-facing

All finding details can be found in the DryRun Security Dashboard.

@github-actions
Copy link
Copy Markdown
Contributor Author

This pull request has conflicts, please resolve those before we can evaluate the pull request.

@github-actions github-actions Bot added settings_changes Needs changes to settings.py based on changes in settings.dist.py included in this PR apiv2 docs unittests helm and removed conflicts-detected labels May 11, 2026
@github-actions
Copy link
Copy Markdown
Contributor Author

Conflicts have been resolved. A maintainer will review the pull request shortly.

@rossops rossops merged commit 135dc08 into dev May 11, 2026
156 checks passed
@rossops rossops deleted the master-into-dev/2.58.2-2.59.0-dev branch May 11, 2026 16:37
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

apiv2 docs helm release-management Automated release-train PR settings_changes Needs changes to settings.py based on changes in settings.dist.py included in this PR unittests

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants