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

lib/repo-pull: change sign supporting functions 

Change the API of supporting functions `_load_public_keys()` and
`_ostree_repo_sign_verify()` -- pass repo object and remote name
instead of OtPullData object. This allows to use these functions
not only in pull-related places.

Signed-off-by: Denis Pynkin <denis.pynkin@collabora.com>
This commit is contained in:
Denis Pynkin 2019-11-27 13:15:26 +00:00
parent 809176b1ff
commit df36984684
1 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1483,8 +1483,9 @@ process_verify_result (OtPullData *pull_data,
* Returns: %TRUE if no configuration or any key loaded. * Returns: %TRUE if no configuration or any key loaded.
* */ * */
static gboolean static gboolean
_load_public_keys (OtPullData *pull_data, _load_public_keys (OstreeSign *sign,
OstreeSign *sign) OstreeRepo *repo,
const gchar *remote_name)
{ {
g_autofree gchar *pk_ascii = NULL; g_autofree gchar *pk_ascii = NULL;
@ -1493,13 +1494,13 @@ _load_public_keys (OtPullData *pull_data,
gboolean loaded_inlined = TRUE; gboolean loaded_inlined = TRUE;
g_autoptr (GError) error = NULL; g_autoptr (GError) error = NULL;
ostree_repo_get_remote_option (pull_data->repo, ostree_repo_get_remote_option (repo,
pull_data->remote_name, remote_name,
"verification-file", NULL, "verification-file", NULL,
&pk_file, NULL); &pk_file, NULL);
ostree_repo_get_remote_option (pull_data->repo, ostree_repo_get_remote_option (repo,
pull_data->remote_name, remote_name,
"verification-key", NULL, "verification-key", NULL,
&pk_ascii, NULL); &pk_ascii, NULL);
@ -1565,7 +1566,8 @@ _load_public_keys (OtPullData *pull_data,
} }
static gboolean static gboolean
_ostree_repo_sign_verify (OtPullData *pull_data, _ostree_repo_sign_verify (OstreeRepo *repo,
const gchar *remote_name,
GBytes *signed_data, GBytes *signed_data,
GVariant *metadata) GVariant *metadata)
{ {
@ -1594,7 +1596,7 @@ _ostree_repo_sign_verify (OtPullData *pull_data,
continue; continue;
/* Try to load public key(s) according remote's configuration */ /* Try to load public key(s) according remote's configuration */
if (!_load_public_keys (pull_data, sign)) if (!_load_public_keys (sign, repo, remote_name))
continue; continue;
/* Return true if any signature fit to pre-loaded public keys. /* Return true if any signature fit to pre-loaded public keys.
@ -1656,7 +1658,7 @@ ostree_verify_unwritten_commit (OtPullData *pull_data,
return FALSE; return FALSE;
} }
if (!_ostree_repo_sign_verify (pull_data, signed_data, detached_metadata)) if (!_ostree_repo_sign_verify (pull_data->repo, pull_data->remote_name, signed_data, detached_metadata))
{ {
g_set_error_literal (error, G_IO_ERROR, G_IO_ERROR_FAILED, g_set_error_literal (error, G_IO_ERROR, G_IO_ERROR_FAILED,
"Can't verify commit"); "Can't verify commit");
@ -2012,7 +2014,7 @@ scan_commit_object (OtPullData *pull_data,
continue; continue;
/* Try to load public key(s) according remote's configuration */ /* Try to load public key(s) according remote's configuration */
if (!_load_public_keys (pull_data, sign)) if (!_load_public_keys (sign, pull_data->repo, pull_data->remote_name))
continue; continue;
/* Set return to true if any sign fit */ /* Set return to true if any sign fit */
@ -4406,7 +4408,7 @@ ostree_repo_pull_with_options (OstreeRepo *self,
bytes_sig, FALSE); bytes_sig, FALSE);
if (!_ostree_repo_sign_verify (pull_data, bytes_summary, signatures)) if (!_ostree_repo_sign_verify (pull_data->repo, pull_data->remote_name, bytes_summary, signatures))
{ {
gboolean ret = FALSE; gboolean ret = FALSE;
@ -4437,7 +4439,7 @@ ostree_repo_pull_with_options (OstreeRepo *self,
cancellable, error)) cancellable, error))
goto out; goto out;
if (_ostree_repo_sign_verify (pull_data, bytes_summary, signatures)) if (_ostree_repo_sign_verify (pull_data->repo, pull_data->remote_name, bytes_summary, signatures))
ret = TRUE; ret = TRUE;
} }