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

lib/repo-pull: return error from signing engine 

Return the collected errors from signing engines in case if verification
failed for the commit.

Signed-off-by: Denis Pynkin <denis.pynkin@collabora.com>
This commit is contained in:
Denis Pynkin 2019-12-06 17:18:04 +03:00
parent dd27461e22
commit 194ab368f2
1 changed files with 18 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2005,7 +2005,7 @@ scan_commit_object (OtPullData *pull_data,
gboolean ret = FALSE; gboolean ret = FALSE;
/* list all signature types in detached metadata and check if signed by any? */ /* list all signature types in detached metadata and check if signed by any? */
g_auto (GStrv) names = ostree_sign_list_names(); g_auto (GStrv) names = ostree_sign_list_names();
for (char **iter=names; iter && *iter; iter++) for (char **iter=names; !ret && iter && *iter; iter++)
{ {
g_autoptr (OstreeSign) sign = NULL; g_autoptr (OstreeSign) sign = NULL;
g_autoptr (GError) local_error = NULL; g_autoptr (GError) local_error = NULL;
@ -2023,15 +2023,28 @@ scan_commit_object (OtPullData *pull_data,
checksum, checksum,
cancellable, cancellable,
&local_error)) &local_error))
ret = TRUE; {
ret = TRUE;
g_clear_error (error);
}
/* Save error message for better reason detection later if needed */
if (!ret)
{
if (*error == NULL)
g_propagate_error (error, g_steal_pointer (&local_error));
else
g_prefix_error (error, "%s; ", local_error->message);
}
}
}
if (!ret) if (!ret)
{ {
g_set_error_literal (error, G_IO_ERROR, G_IO_ERROR_FAILED, g_prefix_error (error, "Can't verify commit %s: ", checksum);
"Can't verify commit");
return FALSE; return FALSE;
} }
/* Clear non-fatal error */
g_clear_error (error);
} }
/* If we found a legacy transaction flag, assume we have to scan. /* If we found a legacy transaction flag, assume we have to scan.