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

feat(Docker): add Secrets, Compose v2, Supply Chain Security, Podman #1301

Merged
merged 4 commits into from
Feb 2, 2024

Conversation

otkd
Copy link
Contributor

@otkd otkd commented Feb 1, 2024

  • Updates Docker Compose references to use v2 docker compose command
  • Change ICC recommendation to use network policies instead of disabling
  • Following existing syntax adds Rule 13 covering Docker Secrets
  • Merges the linting and container scanning section into a single rule
  • Fixes issue in proposed solution in Rule 10 doesn’t actually help implement the suggestion
  • Expand rootless mode
  • Add high level practices covering Docker supply chain security
  • Add Podman as an alternative to Docker for secure defaults

Thank you for submitting a Pull Request (PR) to the Cheat Sheet Series.

🚩 If your PR is related to grammar/typo mistakes, please double-check the file for other mistakes in order to fix all the issues in the current cheat sheet.

Please make sure that for your contribution:

  • In case of a new Cheat Sheet, you have used the Cheat Sheet template.
  • All the markdown files do not raise any validation policy violation, see the policy.
  • All the markdown files follow these format rules.
  • All your assets are stored in the assets folder.
  • All the images used are in the PNG format.
  • Any references to websites have been formatted as [TEXT](URL)
  • You verified/tested the effectiveness of your contribution (e.g., the defensive code proposed is really an effective remediation? Please verify it works!).
  • The CI build of your PR pass, see the build status here.

If your PR is related to an issue, please finish your PR text with the following line:

This PR covers issue #.

Thank you again for your contribution 😃

otkd added 2 commits January 31, 2024 23:53
- Updates Docker Compose references to use v2 `docker compose` command
- Change ICC recommendation to use network policies  instead of disabling

Signed-off-by: otkd <[email protected]>
- Following existing syntax adds Rule OWASP#13 covering Docker Secrets

Signed-off-by: otkd <[email protected]>
Copy link
Collaborator

@szh szh left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Overall I really like this. This is a much needed update and also improves the grammar of the cheat sheet. I left a few comments and suggestions, feel free to let me know if you disagree with any of them.

cheatsheets/Docker_Security_Cheat_Sheet.md Outdated Show resolved Hide resolved
cheatsheets/Docker_Security_Cheat_Sheet.md Outdated Show resolved Hide resolved
cheatsheets/Docker_Security_Cheat_Sheet.md Outdated Show resolved Hide resolved
cheatsheets/Docker_Security_Cheat_Sheet.md Outdated Show resolved Hide resolved
cheatsheets/Docker_Security_Cheat_Sheet.md Outdated Show resolved Hide resolved
Co-authored-by: Shlomo Zalman Heigh <[email protected]>
@otkd otkd marked this pull request as draft February 1, 2024 23:35
- Merges the linting and container scanning section into a single rule
- Fixes issue in proposed solution in Rule 10 doesn’t actually help implement the suggestion
- Expand rootless mode
- Add high level practices covering Docker supply chain security
- Add Podman as an alternative to Docker for secure defaults

Signed-off-by: otkd <[email protected]>
@otkd otkd marked this pull request as ready for review February 2, 2024 05:07
@otkd
Copy link
Contributor Author

otkd commented Feb 2, 2024

Overall I really like this. This is a much needed update and also improves the grammar of the cheat sheet. I left a few comments and suggestions, feel free to let me know if you disagree with any of them.

@szh agree with all of them, also prompted me to take a look at some of the other sections which I've updated as well

@otkd otkd requested a review from szh February 2, 2024 05:12
@otkd otkd changed the title feat(Docker): Secrets & Compose v2 feat(Docker): add Secrets, Compose v2, Supply Chain Security, Podman Feb 2, 2024
@jmanico jmanico merged commit b78e4a6 into OWASP:master Feb 2, 2024
3 checks passed
@otkd otkd deleted the docker-secrets branch February 28, 2024 04:22
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants