Repository navigation
perf(findings): load vulnerability_ids for the whole findings list page - #16659
Open
jensholdgaard wants to merge 1 commit into
Open
jensholdgaard wants to merge 1 commit into
jensholdgaard wants to merge 1 commit into
Conversation
GET /api/v2/findings/ ran one dojo_findingvulnerabilityreference query per finding on the page, because vulnerability_ids is serialized on every row and FindingViewSet's queryset doesn't prefetch it. Adding vulnerability_id_prefetch() to get_queryset() would break a subclass or plugin that adds its own (Django raises "lookup was already seen with a different queryset"), which is why DefectDojo#16512 left it out. Instead, FindingViewSet.paginate_queryset() loads the references for the page with prefetch_related_objects(), skipping findings whose references are already prefetched, so such a queryset keeps working and nothing is loaded twice. The list scaling tests no longer leave dojo_findingvulnerabilityreference out of the count, give each finding two vulnerability ids, check their order in the response, and cover a queryset that already prefetches them. Fixes DefectDojo#16652 Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_0125HXBmURB5ZfBkH3T4LtME
This branch has not been deployed
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
GET /api/v2/findings/ ran one dojo_findingvulnerabilityreference query per finding on the page, because vulnerability_ids is serialized on every row and FindingViewSet's queryset doesn't prefetch it.
Adding vulnerability_id_prefetch() to get_queryset() would break a subclass or plugin that adds its own (Django raises "lookup was already seen with a different queryset"), which is why #16512 left it out. Instead, FindingViewSet.paginate_queryset() loads the references for the page with prefetch_related_objects(), skipping findings whose references are already prefetched, so such a queryset keeps working and nothing is loaded twice.
The list scaling tests no longer leave dojo_findingvulnerabilityreference out of the count, give each finding two vulnerability ids, check their order in the response, and cover a queryset that already prefetches them.
Fixes #16652
Claude-Session: https://claude.ai/code/session_0125HXBmURB5ZfBkH3T4LtME
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.
Learn more here: https://github.com/DefectDojo/django-DefectDojo/blob/master/readme-docs/CONTRIBUTING.md#submission-pre-approval
Description
Describe the feature / bug fix implemented by this PR.
If this is a new parser, the parser guide may be worth (re)reading.
Test results
Ideally you extend the test suite in
tests/anddojo/unitteststo cover the changed in this PR.Alternatively, describe what you have and haven't tested.
Documentation
Please update any documentation when needed in the documentation folder)
Checklist
This checklist is for your information.
dev.devbranch.Extra information
Please clear everything below when submitting your pull request, it's here purely for your information.
Moderators: Labels currently accepted for PRs:
Contributors: Git Tips
Rebase on dev branch
If the dev branch has changed since you started working on it, please rebase your work after the current dev.
On your working branch
mybranch:In case of conflict:
When everything's fine on your local branch, force push to your
myOriginremote:To cancel everything:
Squashing commits
pickbyfixupon the commits you want squashed outpickbyrewordon the first commit if you want to change the commit messageForce push to your
myOriginremote: