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

Allow using recent opencontainers/go-digest #2406

Merged
merged 2 commits into from
May 14, 2024

Conversation

mtrmac
Copy link
Collaborator

@mtrmac mtrmac commented May 9, 2024

We would like to update opencontainers/go-digest to include opencontainers/go-digest#101 , if it is accepted, to further protect against things like CVE-2024-3727 .

The upstream branch has deprecated the Hex method, so migrate away. Also ensure we can work with the proposed digest validation.

@mtrmac mtrmac changed the title Opencontainers upgrade prereq Allow using recent opencontainers/go-digest May 9, 2024
@mtrmac mtrmac force-pushed the opencontainers-upgrade-prereq branch from cae3943 to 5501f1b Compare May 9, 2024 19:34
@rhatdan
Copy link
Member

rhatdan commented May 13, 2024

LGTM
@giuseppe @mheon @Luap99 @baude PTAL

@@ -229,7 +229,7 @@ func ensureDBHasCurrentSchema(db *sql.DB) error {
// * This schema uses the text representation of digests.
//
// We use the fairly wasteful text with hexadecimal digits because digest.Digest does not define a binary representation;
// and the way digest.Digest.Hex() is deprecated in favor of digest.Digest.Encoded(), and the way digest.Algorithm
// and the way digest.Digest.Encoded() is deprecated in favor of digest.Digest.Encoded(), and the way digest.Algorithm
Copy link
Member

Choose a reason for hiding this comment

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

This seems incorrect

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

Good catch, thanks!

@mtrmac mtrmac force-pushed the opencontainers-upgrade-prereq branch from 5501f1b to 3690153 Compare May 13, 2024 22:17
Copy link
Member

@giuseppe giuseppe left a comment

Choose a reason for hiding this comment

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

LGTM

Signed-off-by: Miloslav Trmač <mitr@redhat.com>
Should not change behavior.

Signed-off-by: Miloslav Trmač <mitr@redhat.com>
@mtrmac mtrmac force-pushed the opencontainers-upgrade-prereq branch from 3690153 to b71a3e3 Compare May 14, 2024 09:18
@rhatdan rhatdan merged commit 6caf212 into containers:main May 14, 2024
10 checks passed
@mtrmac mtrmac deleted the opencontainers-upgrade-prereq branch May 16, 2024 16:53
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.

None yet

4 participants