Deduplicate findings in batches#13491
Conversation
dogboat
left a comment
There was a problem hiding this comment.
It looks good, just had one question.
|
This pull request introduces three security concerns: a potential arbitrary code execution path by dynamically loading a hash-compute method from an environment-controllable setting, a denial-of-service risk from an unvalidated small batch-size setting that can cause many Celery tasks to be spawned, and an unauthorized queue-purge risk where the management command accepts arbitrary queue names (and can be forced) allowing destructive purges of critical Celery queues.
Arbitrary Code Execution via Custom Method Loading in
|
| Vulnerability | Arbitrary Code Execution via Custom Method Loading |
|---|---|
| Description | The application dynamically loads a method for computing a hash code using get_custom_method("FINDING_COMPUTE_HASH_METHOD"). Based on the observed pattern in dojo/settings/settings.dist.py where settings are loaded from environment variables using env(), it is highly probable that the FINDING_COMPUTE_HASH_METHOD setting can be controlled via an environment variable (e.g., DD_FINDING_COMPUTE_HASH_METHOD). If an attacker can control this environment variable, they can inject an arbitrary module path and function name (e.g., 'os.system'). When get_custom_method resolves this string into a callable and compute_hash_code_method(self) is invoked, it leads to arbitrary code execution. |
django-DefectDojo/dojo/models.py
Lines 2919 to 2921 in 9011cee
Denial of Service via Misconfiguration in dojo/importers/default_importer.py
| Vulnerability | Denial of Service via Misconfiguration |
|---|---|
| Description | The DD_IMPORT_REIMPORT_DEDUPE_BATCH_SIZE setting, which controls the batch size for asynchronous deduplication tasks, lacks validation for a minimum value. An administrator can configure this setting to a very low number (e.g., 1), causing the system to dispatch an excessive number of small Celery tasks during large imports or reimports. This can overwhelm the message broker and workers, leading to resource exhaustion and a denial of service for background processing. Each finding would result in a separate Celery task being dispatched, incurring significant overhead. |
django-DefectDojo/dojo/importers/default_importer.py
Lines 163 to 166 in 9011cee
Unauthorized Celery Queue Purge (Denial of Service) in dojo/management/commands/clear_celery_queue.py
| Vulnerability | Unauthorized Celery Queue Purge (Denial of Service) |
|---|---|
| Description | The clear_celery_queue management command allows an attacker who can execute Django management commands to specify an arbitrary Celery queue name via the --queue argument. This input is not validated or sanitized against an allowlist of safe-to-purge queues. Consequently, an attacker could purge critical application queues (e.g., 'celery', or queues handling deduplication/post-processing tasks), leading to a denial of service by halting essential background processes, causing data inconsistencies, and disrupting application functionality. While the command includes a confirmation prompt, it can be bypassed with the --force flag, making the operation destructive without user interaction. |
django-DefectDojo/dojo/management/commands/clear_celery_queue.py
Lines 99 to 102 in 9011cee
All finding details can be found in the DryRun Security Dashboard.
* initial batching code * fix dedupe_inside_engagement * all tests working incl sarif with internal dupes * cleanup * deduplication: add more importer unit tests * deduplication: add more importer unit tests * deduplication: log hash_code_fields_always * view_finding: show unique_id_from_tool with hash_code * view_finding: show unique_id_from_tool with hash_code * uncomment tests * add more assessments * fix duplicate finding links * split per algo, move into new file * align logging * better method name and param order * ruff apps.py * update task/query counts * update comments, parameters names * finetune uidorhash logic * fix tests to import from deduplication.py * ruff unit tests * simplify base queryset building * deduplication logic: add cross scanner unique_id tests * hook old per finding dedupe to batch dedupe code * fix and make uid_or_hash_code matching identical to old dedupe * UNIQUE_ID_OR_HASH_CODE: dont stop after one candidate * UNIQUE_ID_OR_HASH_CODE: dont stop after one candidate in Batch mode * uid_or_hash_code: fix self/older check * notifications test: replace hardcoded ids with references * optimize prefetching * update query counts in test * complete merge * add more logging is_older, dedupe_eng_mismatch * support FINDING_DEDUPE_METHOD * add support for FINDING_DEDUPE_BATCH_METHOD * simplify * update log line * make batch size a setting * add false positive history to new batch post process task * commands: add command to clear celery queue * update dedupe command to use batch mode * default to batch_mode for dedupe command * do not deduplicate duplicates * improve logging * prefetch better in dedupe command * dedupe command: max batch size 1000 * remove leftover method * reimport: support pro hash method * finalize return statement * ruff --------- Co-authored-by: Valentijn Scholten <valentijn.scholten@iodigital.com>
Traditionally Defect Dojo has been deduplicating (new) findings one-by-one. This works well for small imports and has the benefit of an easy to understand codebase and test suite.
For larger imports however the performance is bad and resource usage is (very) high. A 1000+ finding import can cause a celery worker to spend minutes on deduplication.
This PR changes the deduplication process for import and reimport to be done in batches. This biggest benefit is that there now will be 1 database query per batch (1000 findings), instead of 1 query per finding (1000 queries).
During the development of the PR I realized:
Although batching dedupe sounds like a simple PR, the caveat is that with the one-by-one deduplication the result of the deduplication of the first finding in the report can have an affect on the deduplication result of the next findings (if there are duplicates inside the same report). This should be a corner case and usually means the deduplication configuration need some fine tuning. Nevertheless we wanted to make not to cause unexpected/different behavior here. The new tests should cover this.
The PR splits the deduplication process in three parts:
One of the reasons for doing this is that we want to use the exact same matching logic for the
reimportprocess. Currently that has an almost identical matching algorithm, but with minor unintentional differences. Once this PR here has proven itself, we will adjust the reimport process. Next to the "reimport matching" the reimport process also deduplicates new findings. This part is already using the batchwise deduplication in this PR.A quick test with the
jfrog_xray_unified/very_many_vulns.jsonsamples scan (10k findings) shwo the obvious huge improvement in deduplication time. Please note that we're not only doing this for performance, but also to reduce the resources (cloud cost) needed to run Defect Dojo.initial import (no duplicates):
second import into the same product (all duplicates):
initial import (no duplicates):
Imagine what this can do for
reimportperformance if we switch that to batch mode.