bin/pull-local: add --sign-verify-summary

Add option for enabling summary file verification while pulling from local.

Signed-off-by: Denis Pynkin <denis.pynkin@collabora.com>
This commit is contained in:
Denis Pynkin 2019-11-27 16:46:24 +03:00
parent b97ab81bab
commit 8b3b35a04a
1 changed files with 5 additions and 0 deletions

View File

@ -40,6 +40,7 @@ static gboolean opt_require_static_deltas;
static gboolean opt_gpg_verify; static gboolean opt_gpg_verify;
static gboolean opt_gpg_verify_summary; static gboolean opt_gpg_verify_summary;
static gboolean opt_sign_verify; static gboolean opt_sign_verify;
static gboolean opt_sign_verify_summary;
static int opt_depth = 0; static int opt_depth = 0;
/* ATTENTION: /* ATTENTION:
@ -57,6 +58,7 @@ static GOptionEntry options[] = {
{ "gpg-verify", 0, 0, G_OPTION_ARG_NONE, &opt_gpg_verify, "GPG verify commits (must specify --remote)", NULL }, { "gpg-verify", 0, 0, G_OPTION_ARG_NONE, &opt_gpg_verify, "GPG verify commits (must specify --remote)", NULL },
{ "gpg-verify-summary", 0, 0, G_OPTION_ARG_NONE, &opt_gpg_verify_summary, "GPG verify summary (must specify --remote)", NULL }, { "gpg-verify-summary", 0, 0, G_OPTION_ARG_NONE, &opt_gpg_verify_summary, "GPG verify summary (must specify --remote)", NULL },
{ "sign-verify", 0, 0, G_OPTION_ARG_NONE, &opt_sign_verify, "Verify commits signature (must specify --remote)", NULL }, { "sign-verify", 0, 0, G_OPTION_ARG_NONE, &opt_sign_verify, "Verify commits signature (must specify --remote)", NULL },
{ "sign-verify-summary", 0, 0, G_OPTION_ARG_NONE, &opt_sign_verify, "Verify summary signature (must specify --remote)", NULL },
{ "depth", 0, 0, G_OPTION_ARG_INT, &opt_depth, "Traverse DEPTH parents (-1=infinite) (default: 0)", "DEPTH" }, { "depth", 0, 0, G_OPTION_ARG_INT, &opt_depth, "Traverse DEPTH parents (-1=infinite) (default: 0)", "DEPTH" },
{ NULL } { NULL }
}; };
@ -187,6 +189,9 @@ ostree_builtin_pull_local (int argc, char **argv, OstreeCommandInvocation *invoc
if (opt_sign_verify) if (opt_sign_verify)
g_variant_builder_add (&builder, "{s@v}", "sign-verify", g_variant_builder_add (&builder, "{s@v}", "sign-verify",
g_variant_new_variant (g_variant_new_boolean (TRUE))); g_variant_new_variant (g_variant_new_boolean (TRUE)));
if (opt_sign_verify_summary)
g_variant_builder_add (&builder, "{s@v}", "sign-verify-summary",
g_variant_new_variant (g_variant_new_boolean (TRUE)));
if (console.is_tty) if (console.is_tty)
progress = ostree_async_progress_new_and_connect (ostree_repo_pull_default_console_progress_changed, &console); progress = ostree_async_progress_new_and_connect (ostree_repo_pull_default_console_progress_changed, &console);