Skip to content

Commit

Permalink
Fix more linting errors
Browse files Browse the repository at this point in the history
Signed-off-by: Ivan Font <ifont@redhat.com>
  • Loading branch information
font committed Oct 5, 2024
1 parent 5ce13a4 commit 09596b6
Show file tree
Hide file tree
Showing 2 changed files with 17 additions and 8 deletions.
12 changes: 8 additions & 4 deletions src/sign.py
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,8 @@ def _get_payload_signer(args: argparse.Namespace) -> signing.Signer:
if args.method == "private-key":
_check_private_key_options(args)
payload_signer = key.ECKeySigner.from_path(
private_key_path=args.key_path)
private_key_path=args.key_path
)
return in_toto_signature.IntotoSigner(payload_signer)
elif args.method == "pki":
_check_pki_options(args)
Expand All @@ -123,13 +124,15 @@ def _get_payload_signer(args: argparse.Namespace) -> signing.Signer:
return in_toto_signature.IntotoSigner(payload_signer)
elif args.method == "sigstore":
return sigstore.SigstoreDSSESigner(
use_ambient_credentials=args.use_ambient_credentials)
use_ambient_credentials=args.use_ambient_credentials
)
elif args.method == "skip":
return fake.FakeSigner()
else:
log.error(f"unsupported signing method {args.method}")
log.error('supported methods: ["pki", "private-key", "sigstore", '
+ '"skip"]')
log.error(
'supported methods: ["pki", "private-key", "sigstore", "skip"]'
)
exit(-1)


Expand All @@ -152,6 +155,7 @@ def _check_pki_options(args: argparse.Namespace):
if args.cert_chain_path == "":
log.warning("No certificate chain provided")


def main():
logging.basicConfig(level=logging.INFO)
args = _arguments()
Expand Down
13 changes: 9 additions & 4 deletions src/verify.py
Original file line number Diff line number Diff line change
Expand Up @@ -96,6 +96,7 @@ def _arguments() -> argparse.Namespace:

return parser.parse_args()


def _get_verifier(args: argparse.Namespace) -> signing.Verifier:
verifier: signing.Verifier
if args.method == "private-key":
Expand All @@ -107,14 +108,16 @@ def _get_verifier(args: argparse.Namespace) -> signing.Verifier:
verifier = pki.PKIVerifier.from_paths(args.root_certs)
return in_toto_signature.IntotoVerifier(verifier)
elif args.method == "sigstore":
return sigstore.SigstoreDSSEVerifier(identity=args.identity,
oidc_issuer=args.identity_provider)
return sigstore.SigstoreDSSEVerifier(
identity=args.identity, oidc_issuer=args.identity_provider
)
elif args.method == "skip":
return fake.FakeVerifier()
else:
log.error(f"unsupported verification method {args.method}")
log.error('supported methods: ["pki", "private-key", "sigstore", '
+ '"skip"]')
log.error(
'supported methods: ["pki", "private-key", "sigstore", "skip"]'
)
exit(-1)


Expand All @@ -128,12 +131,14 @@ def _check_pki_flags(args: argparse.Namespace):
if not args.root_certs:
log.warning("no root of trust is set using system default")


def _get_signature(args: argparse.Namespace) -> signing.Signature:
if args.method == "sigstore":
return sigstore.SigstoreSignature.read(args.sig_path)
else:
return in_toto_signature.IntotoSignature.read(args.sig_path)


def main():
logging.basicConfig(level=logging.INFO)
args = _arguments()
Expand Down

0 comments on commit 09596b6

Please sign in to comment.