Attachment 105297 Details for Bug 83075 – Updated patch

[patch] Updated patch

0001-add-allow-untrusted-option.patch (text/plain), 5.24 KB, created by Michael Vogt on 2014-08-26 17:27:43 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Michael Vogt

Created: 2014-08-26 17:27:43 UTC

Size: 5.24 KB

patch

obsolete

>From e1245608e673252b40a63f6ff7d6abde7d7fea75 Mon Sep 17 00:00:00 2001
>From: Michael Vogt <mvo@debian.org>
>Date: Tue, 26 Aug 2014 10:25:58 -0700
>Subject: [PATCH] add --allow-untrusted option
>
>---
> client/pk-console.c            |  5 ++++
> client/pkcon.xml               |  4 +++
> lib/packagekit-glib2/pk-task.c | 58 +++++++++++++++++++++++++++++++++++++++++-
> 3 files changed, 66 insertions(+), 1 deletion(-)
>
>diff --git a/client/pk-console.c b/client/pk-console.c
>index 6197312..d36293e 100644
>--- a/client/pk-console.c
>+++ b/client/pk-console.c
>@@ -1851,6 +1851,7 @@ main (int argc, char *argv[])
> 	guint cache_age = G_MAXUINT;
> 	gint retval_copy = 0;
> 	gboolean plain = FALSE;
>+	gboolean allow_untrusted = FALSE;
> 	gboolean program_version = FALSE;
> 	gboolean run_mainloop = TRUE;
> 	GOptionContext *context;
>@@ -1886,6 +1887,9 @@ main (int argc, char *argv[])
> 		{ "cache-age", 'c', 0, G_OPTION_ARG_INT, &cache_age,
> 			/* TRANSLATORS: command line argument, just output without fancy formatting */
> 			_("The maximum metadata cache age. Use -1 for 'never'."), NULL},
>+		{ "allow-untrusted", '\0', 0, G_OPTION_ARG_NONE, &allow_untrusted,
>+			/* command line argument, do we ask questions */
>+			_("Allow untrusted packages to be installed."), NULL },
> 		{ NULL}
> 	};
> 
>@@ -1974,6 +1978,7 @@ main (int argc, char *argv[])
> 		      "interactive", !noninteractive,
> 		      "only-download", only_download,
> 		      "cache-age", cache_age,
>+		      "only-trusted", !allow_untrusted,
> 		      NULL);
> 
> 	/* set the proxy */
>diff --git a/client/pkcon.xml b/client/pkcon.xml
>index 193563b..27dcc15 100644
>--- a/client/pkcon.xml
>+++ b/client/pkcon.xml
>@@ -275,6 +275,10 @@ manpage.1: manpage.xml
>         <term>-c, --cache-age <replaceable>AGE</replaceable></term>
>         <listitem><para>Set the maximum acceptable age for cached metadata, in seconds. Use -1 for 'never'.</para></listitem>
>       </varlistentry>
>+      <varlistentry>
>+        <term>--allow-untrusted</term>
>+        <listitem><para>Allow untrusted packages to be installed.</para></listitem>
>+      </varlistentry>
>     </variablelist>
>   </refsect1>
>   <refsect1>
>diff --git a/lib/packagekit-glib2/pk-task.c b/lib/packagekit-glib2/pk-task.c
>index d81944d..d1f7531 100644
>--- a/lib/packagekit-glib2/pk-task.c
>+++ b/lib/packagekit-glib2/pk-task.c
>@@ -50,12 +50,14 @@ struct _PkTaskPrivate
> 	GPtrArray			*array;
> 	gboolean			 simulate;
> 	gboolean			 only_download;
>+	gboolean			 only_trusted;
> };
> 
> enum {
> 	PROP_0,
> 	PROP_SIMULATE,
> 	PROP_ONLY_PREPARE,
>+	PROP_ONLY_TRUSTED,
> 	PROP_LAST
> };
> 
>@@ -1250,7 +1252,10 @@ pk_task_install_files_async (PkTask *task, gchar **files, GCancellable *cancella
> 	state->task = g_object_ref (task);
> 	if (cancellable != NULL)
> 		state->cancellable = g_object_ref (cancellable);
>-	state->transaction_flags = pk_bitfield_value (PK_TRANSACTION_FLAG_ENUM_ONLY_TRUSTED);
>+	if (task->priv->only_trusted)
>+		state->transaction_flags = pk_bitfield_value (PK_TRANSACTION_FLAG_ENUM_ONLY_TRUSTED);
>+	else
>+		state->transaction_flags = 0;
> 	state->files = g_strdupv (files);
> 	state->progress_callback = progress_callback;
> 	state->progress_user_data = progress_user_data;
>@@ -2362,6 +2367,42 @@ pk_task_get_only_download (PkTask *task)
> 	return task->priv->only_download;
> }
> 
>+
>+/**
>+ * pk_task_set_only_trusted:
>+ * @task: a valid #PkTask instance
>+ * @only_trusted: %TRUE to allow only authenticated packages
>+ *
>+ * If only authenticated packages should be allowed in the
>+ * transaction.
>+ *
>+ * Since: 0.9.5
>+ **/
>+void
>+pk_task_set_only_trusted (PkTask *task, gboolean only_trusted)
>+{
>+	g_return_if_fail (PK_IS_TASK (task));
>+	task->priv->only_trusted = only_trusted;
>+	g_object_notify (G_OBJECT (task), "only-download");
>+}
>+
>+/**
>+ * pk_task_get_only_trusted:
>+ * @task: a valid #PkTask instance
>+ *
>+ * Gets if we allow only authenticated packages in the transactoin.
>+ *
>+ * Return value: %TRUE if we allow only authenticated packages
>+ *
>+ * Since: 0.9.5
>+ **/
>+gboolean
>+pk_task_get_only_trusted (PkTask *task)
>+{
>+	g_return_val_if_fail (PK_IS_TASK (task), FALSE);
>+	return task->priv->only_trusted;
>+}
>+
> /**
>  * pk_task_get_property:
>  **/
>@@ -2378,6 +2419,9 @@ pk_task_get_property (GObject *object, guint prop_id, GValue *value, GParamSpec
> 	case PROP_ONLY_PREPARE:
> 		g_value_set_boolean (value, priv->only_download);
> 		break;
>+	case PROP_ONLY_TRUSTED:
>+		g_value_set_boolean (value, priv->only_trusted);
>+		break;
> 	default:
> 		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
> 		break;
>@@ -2400,6 +2444,9 @@ pk_task_set_property (GObject *object, guint prop_id, const GValue *value, GPara
> 	case PROP_ONLY_PREPARE:
> 		priv->only_download = g_value_get_boolean (value);
> 		break;
>+	case PROP_ONLY_TRUSTED:
>+		priv->only_trusted = g_value_get_boolean (value);
>+		break;
> 	default:
> 		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
> 		break;
>@@ -2438,6 +2485,15 @@ pk_task_class_init (PkTaskClass *klass)
> 				      G_PARAM_READWRITE);
> 	g_object_class_install_property (object_class, PROP_ONLY_PREPARE, pspec);
> 
>+	/**
>+	 * PkTask:only-trusted:
>+	 *
>+	 * Since: 0.9.5
>+	 */
>+	pspec = g_param_spec_boolean ("only-trusted", NULL, NULL,
>+				      TRUE,
>+				      G_PARAM_READWRITE);
>+	g_object_class_install_property (object_class, PROP_ONLY_TRUSTED, pspec);
> 	g_type_class_add_private (klass, sizeof (PkTaskPrivate));
> }
> 
>-- 
>1.9.1
>

Actions: View | Splinter Review

Attachments on bug 83075: 105257 | 105297

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.