Fix various issues (#500)

* tests: Fix several copy and paste errors in error messages

Signed-off-by: Stefan Berger <[email protected]>

* _cli: Remove type=bool from --allow_symlinks definition

With click v8.2.0, When type=bool and is_flag=True are both set, then the
--allow_symlinks option does not work properly, which fails the test case
for example. This behavior seems to be fixed in click v8.2.1. Nevertheless,
remove type=bool from the definition of the option since it doesn't seem
to be necessary.

Signed-off-by: Stefan Berger <[email protected]>

* ci: Run apt update before apt install

Run apt update before apt install to avoid issues with updated packages.

Signed-off-by: Stefan Berger <[email protected]>

---------

Signed-off-by: Stefan Berger <[email protected]>

Author: stefanberger

.github/workflows/integration.yml

@@ -49,6 +49,7 @@ jobs:
       run: |
         set -euxo pipefail
         if [[ "${{ matrix.os }}" == "ubuntu-latest" ]]; then
+          sudo apt update
           sudo apt install softhsm2 gnutls-bin
           ./scripts/pkcs11-tests/softhsm_setup setup
         fi

scripts/tests/test-sign-verify

@@ -61,7 +61,7 @@ if ! python -m model_signing \
 	--certificate_chain ./keys/certificate/int-ca-cert.pem \
 	--ignore-paths "${ignorefile}" \
 	"${TMPDIR}"; then
-	echo "Error: 'sign key' failed"
+	echo "Error: 'sign certificate' failed"
 	exit 1
 fi
 
@@ -71,7 +71,7 @@ if ! python -m model_signing \
 	--certificate_chain ./keys/certificate/ca-cert.pem \
 	--ignore-paths "${ignorefile}" \
 	"${TMPDIR}"; then
-	echo "Error: 'sign key' failed"
+	echo "Error: 'verify certificate' failed"
 	exit 1
 fi
 
@@ -134,7 +134,7 @@ if ! python -m model_signing \
 	--certificate_chain "${DIR}/keys/certificate/int-ca-cert.pem" \
 	--ignore-paths "$(basename "${ignorefile}")" \
 	. ; then
-	echo "Error: 'sign key' failed"
+	echo "Error: 'sign certificate' failed"
 	exit 1
 fi
 
@@ -144,7 +144,7 @@ if ! python -m model_signing \
 	--certificate_chain "${DIR}/keys/certificate/ca-cert.pem" \
 	--ignore-paths "$(basename "${ignorefile}")" \
 	. ; then
-	echo "Error: 'sign key' failed"
+	echo "Error: 'verify certificate' failed"
 	exit 1
 fi
 
@@ -180,7 +180,7 @@ if ! python -m model_signing \
 	--ignore-paths "../$(basename "${ignorefile}")" \
 	--allow_symlinks \
 	.. ; then
-	echo "Error: 'sign key' failed"
+	echo "Error: 'sign certificate' failed"
 	exit 1
 fi
 
@@ -193,7 +193,7 @@ if ! python -m model_signing \
 	--ignore-paths "$(basename "${ignorefile}")" \
 	--allow_symlinks \
 	. ; then
-	echo "Error: 'sign key' failed"
+	echo "Error: 'verify certificate' failed"
 	exit 1
 fi
 

src/model_signing/_cli.py

@@ -118,7 +118,6 @@
 # Decorator for the commonly used option to allow symlinks
 _allow_symlinks_option = click.option(
     "--allow_symlinks",
-    type=bool,
     is_flag=True,
     help="Whether to allow following symlinks when signing or verifying files.",
 )