🐛 fix create questionnaire with empty survey#13717
🐛 fix create questionnaire with empty survey#13717manuel-sommer wants to merge 60 commits intoDefectDojo:bugfixfrom
Conversation
….52.0-2.53.0-dev Release: Merge back 2.52.0 into dev from: master-into-dev/2.52.0-2.53.0-dev
…v41.168.6 (.github/workflows/renovate.yaml) (DefectDojo#13584) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
….19.0 (docker-compose.override.dev.yml) (DefectDojo#13585) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
…v41.169.2 (.github/workflows/renovate.yaml) (DefectDojo#13594) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
…3600) Bumps [drf-spectacular](https://github.com/tfranzel/drf-spectacular) from 0.28.0 to 0.29.0. - [Release notes](https://github.com/tfranzel/drf-spectacular/releases) - [Changelog](https://github.com/tfranzel/drf-spectacular/blob/master/CHANGELOG.rst) - [Commits](tfranzel/drf-spectacular@0.28.0...0.29.0) --- updated-dependencies: - dependency-name: drf-spectacular dependency-version: 0.29.0 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Bumps openapitools/openapi-generator-cli from v7.16.0 to v7.17.0. --- updated-dependencies: - dependency-name: openapitools/openapi-generator-cli dependency-version: v7.17.0 dependency-type: direct:production ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
…efectDojo#13598) Bumps nginx from 1.29.2-alpine3.22 to 1.29.3-alpine3.22. --- updated-dependencies: - dependency-name: nginx dependency-version: 1.29.3-alpine3.22 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Bumps [markdown](https://github.com/Python-Markdown/markdown) from 3.9 to 3.10. - [Release notes](https://github.com/Python-Markdown/markdown/releases) - [Changelog](https://github.com/Python-Markdown/markdown/blob/master/docs/changelog.md) - [Commits](Python-Markdown/markdown@3.9.0...3.10.0) --- updated-dependencies: - dependency-name: markdown dependency-version: '3.10' dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Bumps [boto3](https://github.com/boto/boto3) from 1.40.63 to 1.40.65. - [Release notes](https://github.com/boto/boto3/releases) - [Commits](boto/boto3@1.40.63...1.40.65) --- updated-dependencies: - dependency-name: boto3 dependency-version: 1.40.65 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
…v41.169.4 (.github/workflows/renovate.yaml) (DefectDojo#13607) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
…v1.34.1 (.github/workflows/k8s-tests.yml) (DefectDojo#13603) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
…age.json) (DefectDojo#13604) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
* implement n0s1 scanner DefectDojo#13564 * update * ruff * update * update * update * underline the correctness through comparison with rustyhog
…v41.170.0 (.github/workflows/renovate.yaml) (DefectDojo#13615) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
…fectDojo#12922) * 🎉 Advance reimport to update fix_available field DefectDojo#12633 * docs * update * Update using_reimport.md * implement a fixed version * rebase fix * Update dojo/models.py Co-authored-by: valentijnscholten <valentijnscholten@gmail.com> * Update default_reimporter.py * add unittests and grype * update * add unittests * ruff * update * sync migration * rebase * update according to comment * update according to rebase * update * update * Clarify reimport behavior for findings update Reimport will update existing findings 'fix_available' and 'fix_version' fields based on the incoming scan report. * update --------- Co-authored-by: valentijnscholten <valentijnscholten@gmail.com>
…Dojo#13573) * Made file changes to test in dojo pro * Changed logic so that individual findings are pushed to jira only after the groups association is confirmed * Apply suggestion from @Maffooch * Rerecord tests --------- Co-authored-by: Cody Maffucci <46459665+Maffooch@users.noreply.github.com>
…2.8.0 (.github/workflows/test-helm-chart.yml) (DefectDojo#13629) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Bumps [boto3](https://github.com/boto/boto3) from 1.40.65 to 1.40.66. - [Release notes](https://github.com/boto/boto3/releases) - [Commits](boto/boto3@1.40.65...1.40.66) --- updated-dependencies: - dependency-name: boto3 dependency-version: 1.40.66 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
…ge.json) (DefectDojo#13625) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
…v41.173.0 (.github/workflows/renovate.yaml) (DefectDojo#13622) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
…/package.json) (DefectDojo#13617) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
…s/package.json) (DefectDojo#13616) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Signed-off-by: kiblik <5609770+kiblik@users.noreply.github.com>
… when redirecting after login using social auth. (DefectDojo#13614) * Adding SOCIAL_AUTH_REDIRECT_IS_HTTPS, to enable use of HTTPS protocol when redirecting after login. * Adding description about how to setup SOCIAL_AUTH_REDIRECT_IS_HTTPS when using helm to docs (docs/content/en/customize_dojo/user_management/configure_sso.md). * Adding description about how to setup SOCIAL_AUTH_REDIRECT_IS_HTTPS when using helm to docs (docs/content/en/customize_dojo/user_management/configure_sso.md). * Apply suggestion from @valentijnscholten --------- Co-authored-by: Marcel Horner <marcel.horner@stefanini.com> Co-authored-by: valentijnscholten <valentijnscholten@gmail.com>
…v42 (.github/workflows/renovate.yaml) (DefectDojo#13638) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Bumps [ruff](https://github.com/astral-sh/ruff) from 0.14.3 to 0.14.4. - [Release notes](https://github.com/astral-sh/ruff/releases) - [Changelog](https://github.com/astral-sh/ruff/blob/main/CHANGELOG.md) - [Commits](astral-sh/ruff@0.14.3...0.14.4) --- updated-dependencies: - dependency-name: ruff dependency-version: 0.14.4 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Bumps [boto3](https://github.com/boto/boto3) from 1.40.66 to 1.40.68. - [Release notes](https://github.com/boto/boto3/releases) - [Commits](boto/boto3@1.40.66...1.40.68) --- updated-dependencies: - dependency-name: boto3 dependency-version: 1.40.68 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
…e.json) (DefectDojo#13641) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Bumps [asteval](https://github.com/lmfit/asteval) from 1.0.6 to 1.0.7. - [Release notes](https://github.com/lmfit/asteval/releases) - [Commits](lmfit/asteval@1.0.6...1.0.7) --- updated-dependencies: - dependency-name: asteval dependency-version: 1.0.7 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
…ocker-compose.yml) (DefectDojo#13711) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
…b/workflows/renovate.yaml) (DefectDojo#13712) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
|
@valentijnscholten please review |
….52.2-2.53.0-dev Release: Merge back 2.52.2 into dev from: master-into-dev/2.52.2-2.53.0-dev
valentijnscholten
left a comment
There was a problem hiding this comment.
Can you base this against dev to reduce the chance of having to rebase migrations during merge back of a bugfix release?
bf5d489 to
8a7ff18
Compare
|
This pull request has conflicts, please resolve those before we can evaluate the pull request. |
|
Conflicts have been resolved. A maintainer will review the pull request shortly. |
🔴 Risk threshold exceeded.This pull request modifies several sensitive files (models, migrations, templates, Jira helper, importers) and introduces risks including excessive JIRA API calls when pushing finding groups, an IDOR in batch finding post-processing that skips per-user authorization, a management command that uses an unvalidated queue name (potential command argument injection/DoS), and a configurable dedupe batch size that could be weaponized to cause resource exhaustion.
🔴 Configured Codepaths Edit in
|
| 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/importers/default_reimporter.py
| 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/models.py
| 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/templates/dojo/view_finding.html
| 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/jira_link/helper.py
| Vulnerability | Configured Codepaths Edit |
|---|---|
| Description | Sensitive edits detected for this file. Sensitive file paths and allowed authors can be configured in .dryrunsecurity.yaml. |
Excessive JIRA API Calls in dojo/jira_link/helper.py
| Vulnerability | Excessive JIRA API Calls |
|---|---|
| Description | The push_finding_group_to_jira function now iterates over all findings within a group and calls update_jira_issue for each. This means that for a finding group with N findings, there will be N+1 calls to JIRA (N for individual findings and 1 for the group). If N is large, this can lead to an excessive number of API calls, potentially causing rate limiting or denial of service for the JIRA integration. |
django-DefectDojo/dojo/jira_link/helper.py
Lines 787 to 788 in abf06e1
Insecure Direct Object Reference (IDOR) in dojo/finding/helper.py
| Vulnerability | Insecure Direct Object Reference (IDOR) |
|---|---|
| Description | The post_process_findings_batch function processes a list of finding_ids without verifying that the user (which defaults to None in the observed call sites) has the necessary permissions to access or modify each finding. The get_finding_models_for_deduplication function, called by post_process_findings_batch, fetches findings solely based on their IDs, without any user-specific authorization. This allows for unauthorized modification or access to findings if an attacker can control the finding_ids supplied to this batch processing function. |
django-DefectDojo/dojo/finding/helper.py
Lines 474 to 477 in abf06e1
Potential Command Argument Injection in dojo/management/commands/clear_celery_queue.py
| Vulnerability | Potential Command Argument Injection |
|---|---|
| Description | The clear_celery_queue management command takes a --queue argument directly from user input. This queue_name is then used without any validation or sanitization in Celery broker operations, specifically channel.queue_declare and channel.queue_purge. While management commands are typically run by trusted users, if this command were ever exposed to untrusted input, a malicious queue_name could potentially lead to a denial of service by purging unintended queues or causing errors in the Celery broker. |
django-DefectDojo/dojo/management/commands/clear_celery_queue.py
Lines 31 to 34 in abf06e1
Potential Resource Exhaustion via Configuration in dojo/management/commands/dedupe.py
| Vulnerability | Potential Resource Exhaustion via Configuration |
|---|---|
| Description | The IMPORT_REIMPORT_DEDUPE_BATCH_SIZE setting, which controls the batch size for deduplication tasks, can be configured to an arbitrarily low value (e.g., 1). While this setting is intended for administrators, if an attacker gains administrative access, they could set this value to 1. This would cause the system to create a large number of small tasks and perform many more database queries for deduplication, potentially leading to significant resource exhaustion and denial of service, especially in environments with a high volume of findings. |
django-DefectDojo/dojo/management/commands/dedupe.py
Lines 127 to 130 in abf06e1
We've notified @mtesauro.
All finding details can be found in the DryRun Security Dashboard.
Uh oh!
There was an error while loading. Please reload this page.