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.

Sign up for GitHub

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

Jump to bottom

Remove VerificationMaterials (take 2) #937

Merged
merged 33 commits into from
Apr 2, 2024
Merged

Remove VerificationMaterials (take 2) #937

merged 33 commits into from
Apr 2, 2024

Conversation

woodruffw
Copy link
Member

@woodruffw woodruffw commented Mar 14, 2024 •
edited

Very WIP, still thinking this through.

TODO:

  • Bring the coverage back up a bit.
  • This changeset currently reverts our protections against Rekor entry confusion; I need to reintroduce those.
  • CHANGELOG entries

@woodruffw
WIP
73125af 
Signed-off-by: William Woodruff <william@trailofbits.com>
@woodruffw
hackety hack
c99a373 
Signed-off-by: William Woodruff <william@trailofbits.com>
@woodruffw
sigstore: hackety hack
95ea0ff 
Signed-off-by: William Woodruff <william@trailofbits.com>
@woodruffw woodruffw added component:verification Core verification functionality component:api Public APIs labels Mar 14, 2024
@woodruffw woodruffw added this to the 3.0 milestone Mar 14, 2024
@woodruffw woodruffw self-assigned this Mar 14, 2024
@woodruffw
sigstore: fill in more Bundle bits
8c54807 
Signed-off-by: William Woodruff <william@trailofbits.com>
@woodruffw
begin to fixup tests
dc60cbf 
Signed-off-by: William Woodruff <william@trailofbits.com>
@woodruffw
sigstore, test: continue test fixups
f9fe13e 
Signed-off-by: William Woodruff <william@trailofbits.com>
@woodruffw
Copy link
Member Author

woodruffw commented Mar 14, 2024 •
edited

To summarize, roughly:

  • VerificationMaterials is now entirely gone: APIs that took it now take a sigstore.verify.Bundle instead, which is a wrapper around the protobuf_specs-defined Bundle type.
  • We now require an inclusion proof, full stop. This removes a bunch of special-casing around "detached" materials and older bundle types, and removes the need to test those edge cases.
  • Bundles are now always verified offline.
  • Detached materials are now always verified online. Passing --offline with detached inputs causes an error.
  • We now generate "v3" bundles by default. This might be worth reverting, not sure.

@woodruffw
sigstore: re-exports, fix open mode
9aeb0bc 
Signed-off-by: William Woodruff <william@trailofbits.com>
@woodruffw
sigstore: fixup types, CLI
0b2bcce 
Signed-off-by: William Woodruff <william@trailofbits.com>
@woodruffw
sigstore: docstring coverage
41f3340 
Signed-off-by: William Woodruff <william@trailofbits.com>
@woodruffw
test: fixup signing tests
1de6a90 
Signed-off-by: William Woodruff <william@trailofbits.com>
@woodruffw
_cli: fix var
bae9948 
This is a mess.

Signed-off-by: William Woodruff <william@trailofbits.com>
@woodruffw
sigstore: delete another duplicated helper
29efbbe 
_make_bundle is just _from_parts with a bit of specialization.

Signed-off-by: William Woodruff <william@trailofbits.com>
@woodruffw woodruffw mentioned this pull request Mar 14, 2024
Merged
@woodruffw
Copy link
Member Author

Conformance failures here are caused by a dep mismatch: sigstore/sigstore-conformance#132

@woodruffw woodruffw mentioned this pull request Mar 15, 2024
Merged
@woodruffw
workflows/conformance: bump
6e849b8 
Signed-off-by: William Woodruff <william@trailofbits.com>
@woodruffw woodruffw mentioned this pull request Mar 15, 2024
Closed
@woodruffw
_cli: use public accessors
55f9420 
Signed-off-by: William Woodruff <william@trailofbits.com>
@woodruffw
_cli: lintage
a3a34e2 
Signed-off-by: William Woodruff <william@trailofbits.com>
@woodruffw
verify/models: fixup DSSE KindVersion
dc6192e 
Signed-off-by: William Woodruff <william@trailofbits.com>
@woodruffw
workflows/conformance: 0.0.11
e07fc4e 
Signed-off-by: William Woodruff <william@trailofbits.com>
@woodruffw
_cli: bytes -> str
2e4d94c 
Signed-off-by: William Woodruff <william@trailofbits.com>
@woodruffw
sigstore: remove unnecessary client deps
ef303cf 
Also adds tlog consistency checking.

Signed-off-by: William Woodruff <william@trailofbits.com>
@woodruffw woodruffw mentioned this pull request Mar 15, 2024
Closed
@woodruffw
test: re-add CVE-2022-36056 test
2aa3d50 
Signed-off-by: William Woodruff <william@trailofbits.com>
@woodruffw
sigstore: remove _internal.set
606855b 
This is essentially a single helper that should live under `LogEntry`.

Signed-off-by: William Woodruff <william@trailofbits.com>
@woodruffw
test: reintroduce some model tests
d8e0239 
Signed-off-by: William Woodruff <william@trailofbits.com>
@woodruffw
CHANGELOG: begin recording changes
d70a3dc 
Signed-off-by: William Woodruff <william@trailofbits.com>
@woodruffw
test: missing license
6767b81 
Signed-off-by: William Woodruff <william@trailofbits.com>
@woodruffw woodruffw mentioned this pull request Mar 15, 2024
Closed
3 tasks
@woodruffw
sigstore: update verify example
349de0a 
Signed-off-by: William Woodruff <william@trailofbits.com>
@woodruffw
sigstore/sign: update example
a836140 
Signed-off-by: William Woodruff <william@trailofbits.com>
@woodruffw woodruffw marked this pull request as ready for review March 15, 2024 22:05
@woodruffw woodruffw requested a review from jku March 18, 2024 16:56
@woodruffw
Copy link
Member Author

This is a pretty chunky PR, so apologies in advance 😅

@woodruffw woodruffw mentioned this pull request Mar 26, 2024
Closed
9 tasks
@woodruffw
Merge remote-tracking branch 'origin/main' into ww/rm-verificationmat…
c9b8c29 
…erials-2

Signed-off-by: William Woodruff <william@trailofbits.com>
jku
jku previously approved these changes Apr 2, 2024
View reviewed changes
Copy link
Member

@jku jku left a comment

Choose a reason for hiding this comment

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

Looks good, I have no design complaints: This seems like a logical simplification.

The code comments are very minor so approving as is.

CHANGELOG.md Outdated Show resolved Hide resolved
sigstore/verify/models.py Outdated Show resolved Hide resolved
sigstore/verify/models.py Outdated Show resolved Hide resolved
@woodruffw
Merge branch 'main' into ww/rm-verificationmaterials-2
ac65f2e
@woodruffw
CHANGELOG: emphasize bundle type
94a4ff6 
Signed-off-by: William Woodruff <william@trailofbits.com>
@woodruffw
bundle: stricter tlog cardinality
c0b0272 
Signed-off-by: William Woodruff <william@trailofbits.com>
@woodruffw woodruffw requested a review from jku April 2, 2024 13:42
@woodruffw woodruffw merged commit dc4aa82 into main Apr 2, 2024
25 checks passed
@woodruffw woodruffw deleted the ww/rm-verificationmaterials-2 branch April 2, 2024 13:46
@woodruffw woodruffw mentioned this pull request Apr 3, 2024
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jku jku jku approved these changes

Assignees

@woodruffw woodruffw

Labels
component:api Public APIs component:verification Core verification functionality
Projects
None yet
Milestone
3.0
Development

Successfully merging this pull request may close these issues.

None yet
2 participants
@woodruffw @jku