Attachment 128229 Details for Bug 54828 – Allow binary passphrases for Block.Format

[patch] Allow binary passphrases for Block.Format

Allow-binary-passphrases-for-BlockFormat.patch (text/plain), 6.09 KB, created by Thomas Gläßle on 2016-11-27 21:40:29 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Thomas Gläßle

Created: 2016-11-27 21:40:29 UTC

Size: 6.09 KB

patch

obsolete

>From b50967fc3f7828c5ecc5de6527f48a4f73c6007f Mon Sep 17 00:00:00 2001
>From: =?UTF-8?q?Thomas=20Gl=C3=A4=C3=9Fle?= <t_glaessle@gmx.de>
>Date: Sat, 26 Nov 2016 13:52:13 +0100
>Subject: [PATCH] Allow binary passphrases for Block.Format
>
>---
> data/org.freedesktop.UDisks2.xml |  6 ++++--
> src/udiskslinuxblock.c           | 20 +++++++++++---------
> 2 files changed, 15 insertions(+), 11 deletions(-)
>
>diff --git a/data/org.freedesktop.UDisks2.xml b/data/org.freedesktop.UDisks2.xml
>index 17aae33..a3a7686 100644
>--- a/data/org.freedesktop.UDisks2.xml
>+++ b/data/org.freedesktop.UDisks2.xml
>@@ -1187,7 +1187,7 @@
>     <!--
>         Format:
>         @type: The type of file system, partition table or other content to format the device with.
>-        @options: Options - known options (in addition to <link linkend="udisks-std-options">standard options</link>) includes <parameter>label</parameter> (of type 's'), <parameter>take-ownership</parameter> (of type 'b'), <parameter>encrypt.passphrase</parameter> (of type 's'), <parameter>erase</parameter> (of type 's'), <parameter>no-block</parameter> (of type 'b') and <parameter>update-partition-type</parameter> (of type 'b').
>+        @options: Options - known options (in addition to <link linkend="udisks-std-options">standard options</link>) includes <parameter>label</parameter> (of type 's'), <parameter>take-ownership</parameter> (of type 'b'), <parameter>encrypt.passphrase</parameter> (of type 's' or 'ay'), <parameter>erase</parameter> (of type 's'), <parameter>no-block</parameter> (of type 'b') and <parameter>update-partition-type</parameter> (of type 'b').
> 
>         Formats the device with a file system, partition table or
>         other well-known content.
>@@ -1215,7 +1215,9 @@
>         If the option <parameter>encrypt.passphrase</parameter> is
>         given then a LUKS device is created with the given passphrase
>         and the file system is created on the unlocked device. The
>-        unlocked device will be left open.
>+        unlocked device will be left open. This parameter can be used
>+        to supply the binary contents of an arbitrary keyfile by passing
>+        a value of type <quote>ay/<quote>.
> 
>         If the option <parameter>erase</parameter> is used then the
>         underlying device will be erased. Valid values include
>diff --git a/src/udiskslinuxblock.c b/src/udiskslinuxblock.c
>index e266497..e6ab669 100644
>--- a/src/udiskslinuxblock.c
>+++ b/src/udiskslinuxblock.c
>@@ -2177,7 +2177,7 @@ handle_format (UDisksBlock           *block,
>   uid_t caller_uid;
>   gid_t caller_gid;
>   gboolean take_ownership = FALSE;
>-  gchar *encrypt_passphrase = NULL;
>+  GString *encrypt_passphrase = NULL;
>   gchar *erase_type = NULL;
>   gchar *mapped_name = NULL;
>   const gchar *label = NULL;
>@@ -2202,7 +2202,7 @@ handle_format (UDisksBlock           *block,
>   error_message = NULL;
> 
>   g_variant_lookup (options, "take-ownership", "b", &take_ownership);
>-  g_variant_lookup (options, "encrypt.passphrase", "s", &encrypt_passphrase);
>+  udisks_variant_lookup_binary (options, "encrypt.passphrase", &encrypt_passphrase);
>   g_variant_lookup (options, "erase", "s", &erase_type);
>   g_variant_lookup (options, "no-block", "b", &no_block);
>   g_variant_lookup (options, "update-partition-type", "b", &update_partition_type);
>@@ -2389,7 +2389,7 @@ handle_format (UDisksBlock           *block,
>   if (encrypt_passphrase != NULL)
>     {
>       /* Create it */
>-      if (!udisks_daemon_launch_spawned_job_sync (daemon,
>+      if (!udisks_daemon_launch_spawned_job_gstring_sync (daemon,
>                                                   object,
>                                                   "format-mkfs", caller_uid,
>                                                   NULL, /* cancellable */
>@@ -2398,8 +2398,9 @@ handle_format (UDisksBlock           *block,
>                                                   &status,
>                                                   &error_message,
>                                                   encrypt_passphrase, /* input_string */
>-                                                  "cryptsetup luksFormat \"%s\"",
>-                                                  escaped_device))
>+                                                  "cryptsetup luksFormat \"%s\" %s",
>+                                                  escaped_device,
>+                                                  "--key-file -"))
>         {
>           if (invocation != NULL)
>             g_dbus_method_invocation_return_error (invocation,
>@@ -2429,7 +2430,7 @@ handle_format (UDisksBlock           *block,
> 
>       /* Open it */
>       mapped_name = g_strdup_printf ("luks-%s", udisks_block_get_id_uuid (block));
>-      if (!udisks_daemon_launch_spawned_job_sync (daemon,
>+      if (!udisks_daemon_launch_spawned_job_gstring_sync (daemon,
>                                                   object,
>                                                   "format-mkfs", caller_uid,
>                                                   NULL, /* cancellable */
>@@ -2438,9 +2439,10 @@ handle_format (UDisksBlock           *block,
>                                                   &status,
>                                                   &error_message,
>                                                   encrypt_passphrase, /* input_string */
>-                                                  "cryptsetup luksOpen \"%s\" %s",
>+                                                  "cryptsetup luksOpen \"%s\" %s %s",
>                                                   escaped_device,
>-                                                  mapped_name))
>+                                                  mapped_name,
>+                                                  "--key-file -"))
>         {
>           if (invocation != NULL)
>             g_dbus_method_invocation_return_error (invocation,
>@@ -2677,7 +2679,7 @@ handle_format (UDisksBlock           *block,
>   g_free (mapped_name);
>   g_free (command);
>   g_free (erase_type);
>-  g_free (encrypt_passphrase);
>+  udisks_string_wipe_and_free (encrypt_passphrase);
>   g_clear_object (&cleartext_object);
>   g_clear_object (&cleartext_block);
>   g_clear_object (&udev_cleartext_device);
>-- 
>2.10.2

Actions: View | Splinter Review

Attachments on bug 54828: 128116 | 128117 | 128118 | 128119 | 128120 | 128121 | 128122 | 128123 | 128139 | 128228 | 128229 | 128230 | 128231

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.