Refactor to make it clearer that we return the validated TOC value#1887
Merged
openshift-merge-bot[bot] merged 3 commits intocontainers:mainfrom Apr 16, 2024
Merged
Refactor to make it clearer that we return the validated TOC value#1887openshift-merge-bot[bot] merged 3 commits intocontainers:mainfrom
openshift-merge-bot[bot] merged 3 commits intocontainers:mainfrom
Conversation
Make it structually clear that the code is all using the same value, making it less likely for the verifier and other uses to get out of sync. Also avoids some redundant parsing and error paths. Should not change behavior. Signed-off-by: Miloslav Trmač <mitr@redhat.com>
Collaborator
Author
|
(Completely untested, to be transparent.) |
Make it structually clear that the code is all using the same value, making it less likely for the verifier and other uses to get out of sync. Also avoids some redundant parsing and error paths. The conversion path looks longer, but that's just moving the parsing from the called function (which is redundant for other callers). Should not change behavior. Signed-off-by: Miloslav Trmač <mitr@redhat.com>
Manage the value directly to simplify. This happens to fix the ReadFooterDataFromBlob code path, which was not setting ChecksumAnntation at all. Signed-off-by: Miloslav Trmač <mitr@redhat.com>
giuseppe
approved these changes
Apr 15, 2024
Member
giuseppe
left a comment
There was a problem hiding this comment.
I've tested it with some existing images and it works well.
LGTM
Contributor
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: giuseppe, mtrmac The full list of commands accepted by this bot can be found here. The pull request process is described here DetailsNeeds approval from an approver in each of these files:
Approvers can indicate their approval by writing |
Member
|
LGTM |
Member
|
/lgtm |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Primarily, this ensures that the value in
ApplyDiff’sDriverWithDifferOutput.TOCDigestis really exactly the value we used to validate the digest, by only reading it once and passing it around.That’s to simplify auditing and make the relationship clear, but it should not change behavior.
Incidentally, this also should fix #1886 — but I still think the binary footer code path should be removed entirely.
Cc: @giuseppe