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-5.27] Backport #2546

Merged
merged 8 commits into from
Sep 3, 2024

Conversation

mtrmac
Copy link
Collaborator

@mtrmac mtrmac commented Aug 30, 2024

… to avoid cross-branch regressions

This makes the test a tiny bit more realistic, and avoids
a linter warning.

Signed-off-by: Miloslav Trmač <mitr@redhat.com>
If doing it makes sense at all, it should happen before
the values are used.

Signed-off-by: Miloslav Trmač <mitr@redhat.com>
... to prevent panics if the value does not contain a :, or other unexpected
values (e.g. a path traversal).

Don't bother on paths where we computed the digest ourselves, or it is already trusted
for other reasons.

Signed-off-by: Miloslav Trmač <mitr@redhat.com>
Use defer() to remove the temporary file, instead
of duplicating the call.

Should not change behavior.

Signed-off-by: Miloslav Trmač <mitr@redhat.com>
Use defer, a nested function, and early returns.

Besides being a bit more directly related to what
we want to achieve, this now does not call decompressed.Close()
on a nil value if DecompressStream fails.

Signed-off-by: Miloslav Trmač <mitr@redhat.com>
... to prevent unexpected behavior on invalid values.

Signed-off-by: Miloslav Trmač <mitr@redhat.com>
Signed-off-by: Miloslav Trmač <mitr@redhat.com>
Per containers/skopeo#2346, that happens
in the wild.

Signed-off-by: Miloslav Trmač <mitr@redhat.com>
Signed-off-by: tomsweeneyredhat <tsweeney@redhat.com>
@mtrmac mtrmac marked this pull request as ready for review September 2, 2024 19:09
@rhatdan
Copy link
Member

rhatdan commented Sep 3, 2024

LGTM

@rhatdan rhatdan merged commit ba0021b into containers:release-5.27 Sep 3, 2024
9 checks passed
@mtrmac mtrmac deleted the digest-unmarshal-5.27 branch September 3, 2024 20:04
@TomSweeneyRedHat
Copy link
Member

@rhatdan beat me to the merge, but for historical purposes, LGTM

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