cli: search for {input}.sigstore.json by default
#820
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
Signed-off-by: William Woodruff <william@trailofbits.com>
Signed-off-by: William Woodruff <william@trailofbits.com>
They can be the same if the user explicitly passes in `--bundle`. Signed-off-by: William Woodruff <william@trailofbits.com>
woodruffw
commented
Dec 4, 2023
jku
reviewed
Dec 5, 2023
There was a problem hiding this comment.
This combines two items:
- handling implicit vs explicit bundle and
- handling legacy implicit bundle vs sigstore.json implicit bundle.
There's at least one issue left from that: if an explicit bundle is used, but the file does not exist then we use legacy implicit bundle. This seems wrong.
Good catch, thanks -- that does seem wrong. I'll fix that. |
Updates the requirements on [ruff](https://github.com/astral-sh/ruff) to permit the latest version. - [Release notes](https://github.com/astral-sh/ruff/releases) - [Changelog](https://github.com/astral-sh/ruff/blob/main/CHANGELOG.md) - [Commits](astral-sh/ruff@v0.0.18...v0.1.7) --- updated-dependencies: - dependency-name: ruff dependency-type: direct:production ... Signed-off-by: dependabot[bot] <support@github.com>
Signed-off-by: William Woodruff <william@trailofbits.com>
This prevents us from accidentally falling back on the legacy implicit bundle when the user's explicitly specified `--bundle` is specified but does not exist. Signed-off-by: William Woodruff <william@trailofbits.com>
…to ww/sigstore-json
jku
approved these changes
Dec 7, 2023
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.
This tweaks the default input collection in
sigstore verify, allowing{input}.sigstore.jsonto take priority when attempting to discover "implicit" inputs.{input}.sigstoreis also still discovered, preserving compatibility with existing outputs. However, discovering it now produces a logged warning telling the user that a future release will deprecate.sigstorein favor of.sigstore.json.We also produce a hard error when both
{input}.sigstoreand{input}.sigstore.jsonare present -- this should really only happen in cases of user confusion, so we just prevent it outright.See #814.