feat(finding): copy finding fix + autodetected vulnerability id type + uniqueness constraint#15145
Merged
Maffooch merged 4 commits intoJul 14, 2026
Conversation
Member
Author
|
Sibling PR (independent split): #15143 — multiple CWEs per finding. |
github-actions
Bot
added
New Migration
valentijnscholten
changed the title
valentijnscholten
marked this pull request as ready for review
July 2, 2026 18:21
valentijnscholten
force-pushed
the
feat/vulnerability-id-type
branch
from
July 2, 2026 20:37
5506d52 to
c356327
Compare
This was referenced Jul 3, 2026
…aint Adds Vulnerability_Id.vulnerability_id_type, autodetected from the id's leading prefix (CVE-2024-1234 -> CVE, GHSA-... -> GHSA), stored and indexed so identifiers can be filtered/grouped by type. Populated on import (bulk) and on save(); existing rows backfilled by migration. Also de-duplicates (finding, vulnerability_id) rows and adds a unique constraint on the pair. CWE is a weakness class and is intentionally NOT part of this change; vulnerability_id_type does not participate in hash_code, so existing hash codes and deduplication are unaffected. Migrations: 0276 (type column + lookup index), 0277 (dedupe + backfill, data), 0278 (unique constraint).
…(20) resolve_vulnerability_id_type returned the raw uppercased prefix with no length bound, but vulnerability_id_type is CharField(max_length=20) while vulnerability_id is unbounded text. A >20-char prefix (e.g. a dash-less token/hash used as an id) raised DataError on save()/bulk_create (import 500) and was silently truncated by the 0277 backfill's bulk_update CAST. Treat an over-length prefix as untyped (None) so save, bulk_create, and the backfill all agree and never error or truncate. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
Resolves the migration-graph leaf collision: dev has advanced to 0279_jira_project_transition_fields, so the vulnerability-id migrations are renumbered 0276/0277/0278 -> 0280/0281/0282 and the first is re-parented onto the current dev leaf. Also merges a duplicate `class Meta` on Vulnerability_Id introduced by the rebase: dev's global-search FTS work added its own Meta (GIN indexes) adjacent to this branch's Meta (unique constraint + dojo_vuln_id_lookup_idx). Python keeps only the last class body, which silently dropped the constraint/index from the model state (makemigrations wanted to remove them). Both are now in a single Meta. `makemigrations --check dojo` reports no changes. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
Maffooch
force-pushed
the
feat/vulnerability-id-type
branch
from
July 14, 2026 00:35
e6bc4a5 to
7bd952b
Compare
…y (F9) 0280's lookup index and 0282's (finding, vulnerability_id) unique constraint were built with plain AddIndex / AddConstraint, taking a SHARE lock (blocks writes) and an ACCESS EXCLUSIVE lock (blocks reads+writes) for the full build over the whole dojo_vulnerability_id table -- a material downtime window on large instances. Build both CONCURRENTLY instead (atomic=False), keeping the work in-migration: - 0280: AddIndexConcurrently for dojo_vuln_id_lookup_idx. - 0282: CREATE UNIQUE INDEX CONCURRENTLY, then ADD CONSTRAINT ... USING INDEX (brief lock to adopt the pre-built index); SeparateDatabaseAndState keeps the UniqueConstraint in Django's model state. Verified on a 100k-finding / 174k-id dataset with duplicate rows: 0281 dedupe -> 0, constraint built valid as a real UNIQUE constraint, makemigrations --check clean. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
Maffooch
approved these changes
Jul 14, 2026
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
3 participants
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.
🔗 PR stack — CWE / vulnerability-ID consolidation (OSS)
Merge bottom-up:
👉 This PR: #15145
Description
Adds an autodetected type to each vulnerability identifier, and a uniqueness constraint on
(finding, vulnerability_id).Vulnerability_Idgains avulnerability_id_typefield, autodetected from the identifier's leading prefix — the part before the first-:CVE-2024-1234→CVE,GHSA-…→GHSA,RUSTSEC-2021-0001→RUSTSEC,ALINUX2-SA-…→ALINUX2. It is derived structurally (no registry) and isNULLwhen there is no non-numeric prefix (bare numbers / UUIDs / no dash). The column is indexed so identifiers can be filtered and grouped by type efficiently.save()/get_or_create(via asave()override). Existing rows are backfilled by the migration.(finding, vulnerability_id). Pre-existing duplicate rows (unintended) are consolidated first (keeping the earliest) so the constraint can be created.vulnerability_id_typeis a denormalized, derived attribute — it does not participate inhash_code, so existing hash codes and deduplication are unaffected by this change.Migrations
0276_vulnerability_id_type— adds the indexedvulnerability_id_typecolumn and a leading index onvulnerability_id.0277_backfill_vulnerability_id_type— backfillsvulnerability_id_typefor existing rows and removes duplicate(finding, vulnerability_id)rows (keeping the earliest).0278_unique_finding_vulnerability_id— adds the unique constraint on(finding, vulnerability_id).Test results
unittests/test_vulnerability_id_type.pycovers prefix autodetection, thatsave()and the bulk import path populate the type, and that the uniqueness constraint is enforced.Documentation
docs/content/releases/os_upgrading/3.2.md.Checklist
dev.dev.dojo/db_migrations.