Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Release: Merge back 2.36.0 into bugfix from: master-into-bugfix/2.36.0-2.37.0-dev #10486

Merged
merged 76 commits into from
Jul 1, 2024

Conversation

github-actions[bot]
Copy link
Contributor

@github-actions github-actions bot commented Jul 1, 2024

Release triggered by Maffooch

DefectDojo release bot and others added 30 commits June 3, 2024 20:28
….0-dev

Release: Merge back 2.35.0 into dev from: master-into-dev/2.35.0-2.36.0-dev
Bumps [boto3](https://github.com/boto/boto3) from 1.34.117 to 1.34.118.
- [Release notes](https://github.com/boto/boto3/releases)
- [Changelog](https://github.com/boto/boto3/blob/develop/CHANGELOG.rst)
- [Commits](boto/boto3@1.34.117...1.34.118)

---
updated-dependencies:
- dependency-name: boto3
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Bumps [uwsgi](https://uwsgi-docs.readthedocs.io/en/latest/) from 2.0.25.1 to 2.0.26.

---
updated-dependencies:
- dependency-name: uwsgi
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Bumps [drf-spectacular-sidecar](https://github.com/tfranzel/drf-spectacular-sidecar) from 2024.5.1 to 2024.6.1.
- [Commits](tfranzel/drf-spectacular-sidecar@2024.5.1...2024.6.1)

---
updated-dependencies:
- dependency-name: drf-spectacular-sidecar
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
…6.3-alpine (docker-compose.yml) (#10327)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
* Use Postgres in rest-framework-tests

* Try opposite values

---------

Co-authored-by: Cody Maffucci <[email protected]>
Bumps [boto3](https://github.com/boto/boto3) from 1.34.118 to 1.34.119.
- [Release notes](https://github.com/boto/boto3/releases)
- [Changelog](https://github.com/boto/boto3/blob/develop/CHANGELOG.rst)
- [Commits](boto/boto3@1.34.118...1.34.119)

---
updated-dependencies:
- dependency-name: boto3
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
…s-lint.txt) (#10344)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Bumps [cryptography](https://github.com/pyca/cryptography) from 42.0.7 to 42.0.8.
- [Changelog](https://github.com/pyca/cryptography/blob/main/CHANGELOG.rst)
- [Commits](pyca/cryptography@42.0.7...42.0.8)

---
updated-dependencies:
- dependency-name: cryptography
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
…6.3-alpine (docker-compose.yml) (#10337)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Bumps [redis](https://github.com/redis/redis-py) from 5.0.4 to 5.0.5.
- [Release notes](https://github.com/redis/redis-py/releases)
- [Changelog](https://github.com/redis/redis-py/blob/master/CHANGES)
- [Commits](redis/redis-py@v5.0.4...v5.0.5)

---
updated-dependencies:
- dependency-name: redis
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
…m/defectdojo/chart.yaml) (#10347)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Bumps [boto3](https://github.com/boto/boto3) from 1.34.119 to 1.34.120.
- [Release notes](https://github.com/boto/boto3/releases)
- [Changelog](https://github.com/boto/boto3/blob/develop/CHANGELOG.rst)
- [Commits](boto/boto3@1.34.119...1.34.120)

---
updated-dependencies:
- dependency-name: boto3
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Signed-off-by: DefectDojo <[email protected]>
….0-dev

Release: Merge back 2.35.1 into dev from: master-into-dev/2.35.1-2.36.0-dev
….0-dev

Release: Merge back 2.35.2 into dev from: master-into-dev/2.35.2-2.36.0-dev
Bumps [boto3](https://github.com/boto/boto3) from 1.34.120 to 1.34.123.
- [Release notes](https://github.com/boto/boto3/releases)
- [Changelog](https://github.com/boto/boto3/blob/develop/CHANGELOG.rst)
- [Commits](boto/boto3@1.34.120...1.34.123)

---
updated-dependencies:
- dependency-name: boto3
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
* Rest Framework Tests: Isolate tests by request type

* Add explicit ID to be deleted

* Typing issue
Bumps [boto3](https://github.com/boto/boto3) from 1.34.123 to 1.34.125.
- [Release notes](https://github.com/boto/boto3/releases)
- [Changelog](https://github.com/boto/boto3/blob/develop/CHANGELOG.rst)
- [Commits](boto/boto3@1.34.123...1.34.125)

---
updated-dependencies:
- dependency-name: boto3
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
* Upgrade Django to 4.2.10

* Replace MySQL with PostgreSQL (for tests)

* RemoteUser tests

* Next fixes

* Django 4.2.11

* Upgrade to 4.2.13
Bumps [openpyxl](https://openpyxl.readthedocs.io) from 3.1.3 to 3.1.4.

---
updated-dependencies:
- dependency-name: openpyxl
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
…35.4 (helm/defectdojo/values.yaml) (#10394)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Bumps [redis](https://github.com/redis/redis-py) from 5.0.5 to 5.0.6.
- [Release notes](https://github.com/redis/redis-py/releases)
- [Changelog](https://github.com/redis/redis-py/blob/master/CHANGES)
- [Commits](redis/redis-py@v5.0.5...v5.0.6)

---
updated-dependencies:
- dependency-name: redis
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Bumps [boto3](https://github.com/boto/boto3) from 1.34.125 to 1.34.126.
- [Release notes](https://github.com/boto/boto3/releases)
- [Changelog](https://github.com/boto/boto3/blob/develop/CHANGELOG.rst)
- [Commits](boto/boto3@1.34.125...1.34.126)

---
updated-dependencies:
- dependency-name: boto3
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Bumps [packageurl-python](https://github.com/package-url/packageurl-python) from 0.15.0 to 0.15.1.
- [Release notes](https://github.com/package-url/packageurl-python/releases)
- [Changelog](https://github.com/package-url/packageurl-python/blob/main/CHANGELOG.rst)
- [Commits](package-url/packageurl-python@v0.15.0...v0.15.1)

---
updated-dependencies:
- dependency-name: packageurl-python
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

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

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
a-ruff and others added 17 commits June 21, 2024 16:25
* Enhance Kubescape parser

* Fix typo.

* Update settings check-sum

* Update settings check-sum
* ✨ add deepfence threatmapper

* 🎇 finished

* update

* update deepfence threatmapper

* fix according to review

* fix ruff

* fix ruff

* 🐛 fix

* remove unecessary file

* update sha sum
Signed-off-by: DefectDojo <[email protected]>
Signed-off-by: DefectDojo <[email protected]>
….0-dev

Release: Merge back 2.35.4 into dev from: master-into-dev/2.35.4-2.36.0-dev
Bumps nginx from `69f8c2c` to `a45ee5d`.

---
updated-dependencies:
- dependency-name: nginx
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Bumps [coverage](https://github.com/nedbat/coveragepy) from 7.5.3 to 7.5.4.
- [Release notes](https://github.com/nedbat/coveragepy/releases)
- [Changelog](https://github.com/nedbat/coveragepy/blob/master/CHANGES.rst)
- [Commits](nedbat/coveragepy@7.5.3...7.5.4)

---
updated-dependencies:
- dependency-name: coverage
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Bumps [boto3](https://github.com/boto/boto3) from 1.34.131 to 1.34.132.
- [Release notes](https://github.com/boto/boto3/releases)
- [Changelog](https://github.com/boto/boto3/blob/develop/CHANGELOG.rst)
- [Commits](boto/boto3@1.34.131...1.34.132)

---
updated-dependencies:
- dependency-name: boto3
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Bumps [debugpy](https://github.com/microsoft/debugpy) from 1.8.1 to 1.8.2.
- [Release notes](https://github.com/microsoft/debugpy/releases)
- [Commits](microsoft/debugpy@v1.8.1...v1.8.2)

---
updated-dependencies:
- dependency-name: debugpy
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Bumps [redis](https://github.com/redis/redis-py) from 5.0.6 to 5.0.7.
- [Release notes](https://github.com/redis/redis-py/releases)
- [Changelog](https://github.com/redis/redis-py/blob/master/CHANGES)
- [Commits](redis/redis-py@v5.0.6...v5.0.7)

---
updated-dependencies:
- dependency-name: redis
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Bumps [boto3](https://github.com/boto/boto3) from 1.34.132 to 1.34.135.
- [Release notes](https://github.com/boto/boto3/releases)
- [Changelog](https://github.com/boto/boto3/blob/develop/CHANGELOG.rst)
- [Commits](boto/boto3@1.34.132...1.34.135)

---
updated-dependencies:
- dependency-name: boto3
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Bugfix -> Dev: Release 2.36.0
Release: Merge release into master from: release/2.36.0
Copy link

dryrunsecurity bot commented Jul 1, 2024

Hi there 👋, @DryRunSecurity here, below is a summary of our analysis and findings.

DryRun Security Status Findings
Server-Side Request Forgery Analyzer 0 findings
Configured Codepaths Analyzer 0 findings
IDOR Analyzer 0 findings
Sensitive Files Analyzer 1 finding
SQL Injection Analyzer 0 findings
Authn/Authz Analyzer 22 findings
Secrets Analyzer 0 findings

Note

🟢 Risk threshold not exceeded.

Change Summary (click to expand)

The following is a summary of changes in this pull request made by me, your security buddy 🤖. Note that this summary is auto-generated and not meant to be a definitive list of security issues but rather a helpful summary from a security perspective.

Summary:

The provided code changes cover a wide range of updates and improvements to the DefectDojo application, including changes to the GitHub Actions workflows, Docker build configurations, documentation, and various application modules. The changes focus on enhancing the security, reliability, and functionality of the application.

Some key security-related highlights include:

  1. Updating the database backend from MySQL to PostgreSQL and the message queue from RabbitMQ to Redis, which requires thorough testing and review to ensure secure configurations.
  2. Improving the Docker image versioning, caching, and multi-arch support to ensure the integrity and security of the deployment environment.
  3. Enhancing the authorization and exception handling mechanisms to provide better security and user experience.
  4. Implementing rate limiting and account lockout functionality to protect against potential abuse or attacks.
  5. Reviewing the handling of sensitive data, such as API keys, credentials, and security findings, to ensure proper security measures are in place.
  6. Maintaining up-to-date dependencies and addressing potential security vulnerabilities.

Overall, the changes appear to be focused on improving the security, stability, and functionality of the DefectDojo application. As an application security engineer, I would recommend thoroughly reviewing the changes, testing the application in various environments, and ensuring that the security best practices are followed throughout the codebase and deployment process.

Files Changed:

  1. .github/workflows/rest-framework-tests.yml: Updates the GitHub Actions workflow to run unit tests using a PostgreSQL database and a phased startup approach.
  2. .github/workflows/build-docker-images-for-testing.yml: Updates the Docker build workflow to use the latest version of the docker/build-push-action and implement caching and multi-arch support.
  3. .github/workflows/release-x-manual-docker-containers.yml: Updates the manual Docker release workflow to include versioning, tagging, and secure credential management.
  4. .github/workflows/integration-tests.yml: Updates the integration test workflow to use PostgreSQL and Redis as the database and message queue backends, respectively.
  5. components/package.json: Updates the project dependencies, which should be reviewed for any security-related changes.
  6. Dockerfile.nginx-debian and Dockerfile.nginx-alpine: Updates the NGINX-based Docker images with a secure base image, least-privilege user, and environment variable configuration.
  7. docker-compose.yml: Updates the Docker Compose configuration to use the latest versions of the PostgreSQL and Redis services.
  8. Various Python files in the dojo/ directory: Includes changes to authorization, rate limiting, exception handling, report generation, and other application-level functionality, which should be reviewed for security implications.

Powered by DryRun Security

@Maffooch Maffooch closed this Jul 1, 2024
@Maffooch Maffooch reopened this Jul 1, 2024
@github-actions github-actions bot added docker settings_changes Needs changes to settings.py based on changes in settings.dist.py included in this PR apiv2 docs unittests ui parser helm labels Jul 1, 2024
@Maffooch Maffooch merged commit 6fc4bae into bugfix Jul 1, 2024
122 checks passed
@Maffooch Maffooch deleted the master-into-bugfix/2.36.0-2.37.0-dev branch July 1, 2024 16:23
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
apiv2 docker docs helm parser settings_changes Needs changes to settings.py based on changes in settings.dist.py included in this PR ui unittests
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants