Skip to content

sigstore: 0.8.1 #315

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

Merged
woodruffw merged 3 commits into from
Nov 23, 2022
Merged

sigstore: 0.8.1 #315

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5f3a3f0
workflows/release: fix missing `--cert-identity`
woodruffw Nov 23, 2022
42a6ae0
sigstore: 0.8.1
woodruffw Nov 23, 2022
fb5897a
README, cli: produce a more explicit error on `--cert-email`
woodruffw Nov 23, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion .github/workflows/release.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,8 @@ jobs:
sigstore verify "${dist}" \
--cert "smoketest-artifacts/${dist_base}.crt" \
--signature "smoketest-artifacts/${dist_base}.sig" \
--cert-oidc-issuer https://token.actions.githubusercontent.com
--cert-oidc-issuer https://token.actions.githubusercontent.com \
--cert-identity ${GITHUB_SERVER_URL}/${GITHUB_REPOSITORY}/.github/workflows/staging-tests.yml@${GITHUB_REF}

rm -rf smoketest-env
done
Expand Down
8 changes: 5 additions & 3 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -152,9 +152,9 @@ Verifying:
<!-- @begin-sigstore-verify-help@ -->
```
usage: sigstore verify [-h] [--certificate FILE] [--signature FILE]
[--rekor-bundle FILE] --cert-identity IDENTITY
--cert-oidc-issuer URL [--require-rekor-offline]
[--staging] [--rekor-url URL]
[--rekor-bundle FILE] [--cert-email EMAIL]
--cert-identity IDENTITY --cert-oidc-issuer URL
[--require-rekor-offline] [--staging] [--rekor-url URL]
FILE [FILE ...]

positional arguments:
Expand All @@ -173,6 +173,8 @@ Verification inputs:
multiple inputs (default: None)

Extended verification options:
--cert-email EMAIL Deprecated; causes an error. Use --cert-identity
instead (default: None)
--cert-identity IDENTITY
The identity to check for in the certificate's Subject
Alternative Name (default: None)
Expand Down
2 changes: 1 addition & 1 deletion sigstore/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,4 +16,4 @@
The `sigstore` APIs.
"""

__version__ = "0.8.0"
__version__ = "0.8.1"
15 changes: 15 additions & 0 deletions sigstore/_cli.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -275,6 +275,12 @@ def _parser() -> argparse.ArgumentParser:
)

verification_options = verify.add_argument_group("Extended verification options")
verification_options.add_argument(
"--cert-email",
metavar="EMAIL",
type=str,
help="Deprecated; causes an error. Use --cert-identity instead",
)
verification_options.add_argument(
"--cert-identity",
metavar="IDENTITY",
Expand Down Expand Up @@ -461,6 +467,15 @@ def _sign(args: argparse.Namespace) -> None:


def _verify(args: argparse.Namespace) -> None:
# `--cert-email` has been functionally removed, but we check for it
# explicitly to provide a nicer error message than just a missing
# option.
if args.cert_email:
args._parser.error(
"--cert-email is a disabled alias for --cert-identity; "
"use --cert-identity instead"
)

# `--rekor-bundle` is a temporary option, pending stabilization of the
# Sigstore bundle format.
if args.rekor_bundle:
Expand Down