Refactor verifyNewBundle into library function #4013
Merged
Conversation
This file contains 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
Codecov ReportAttention: Patch coverage is
Additional details and impacted files@@ Coverage Diff @@
## main #4013 +/- ##
==========================================
- Coverage 40.10% 36.84% -3.26%
==========================================
Files 155 210 +55
Lines 10044 13356 +3312
==========================================
+ Hits 4028 4921 +893
- Misses 5530 7817 +2287
- Partials 486 618 +132 ☔ View full report in Codecov by Sentry. |
codysoyland
changed the title
|
@haydentherapper @cmurphy @steiza I would appreciate a look at this whenever you have a moment! |
malancas
reviewed
Jan 23, 2025
|
I will take a look at the conformance failures Monday. Thanks all! |
|
Needs a rebase to fix the tests that didn't run |
Signed-off-by: Cody Soyland <codysoyland@github.com>
Signed-off-by: Cody Soyland <codysoyland@github.com>
Signed-off-by: Cody Soyland <codysoyland@github.com>
Signed-off-by: Cody Soyland <codysoyland@github.com>
Signed-off-by: Cody Soyland <codysoyland@github.com>
Signed-off-by: Cody Soyland <codysoyland@github.com>
Signed-off-by: Cody Soyland <codysoyland@github.com>
Signed-off-by: Cody Soyland <codysoyland@github.com>
This var has a default value so shouldn't be checked Signed-off-by: Cody Soyland <codysoyland@github.com>
These tests are incorrect: they set the signature field which is not allowed when doing bundle verification. Previously they were passing due to logic errors. Signed-off-by: Cody Soyland <codysoyland@github.com>
codysoyland
force-pushed
the
verify-new-bundle-refactor
branch
from
5932f1f to
4a08df9
Compare
cmurphy
reviewed
Feb 6, 2025
Co-authored-by: Colleen Murphy <cmurphy@users.noreply.github.com> Signed-off-by: Cody Soyland <codysoyland@github.com>
|
|
||
| return sev.Verify(bundle, verify.NewPolicy(artifactOpt, identityPolicies...)) | ||
| } | ||
|
|
||
| func AssembleNewBundle(ctx context.Context, sigBytes, signedTimestamp []byte, envelope *dsse.Envelope, artifactRef string, cert *x509.Certificate, ignoreTlog bool, sigVerifier signature.Verifier, pkOpts []signature.PublicKeyOption, rekorClient *client.Rekor) (*sgbundle.Bundle, error) { |
There was a problem hiding this comment.
For a later PR, we should move this to somewhere under pkg/ rather than be under the cli package. It looks like this is only used by the cosign bundle command.
Signed-off-by: Cody Soyland <codysoyland@github.com>
Signed-off-by: Cody Soyland <codysoyland@github.com>
Signed-off-by: Cody Soyland <codysoyland@github.com>
haydentherapper
approved these changes
Feb 7, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Summary
This is a refactor of the bundle verification logic that replaces verifyNewBundle with a re-written library function
cosign.VerifyNewBundle, which accepts a simplified set of arguments, usingCheckOptsto supply the majority of the configuration. It has been moved out of theclipackage into thecosignpackage and made public.This is partially extracted from #3889.
Release Note
Documentation