packaging
/
ostree
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #2058 from cgwalters/signing-cleanups 

pull: Update key loading function to match error style
This commit is contained in:
OpenShift Merge Robot 2020-04-07 20:49:04 +02:00 committed by GitHub
parent e88835e29d 47539874b8
commit 8baee5cd04
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/libostree/ostree-repo-pull.c
View File

@ -1488,14 +1488,10 @@ _load_public_keys (OstreeSign *sign,
const gchar *remote_name,
GError **error)
{
g_autofree gchar *pk_ascii = NULL;
g_autofree gchar *pk_file = NULL;
gboolean loaded_from_file = TRUE;
gboolean loaded_inlined = TRUE;
g_autoptr (GError) verification_error = NULL;
glnx_throw (&verification_error, "no public keys loaded");
ostree_repo_get_remote_option (repo,
remote_name,
@ -1536,10 +1532,8 @@ _load_public_keys (OstreeSign *sign,
loaded_from_file = TRUE;
else
{
g_debug("Unable to load public keys for '%s' from file '%s': %s",
ostree_sign_get_name(sign), pk_file, local_error->message);
/* Save error message for better reason detection later if needed */
glnx_prefix_error (&verification_error, "%s", local_error->message);
return glnx_throw (error, "Failed loading '%s' keys from '%s",
ostree_sign_get_name (sign), pk_file);
}
}
@ -1556,19 +1550,16 @@ _load_public_keys (OstreeSign *sign,
if (!loaded_inlined)
{
g_debug("Unable to load public key '%s' for '%s': %s",
pk_ascii, ostree_sign_get_name (sign), local_error->message);
/* Save error message for better reason detection later if needed */
glnx_prefix_error (&verification_error, "%s", local_error->message);
return glnx_throw (error, "Failed loading '%s' keys from inline `verification-key`",
ostree_sign_get_name (sign));
}
}
/* Return true if able to load from any source */
if (loaded_from_file || loaded_inlined)
return TRUE;
if (!(loaded_from_file || loaded_inlined))
return glnx_throw (error, "No keys found");
return glnx_throw (error, "%s", verification_error->message);
return TRUE;
}
static gboolean

1
tests/test-signed-pull.sh
View File

@ -93,6 +93,7 @@ echo "ok pull failure with incorrect keys file option"
# Test with correct dummy key
${CMD_PREFIX} ostree --repo=repo config set 'remote "origin"'.verification-key "${DUMMYSIGN}"
${CMD_PREFIX} ostree --repo=repo config unset 'remote "origin"'.verification-file
test_signed_pull "dummy" ""
if ! has_libsodium; then