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

ostree_repo_remote_fetch_summary: honor gpg-verify-summary 

Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
This commit is contained in:
Giuseppe Scrivano 2015-06-24 14:19:34 +02:00
parent 0bd10eb6e2
commit 3737b9851a
1 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/libostree/ostree-repo.c
View File

@ -1804,6 +1804,7 @@ ostree_repo_remote_fetch_summary (OstreeRepo *self,
g_autoptr(GBytes) summary = NULL; g_autoptr(GBytes) summary = NULL;
g_autoptr(GBytes) signatures = NULL; g_autoptr(GBytes) signatures = NULL;
gboolean ret = FALSE; gboolean ret = FALSE;
gboolean gpg_verify_summary;
g_return_val_if_fail (OSTREE_REPO (self), FALSE); g_return_val_if_fail (OSTREE_REPO (self), FALSE);
g_return_val_if_fail (name != NULL, FALSE); g_return_val_if_fail (name != NULL, FALSE);
@ -1832,8 +1833,18 @@ ostree_repo_remote_fetch_summary (OstreeRepo *self,
goto out; goto out;
} }
if (!ostree_repo_remote_get_gpg_verify_summary (self, name, &gpg_verify_summary, error))
goto out;
if (gpg_verify_summary && signatures == NULL)
{
g_set_error (error, G_IO_ERROR, G_IO_ERROR_FAILED,
"GPG verification enabled, but no summary signatures found (use gpg-verify-summary=false in remote config to disable)");
goto out;
}
/* Verify any summary signatures. */ /* Verify any summary signatures. */
if (summary != NULL && signatures != NULL) if (gpg_verify_summary && summary != NULL && signatures != NULL)
{ {
glnx_unref_object OstreeGpgVerifyResult *result = NULL; glnx_unref_object OstreeGpgVerifyResult *result = NULL;
g_autoptr(GVariant) signatures_variant = NULL; g_autoptr(GVariant) signatures_variant = NULL;