fix: ensure verify terminates on model validation failure (#352)

* fix: ensure verify terminates on model validation failure Signed-off-by: Janine Olear <[email protected]> * follow exit suggestions Signed-off-by: Janine Olear <[email protected]> * Add the proper exit code Signed-off-by: Mihai Maruseac <[email protected]> * Add the proper exit code Signed-off-by: Mihai Maruseac <[email protected]> * Add the proper exit code Signed-off-by: Mihai Maruseac <[email protected]> --------- Signed-off-by: Janine Olear <[email protected]> Signed-off-by: Mihai Maruseac <[email protected]> Co-authored-by: Mihai Maruseac <[email protected]>
sigstore · Mar 3, 2025 · 345fd2f · 345fd2f
1 parent 2b0174c
commit 345fd2f
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 6 deletions.
diff --git a/src/sign.py b/src/sign.py
@@ -17,6 +17,7 @@
 import argparse
 import logging
 import pathlib
+import sys
 
 from model_signing import model
 from model_signing.hashing import file
@@ -148,13 +149,13 @@ def _get_payload_signer(args: argparse.Namespace) -> signing.Signer:
         log.error(
             'supported methods: ["pki", "private-key", "sigstore", "skip"]'
         )
-        exit(-1)
+        sys.exit(1)
 
 
 def _check_private_key_options(args: argparse.Namespace):
     if args.key_path == "":
         log.error("--private_key must be set to a valid private key PEM file")
-        exit()
+        sys.exit(1)
 
 
 def _check_pki_options(args: argparse.Namespace):
@@ -166,7 +167,7 @@ def _check_pki_options(args: argparse.Namespace):
                 "PEM encoded signing certificate",
             )
         )
-        exit()
+        sys.exit(1)
     if args.cert_chain_path == "":
         log.warning("No certificate chain provided")
 

diff --git a/src/verify.py b/src/verify.py
@@ -119,13 +119,13 @@ def _get_verifier(args: argparse.Namespace) -> signing.Verifier:
         log.error(
             'supported methods: ["pki", "private-key", "sigstore", "skip"]'
         )
-        exit(-1)
+        sys.exit(1)
 
 
 def _check_private_key_flags(args: argparse.Namespace):
     if args.key == "":
         log.error("--public_key must be defined")
-        exit()
+        sys.exit(1)
 
 
 def _check_pki_flags(args: argparse.Namespace):
@@ -169,7 +169,7 @@ def hasher_factory(file_path: pathlib.Path) -> file.FileHasher:
         )
     except verifying.VerificationError as err:
         log.error(f"verification failed: {err}")
-        sys.exit(-1)
+        sys.exit(1)
 
     log.info("all checks passed")