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 release into master from: release/2.42.0 #11512

Merged
merged 76 commits into from
Jan 6, 2025
Merged

Conversation

github-actions[bot]
Copy link
Contributor

@github-actions github-actions bot commented Jan 6, 2025

Release triggered by Maffooch

Maffooch and others added 30 commits December 2, 2024 13:00
….0-dev

Release: Merge back 2.41.0 into bugfix from: master-into-dev/2.41.0-2.42.0-dev
…e.json) (#11351)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Bumps [drf-spectacular-sidecar](https://github.com/tfranzel/drf-spectacular-sidecar) from 2024.11.1 to 2024.12.1.
- [Commits](tfranzel/drf-spectacular-sidecar@2024.11.1...2024.12.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>
Bumps nginx from 1.27.2-alpine to 1.27.3-alpine.

---
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>
* remove psycopg2-binary

* 🎉 Add GLSA vulnid

* 🎉 Add GLSA vulnid

* update sha sum

* sha sum

* sha sum
Bumps [boto3](https://github.com/boto/boto3) from 1.35.71 to 1.35.73.
- [Release notes](https://github.com/boto/boto3/releases)
- [Commits](boto/boto3@1.35.71...1.35.73)

---
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 [drf-spectacular](https://github.com/tfranzel/drf-spectacular) from 0.27.2 to 0.28.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.27.2...0.28.0)

---
updated-dependencies:
- dependency-name: drf-spectacular
  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>
* initial add of filters

* remove unneeded things

* mostly the same

* small tweaks

* fix access error

* fix access error add product

---------

Co-authored-by: Cody Maffucci <[email protected]>
Bumps [django](https://github.com/django/django) from 5.1.3 to 5.1.4.
- [Commits](django/django@5.1.3...5.1.4)

---
updated-dependencies:
- dependency-name: django
  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.2.0 to 5.2.1.
- [Release notes](https://github.com/redis/redis-py/releases)
- [Changelog](https://github.com/redis/redis-py/blob/master/CHANGES)
- [Commits](redis/redis-py@v5.2.0...v5.2.1)

---
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>
…ckage.json) (#11370)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
….3.0 to v1.4.0 (helm/defectdojo/values.yaml) (#11373)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
…cs/package.json) (#11360)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
…thub/workflows/gh-pages.yml) (#11329)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
…e.json) (#11380)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Bumps [boto3](https://github.com/boto/boto3) from 1.35.73 to 1.35.76.
- [Release notes](https://github.com/boto/boto3/releases)
- [Commits](boto/boto3@1.35.73...1.35.76)

---
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>
….0-dev

Release: Merge back 2.41.1 into dev from: master-into-dev/2.41.1-2.42.0-dev
…7.2-alpine (docker-compose.yml) (#11397)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Bumps nginx from `5acf10c` to `4152318`.

---
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 [boto3](https://github.com/boto/boto3) from 1.35.76 to 1.35.78.
- [Release notes](https://github.com/boto/boto3/releases)
- [Commits](boto/boto3@1.35.76...1.35.78)

---
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>
dependabot bot and others added 17 commits December 26, 2024 11:47
Bumps [pdfmake](https://github.com/bpampuch/pdfmake) from 0.2.16 to 0.2.17.
- [Release notes](https://github.com/bpampuch/pdfmake/releases)
- [Changelog](https://github.com/bpampuch/pdfmake/blob/0.2.17/CHANGELOG.md)
- [Commits](bpampuch/pdfmake@0.2.16...0.2.17)

---
updated-dependencies:
- dependency-name: pdfmake
  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>
…e.json) (#11471)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Bumps [boto3](https://github.com/boto/boto3) from 1.35.85 to 1.35.87.
- [Release notes](https://github.com/boto/boto3/releases)
- [Commits](boto/boto3@1.35.85...1.35.87)

---
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 [boto3](https://github.com/boto/boto3) from 1.35.87 to 1.35.88.
- [Release notes](https://github.com/boto/boto3/releases)
- [Commits](boto/boto3@1.35.87...1.35.88)

---
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>
….0-dev

Release: Merge back 2.41.4 into dev from: master-into-dev/2.41.4-2.42.0-dev
….42.0-dev

Release: Merge back 2.41.4 into bugfix from: master-into-bugfix/2.41.4-2.42.0-dev
Bumps [boto3](https://github.com/boto/boto3) from 1.35.88 to 1.35.90.
- [Release notes](https://github.com/boto/boto3/releases)
- [Commits](boto/boto3@1.35.88...1.35.90)

---
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 [python-gitlab](https://github.com/python-gitlab/python-gitlab) from 5.2.0 to 5.3.0.
- [Release notes](https://github.com/python-gitlab/python-gitlab/releases)
- [Changelog](https://github.com/python-gitlab/python-gitlab/blob/main/CHANGELOG.md)
- [Commits](python-gitlab/python-gitlab@v5.2.0...v5.3.0)

---
updated-dependencies:
- dependency-name: python-gitlab
  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>
* update group jira RA, use helper for UI

* ruff it up

* return endpoint update

* move func to jira_helper, update calls

* the endpoints fail the test?

* rearrange risk changes

* fix for minor e.text error, minor grammar issue

* added test for changing jira group status

* remove newline at end of file
Bumps [boto3](https://github.com/boto/boto3) from 1.35.90 to 1.35.91.
- [Release notes](https://github.com/boto/boto3/releases)
- [Commits](boto/boto3@1.35.90...1.35.91)

---
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>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Merge `bugfix` -> `dev` for release 2.42.0
@Maffooch Maffooch closed this Jan 6, 2025
@Maffooch Maffooch reopened this Jan 6, 2025
@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 integration_tests ui parser helm labels Jan 6, 2025
Copy link

dryrunsecurity bot commented Jan 6, 2025

DryRun Security Summary

The pull request focuses on improving the security, reliability, and consistency of DefectDojo's GitHub Actions workflows by updating dependency and action versions, implementing security best practices, and integrating static code analysis tools.

Expand for full summary

Summary:

The code changes in this pull request cover a wide range of updates to the GitHub Actions workflows and configuration files used in the DefectDojo project. The changes focus on improving the reliability, consistency, and security of the project's build, testing, and release processes.

Key security-related updates include:

  1. Updating dependency versions to the latest stable versions, which helps mitigate potential security vulnerabilities.
  2. Pinning the versions of GitHub Actions used in the workflows to specific commit hashes, ensuring consistent and reproducible behavior.
  3. Implementing security-conscious practices, such as validating user inputs, sanitizing sensitive data, and properly managing secrets.
  4. Improving the security of the Helm chart deployment and Docker image building processes.
  5. Integrating static code analysis tools, like ShellCheck and Ruff, to catch potential security issues early in the development process.

Overall, the changes in this pull request demonstrate a strong focus on maintaining the security and integrity of the DefectDojo project. The application security engineer's review has not identified any immediate security concerns, but it's important to continue monitoring the project's dependencies and infrastructure for any future security-related updates or vulnerabilities.

Files Changed:

  • .github/workflows/cancel-outdated-workflow-runs.yml: Updated the version of the "styfle/cancel-workflow-action" GitHub action.
  • .github/workflows/fetch-oas.yml: Updated the versions of the "actions/checkout" and "actions/upload-artifact" actions.
  • .github/workflows/build-docker-images-for-testing.yml: Updated the versions of the "actions/checkout", "docker/setup-buildx-action", "docker/build-push-action", and "actions/upload-artifact" actions.
  • .github/workflows/detect-merge-conflicts.yaml: Updated the version of the "eps1lon/actions-label-merge-conflict" action.
  • .github/workflows/gh-pages.yml: Updated the versions of various GitHub Actions used in the workflow, including "peaceiris/actions-hugo", "actions/setup-node", "actions/cache", "actions/checkout", "actions/configure-pages", and "peaceiris/actions-gh-pages".
  • .github/workflows/plantuml.yml: Updated the versions of the "actions/checkout" and "stefanzweifel/git-auto-commit-action" actions.
  • .github/workflows/integration-tests.yml: Updated the versions of the "actions/checkout" and "actions/download-artifact" actions.
  • .github/workflows/k8s-tests.yml: Updated the versions of the "actions/checkout" and "manusa/actions-setup-minikube" actions.
  • .github/workflows/pr-labeler.yml: Updated the version of the "actions/labeler" action.
  • .github/workflows/release-1-create-pr.yml: No significant changes.
  • .github/workflows/release-2-tag-docker-push.yml: No significant changes.
  • .github/workflows/release-3-master-into-dev.yml: No significant changes.
  • .github/workflows/release-drafter.yml: Updated the versions of the "release-drafter/release-drafter", "actions/download-artifact", and "actions/upload-release-asset" actions.
  • .github/workflows/release-x-manual-helm-chart.yml: Updated the versions of the "actions/checkout", "mikefarah/yq", and "softprops/action-gh-release" actions.
  • .github/workflows/release_drafter_valentijn.yml: No significant changes.
  • .github/workflows/release-x-manual-docker-containers.yml: Updated the versions of the "docker/login-action", "actions/checkout", "docker/setup-buildx-action", and "docker/build-push-action" actions.
  • .github/workflows/shellcheck.yml: Updated the version of the "actions/checkout" action.
  • .github/workflows/ruff.yml: Updated the version of the "actions/checkout" action.
  • .github/workflows/rest-framework-tests.yml: Updated the versions of the "actions/checkout" and "actions/download-artifact" actions.
  • Dockerfile.nginx-alpine: Updated the NGINX base image version from 1.27.2 to 1.27.3.
  • .github/workflows/test-helm-chart.yml: Updated the versions of various GitHub

Code Analysis

We ran 9 analyzers against 30 files and 2 analyzers had findings. 7 analyzers had no findings.

Analyzer Findings
Configured Codepaths Analyzer 6 findings
Sensitive Files Analyzer 2 findings

Overall Riskiness

🔴 Risk threshold exceeded.

We've notified @mtesauro, @grendel513.

View PR in the DryRun Dashboard.

@Maffooch Maffooch merged commit 5f69079 into master Jan 6, 2025
70 of 71 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
apiv2 docker docs helm integration_tests 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.

7 participants