[gnome-disk-utility/udisks2-port] Move crypttab dialog into separate file
- From: David Zeuthen <davidz src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-disk-utility/udisks2-port] Move crypttab dialog into separate file
- Date: Thu, 22 Sep 2011 16:58:55 +0000 (UTC)
commit d1d2048ccd2b8c2d2cb3821873f747ac09152eee
Author: David Zeuthen <davidz redhat com>
Date: Thu Sep 22 12:58:36 2011 -0400
Move crypttab dialog into separate file
Signed-off-by: David Zeuthen <davidz redhat com>
src/palimpsest/Makefile.am | 1 +
src/palimpsest/gducrypttabdialog.c | 514 ++++++++++++++++++++++++++++++++++++
src/palimpsest/gducrypttabdialog.h | 36 +++
src/palimpsest/gduwindow.c | 477 +---------------------------------
4 files changed, 552 insertions(+), 476 deletions(-)
---
diff --git a/src/palimpsest/Makefile.am b/src/palimpsest/Makefile.am
index 6250631..7b0301d 100644
--- a/src/palimpsest/Makefile.am
+++ b/src/palimpsest/Makefile.am
@@ -32,6 +32,7 @@ palimpsest_SOURCES = \
gduvolumegrid.h gduvolumegrid.c \
gduwindow.h gduwindow.c \
gduatasmartdialog.h gduatasmartdialog.c \
+ gducrypttabdialog.h gducrypttabdialog.c \
gdufstabdialog.h gdufstabdialog.c \
$(enum_built_sources) \
$(NULL)
diff --git a/src/palimpsest/gducrypttabdialog.c b/src/palimpsest/gducrypttabdialog.c
new file mode 100644
index 0000000..54da42a
--- /dev/null
+++ b/src/palimpsest/gducrypttabdialog.c
@@ -0,0 +1,514 @@
+/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*-
+ *
+ * Copyright (C) 2008-2011 Red Hat, Inc.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General
+ * Public License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
+ * Boston, MA 02111-1307, USA.
+ *
+ * Author: David Zeuthen <davidz redhat com>
+ */
+
+#include "config.h"
+
+#include <glib/gi18n.h>
+
+#include "gduapplication.h"
+#include "gduwindow.h"
+#include "gducrypttabdialog.h"
+#include "gduvolumegrid.h"
+#include "gduutils.h"
+
+/* ---------------------------------------------------------------------------------------------------- */
+
+typedef struct
+{
+ UDisksDrive *drive;
+ UDisksBlock *block;
+
+ GduWindow *window;
+
+ GtkBuilder *builder;
+ GtkWidget *dialog;
+ GtkWidget *configure_checkbutton;
+ GtkWidget *table;
+
+ GtkWidget *name_entry;
+ GtkWidget *options_entry;
+ GtkWidget *passphrase_label;
+ GtkWidget *passphrase_entry;
+ GtkWidget *show_passphrase_checkbutton;
+ GtkWidget *passphrase_path_value_label;
+
+ GVariant *orig_crypttab_entry;
+} CrypttabDialogData;
+
+static void
+crypttab_dialog_free (CrypttabDialogData *data)
+{
+ g_object_unref (data->window);
+
+ if (data->orig_crypttab_entry != NULL)
+ g_variant_unref (data->orig_crypttab_entry);
+
+ if (data->dialog != NULL)
+ {
+ gtk_widget_hide (data->dialog);
+ gtk_widget_destroy (data->dialog);
+ }
+ g_object_unref (data->builder);
+ g_free (data);
+}
+
+static void
+crypttab_dialog_update (CrypttabDialogData *data)
+{
+ gboolean ui_configured;
+ const gchar *ui_name;
+ const gchar *ui_options;
+ const gchar *ui_passphrase_contents;
+ gboolean configured;
+ const gchar *name;
+ const gchar *passphrase_path;
+ const gchar *passphrase_contents;
+ const gchar *options;
+ gboolean can_apply;
+ gchar *s;
+
+ if (data->orig_crypttab_entry != NULL)
+ {
+ configured = TRUE;
+ g_variant_lookup (data->orig_crypttab_entry, "name", "^&ay", &name);
+ g_variant_lookup (data->orig_crypttab_entry, "options", "^&ay", &options);
+ g_variant_lookup (data->orig_crypttab_entry, "passphrase-path", "^&ay", &passphrase_path);
+ if (!g_variant_lookup (data->orig_crypttab_entry, "passphrase-contents", "^&ay", &passphrase_contents))
+ passphrase_contents = "";
+ }
+ else
+ {
+ configured = FALSE;
+ name = "";
+ options = "";
+ passphrase_path = "";
+ passphrase_contents = "";
+ }
+
+ ui_configured = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (data->configure_checkbutton));
+ ui_name = gtk_entry_get_text (GTK_ENTRY (data->name_entry));
+ ui_options = gtk_entry_get_text (GTK_ENTRY (data->options_entry));
+ ui_passphrase_contents = gtk_entry_get_text (GTK_ENTRY (data->passphrase_entry));
+
+ if (!configured)
+ {
+ if (strlen (ui_passphrase_contents) > 0)
+ s = g_strdup_printf ("<i>%s</i>", _("Will be created"));
+ else
+ s = g_strdup_printf ("<i>%s</i>", _("None"));
+ }
+ else
+ {
+ if (g_str_has_prefix (passphrase_path, "/dev"))
+ {
+ /* if using a random source (for e.g. setting up swap), don't offer to edit the passphrase */
+ gtk_widget_hide (data->passphrase_label);
+ gtk_widget_hide (data->passphrase_entry);
+ gtk_widget_hide (data->show_passphrase_checkbutton);
+ gtk_widget_set_no_show_all (data->passphrase_label, TRUE);
+ gtk_widget_set_no_show_all (data->passphrase_entry, TRUE);
+ gtk_widget_set_no_show_all (data->show_passphrase_checkbutton, TRUE);
+ s = g_strdup (passphrase_path);
+ }
+ else if (strlen (ui_passphrase_contents) > 0)
+ {
+ if (strlen (passphrase_path) == 0)
+ s = g_strdup_printf ("<i>%s</i>", _("Will be created"));
+ else
+ s = g_strdup (passphrase_path);
+ }
+ else
+ {
+ if (strlen (passphrase_path) == 0)
+ s = g_strdup_printf ("<i>%s</i>", _("None"));
+ else
+ s = g_strdup_printf ("<i>%s</i>", _("Will be deleted"));
+ }
+ }
+ gtk_label_set_markup (GTK_LABEL (data->passphrase_path_value_label), s);
+ g_free (s);
+
+ can_apply = FALSE;
+ if (configured != ui_configured)
+ {
+ can_apply = TRUE;
+ }
+ else if (ui_configured)
+ {
+ if (g_strcmp0 (ui_name, name) != 0 ||
+ g_strcmp0 (ui_options, options) != 0 ||
+ g_strcmp0 (ui_passphrase_contents, passphrase_contents) != 0)
+ {
+ can_apply = TRUE;
+ }
+ }
+
+ gtk_dialog_set_response_sensitive (GTK_DIALOG (data->dialog),
+ GTK_RESPONSE_APPLY,
+ can_apply);
+}
+
+static void
+crypttab_dialog_property_changed (GObject *object,
+ GParamSpec *pspec,
+ gpointer user_data)
+{
+ CrypttabDialogData *data = user_data;
+ crypttab_dialog_update (data);
+}
+
+
+static void
+crypttab_dialog_present (CrypttabDialogData *data)
+{
+ gboolean configured;
+ gchar *name;
+ const gchar *options;
+ const gchar *passphrase_contents;
+ gint response;
+
+ if (data->orig_crypttab_entry != NULL)
+ {
+ configured = TRUE;
+ g_variant_lookup (data->orig_crypttab_entry, "name", "^ay", &name);
+ g_variant_lookup (data->orig_crypttab_entry, "options", "^&ay", &options);
+ if (!g_variant_lookup (data->orig_crypttab_entry, "passphrase-contents", "^&ay", &passphrase_contents))
+ passphrase_contents = "";
+ }
+ else
+ {
+ configured = FALSE;
+ name = g_strdup_printf ("luks-%s", udisks_block_get_id_uuid (data->block));
+ options = "";
+ /* propose noauto if the media is removable - otherwise e.g. systemd will time out at boot */
+ if (data->drive != NULL && gdu_utils_drive_treat_as_removable (data->drive, data->block))
+ options = "noauto";
+ passphrase_contents = "";
+ }
+ gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (data->configure_checkbutton), configured);
+ gtk_entry_set_text (GTK_ENTRY (data->name_entry), name);
+ gtk_entry_set_text (GTK_ENTRY (data->options_entry), options);
+ gtk_entry_set_text (GTK_ENTRY (data->passphrase_entry), passphrase_contents);
+
+ g_object_bind_property (data->show_passphrase_checkbutton,
+ "active",
+ data->passphrase_entry,
+ "visibility",
+ G_BINDING_SYNC_CREATE);
+
+ g_object_bind_property (data->configure_checkbutton,
+ "active",
+ data->table,
+ "sensitive",
+ G_BINDING_SYNC_CREATE);
+
+ g_signal_connect (data->configure_checkbutton,
+ "notify::active", G_CALLBACK (crypttab_dialog_property_changed), data);
+ g_signal_connect (data->name_entry,
+ "notify::text", G_CALLBACK (crypttab_dialog_property_changed), data);
+ g_signal_connect (data->options_entry,
+ "notify::text", G_CALLBACK (crypttab_dialog_property_changed), data);
+ g_signal_connect (data->passphrase_entry,
+ "notify::text", G_CALLBACK (crypttab_dialog_property_changed), data);
+
+ gtk_widget_show_all (data->dialog);
+
+ crypttab_dialog_update (data);
+
+ response = gtk_dialog_run (GTK_DIALOG (data->dialog));
+
+ if (response == GTK_RESPONSE_APPLY)
+ {
+ gboolean ui_configured;
+ const gchar *ui_name;
+ const gchar *ui_options;
+ const gchar *ui_passphrase_contents;
+ const gchar *old_passphrase_path;
+ GError *error;
+ GVariant *old_item;
+ GVariant *new_item;
+
+ ui_configured = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (data->configure_checkbutton));
+ ui_name = gtk_entry_get_text (GTK_ENTRY (data->name_entry));
+ ui_options = gtk_entry_get_text (GTK_ENTRY (data->options_entry));
+ ui_passphrase_contents = gtk_entry_get_text (GTK_ENTRY (data->passphrase_entry));
+
+ gtk_widget_hide (data->dialog);
+
+ old_item = NULL;
+ new_item = NULL;
+
+ old_passphrase_path = NULL;
+ if (data->orig_crypttab_entry != NULL)
+ {
+ const gchar *s;
+ if (g_variant_lookup (data->orig_crypttab_entry, "passphrase-path", "^&ay", &s))
+ {
+ if (strlen (s) > 0 && !g_str_has_prefix (s, "/dev"))
+ old_passphrase_path = s;
+ }
+ error = NULL;
+ old_item = g_variant_new ("(s a{sv})", "crypttab",
+ data->orig_crypttab_entry);
+ }
+
+ if (ui_configured)
+ {
+ GVariantBuilder builder;
+ gchar *s;
+ g_variant_builder_init (&builder, G_VARIANT_TYPE_VARDICT);
+ s = g_strdup_printf ("UUID=%s", udisks_block_get_id_uuid (data->block));
+ g_variant_builder_add (&builder, "{sv}", "device", g_variant_new_bytestring (s));
+ g_free (s);
+ g_variant_builder_add (&builder, "{sv}", "name", g_variant_new_bytestring (ui_name));
+ g_variant_builder_add (&builder, "{sv}", "options", g_variant_new_bytestring (ui_options));
+ if (strlen (ui_passphrase_contents) > 0)
+ {
+ /* use old/existing passphrase file, if available */
+ if (old_passphrase_path != NULL)
+ {
+ g_variant_builder_add (&builder, "{sv}", "passphrase-path",
+ g_variant_new_bytestring (old_passphrase_path));
+ }
+ else
+ {
+ /* otherwise fall back to the requested name */
+ s = g_strdup_printf ("/etc/luks-keys/%s", ui_name);
+ g_variant_builder_add (&builder, "{sv}", "passphrase-path", g_variant_new_bytestring (s));
+ g_free (s);
+ }
+ g_variant_builder_add (&builder, "{sv}", "passphrase-contents",
+ g_variant_new_bytestring (ui_passphrase_contents));
+
+ }
+ else
+ {
+ g_variant_builder_add (&builder, "{sv}", "passphrase-path",
+ g_variant_new_bytestring (""));
+ g_variant_builder_add (&builder, "{sv}", "passphrase-contents",
+ g_variant_new_bytestring (""));
+ }
+
+ new_item = g_variant_new ("(sa{sv})", "crypttab", &builder);
+ }
+
+ if (old_item != NULL && new_item == NULL)
+ {
+ error = NULL;
+ if (!udisks_block_call_remove_configuration_item_sync (data->block,
+ old_item,
+ g_variant_new ("a{sv}", NULL), /* options */
+ NULL, /* GCancellable */
+ &error))
+ {
+ gdu_window_show_error (data->window,
+ _("Error removing /etc/crypttab entry"),
+ error);
+ g_error_free (error);
+ goto out;
+ }
+ }
+ else if (old_item == NULL && new_item != NULL)
+ {
+ error = NULL;
+ if (!udisks_block_call_add_configuration_item_sync (data->block,
+ new_item,
+ g_variant_new ("a{sv}", NULL), /* options */
+ NULL, /* GCancellable */
+ &error))
+ {
+ gdu_window_show_error (data->window,
+ _("Error adding /etc/crypttab entry"),
+ error);
+ g_error_free (error);
+ goto out;
+ }
+ }
+ else if (old_item != NULL && new_item != NULL)
+ {
+ error = NULL;
+ if (!udisks_block_call_update_configuration_item_sync (data->block,
+ old_item,
+ new_item,
+ g_variant_new ("a{sv}", NULL), /* options */
+ NULL, /* GCancellable */
+ &error))
+ {
+ gdu_window_show_error (data->window,
+ _("Error updating /etc/crypttab entry"),
+ error);
+ g_error_free (error);
+ goto out;
+ }
+ }
+ else
+ {
+ g_assert_not_reached ();
+ }
+ }
+
+ out:
+ crypttab_dialog_free (data);
+ g_free (name);
+}
+
+static void
+crypttab_dialog_on_get_secrets_cb (UDisksBlock *block,
+ GAsyncResult *res,
+ gpointer user_data)
+{
+ CrypttabDialogData *data = user_data;
+ GError *error;
+ GVariant *configuration;
+ GVariantIter iter;
+ const gchar *configuration_type;
+ GVariant *configuration_dict;
+
+ configuration = NULL;
+ error = NULL;
+ if (!udisks_block_call_get_secret_configuration_finish (block,
+ &configuration,
+ res,
+ &error))
+ {
+ gdu_window_show_error (data->window,
+ _("Error retrieving configuration data"),
+ error);
+ g_error_free (error);
+ crypttab_dialog_free (data);
+ goto out;
+ }
+
+ /* there could be multiple crypttab entries - we only consider the first one */
+ g_variant_iter_init (&iter, configuration);
+ while (g_variant_iter_next (&iter, "(&s a{sv})", &configuration_type, &configuration_dict))
+ {
+ if (g_strcmp0 (configuration_type, "crypttab") == 0)
+ {
+ if (data->orig_crypttab_entry != NULL)
+ g_variant_unref (data->orig_crypttab_entry);
+ data->orig_crypttab_entry = configuration_dict;
+ break;
+ }
+ else
+ {
+ g_variant_unref (configuration_dict);
+ }
+ }
+ g_variant_unref (configuration);
+
+ crypttab_dialog_present (data);
+
+ out:
+ ;
+}
+
+void
+gdu_crypttab_dialog_show (GduWindow *window,
+ UDisksObject *object)
+{
+ UDisksObject *drive_object;
+ GtkWidget *dialog;
+ CrypttabDialogData *data;
+ GVariantIter iter;
+ const gchar *configuration_type;
+ GVariant *configuration_dict;
+ gboolean configured;
+ gboolean get_passphrase_contents;
+
+ data = g_new0 (CrypttabDialogData, 1);
+ data->window = g_object_ref (window);
+
+ data->block = udisks_object_peek_block (object);
+ g_assert (data->block != NULL);
+
+ data->drive = NULL;
+ drive_object = (UDisksObject *) g_dbus_object_manager_get_object (udisks_client_get_object_manager (gdu_window_get_client (window)),
+ udisks_block_get_drive (data->block));
+ if (drive_object != NULL)
+ {
+ data->drive = udisks_object_peek_drive (drive_object);
+ g_object_unref (drive_object);
+ }
+
+ dialog = gdu_application_new_widget (gdu_window_get_application (window),
+ "edit-crypttab-dialog.ui",
+ "crypttab-dialog",
+ &data->builder);
+ gtk_window_set_transient_for (GTK_WINDOW (dialog), GTK_WINDOW (window));
+ gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_OK);
+
+ data->dialog = dialog;
+ data->configure_checkbutton = GTK_WIDGET (gtk_builder_get_object (data->builder, "crypttab-configure-checkbutton"));
+ data->table = GTK_WIDGET (gtk_builder_get_object (data->builder, "crypttab-table"));
+ data->name_entry = GTK_WIDGET (gtk_builder_get_object (data->builder, "crypttab-name-entry"));
+ data->options_entry = GTK_WIDGET (gtk_builder_get_object (data->builder, "crypttab-options-entry"));
+ data->passphrase_label = GTK_WIDGET (gtk_builder_get_object (data->builder, "crypttab-passphrase-label"));
+ data->passphrase_entry = GTK_WIDGET (gtk_builder_get_object (data->builder, "crypttab-passphrase-entry"));
+ data->show_passphrase_checkbutton = GTK_WIDGET (gtk_builder_get_object (data->builder, "crypttab-show-passphrase-checkbutton"));
+ data->passphrase_path_value_label = GTK_WIDGET (gtk_builder_get_object (data->builder, "crypttab-passphrase-path-value-label"));
+
+ /* First check if there's an existing configuration */
+ configured = FALSE;
+ get_passphrase_contents = FALSE;
+ g_variant_iter_init (&iter, udisks_block_get_configuration (data->block));
+ while (g_variant_iter_next (&iter, "(&s a{sv})", &configuration_type, &configuration_dict))
+ {
+ if (g_strcmp0 (configuration_type, "crypttab") == 0)
+ {
+ const gchar *passphrase_path;
+ configured = TRUE;
+ g_variant_lookup (configuration_dict, "passphrase-path", "^&ay", &passphrase_path);
+ if (g_strcmp0 (passphrase_path, "") != 0)
+ {
+ /* fetch contents of passphrase file, if it exists (unless special file) */
+ if (!g_str_has_prefix (passphrase_path, "/dev"))
+ {
+ get_passphrase_contents = TRUE;
+ }
+ }
+ data->orig_crypttab_entry = configuration_dict;
+ break;
+ }
+ else
+ {
+ g_variant_unref (configuration_dict);
+ }
+ }
+
+ /* if there is an existing configuration and it has a passphrase, get the actual passphrase
+ * as well (involves polkit dialog)
+ */
+ if (configured && get_passphrase_contents)
+ {
+ udisks_block_call_get_secret_configuration (data->block,
+ g_variant_new ("a{sv}", NULL), /* options */
+ NULL, /* cancellable */
+ (GAsyncReadyCallback) crypttab_dialog_on_get_secrets_cb,
+ data);
+ }
+ else
+ {
+ /* otherwise just set up the dialog */
+ crypttab_dialog_present (data);
+ }
+}
diff --git a/src/palimpsest/gducrypttabdialog.h b/src/palimpsest/gducrypttabdialog.h
new file mode 100644
index 0000000..701ed8c
--- /dev/null
+++ b/src/palimpsest/gducrypttabdialog.h
@@ -0,0 +1,36 @@
+/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*-
+ *
+ * Copyright (C) 2008-2011 Red Hat, Inc.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General
+ * Public License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
+ * Boston, MA 02111-1307, USA.
+ *
+ * Author: David Zeuthen <davidz redhat com>
+ */
+
+#ifndef __GDU_CRYPTTAB_DIALOG_H_H__
+#define __GDU_CRYPTTAB_DIALOG_H_H__
+
+#include <gtk/gtk.h>
+#include "gdutypes.h"
+
+G_BEGIN_DECLS
+
+void gdu_crypttab_dialog_show (GduWindow *window,
+ UDisksObject *object);
+
+G_END_DECLS
+
+#endif /* __GDU_CRYPTTAB_DIALOG_H__ */
diff --git a/src/palimpsest/gduwindow.c b/src/palimpsest/gduwindow.c
index 6c8763b..129ad9f 100644
--- a/src/palimpsest/gduwindow.c
+++ b/src/palimpsest/gduwindow.c
@@ -2357,492 +2357,17 @@ on_generic_menu_item_view_smart (GtkMenuItem *menu_item,
gdu_ata_smart_dialog_show (window, window->current_object);
}
-/* ---------------------------------------------------------------------------------------------------- */
-
-typedef struct
-{
- UDisksDrive *drive;
- UDisksBlock *block;
-
- GduWindow *window;
-
- GtkBuilder *builder;
- GtkWidget *dialog;
- GtkWidget *configure_checkbutton;
- GtkWidget *table;
-
- GtkWidget *name_entry;
- GtkWidget *options_entry;
- GtkWidget *passphrase_label;
- GtkWidget *passphrase_entry;
- GtkWidget *show_passphrase_checkbutton;
- GtkWidget *passphrase_path_value_label;
-
- GVariant *orig_crypttab_entry;
-} CrypttabDialogData;
-
-static void
-crypttab_dialog_free (CrypttabDialogData *data)
-{
- g_object_unref (data->window);
-
- if (data->orig_crypttab_entry != NULL)
- g_variant_unref (data->orig_crypttab_entry);
-
- if (data->dialog != NULL)
- {
- gtk_widget_hide (data->dialog);
- gtk_widget_destroy (data->dialog);
- }
- g_object_unref (data->builder);
- g_free (data);
-}
-
-static void
-crypttab_dialog_update (CrypttabDialogData *data)
-{
- gboolean ui_configured;
- const gchar *ui_name;
- const gchar *ui_options;
- const gchar *ui_passphrase_contents;
- gboolean configured;
- const gchar *name;
- const gchar *passphrase_path;
- const gchar *passphrase_contents;
- const gchar *options;
- gboolean can_apply;
- gchar *s;
-
- if (data->orig_crypttab_entry != NULL)
- {
- configured = TRUE;
- g_variant_lookup (data->orig_crypttab_entry, "name", "^&ay", &name);
- g_variant_lookup (data->orig_crypttab_entry, "options", "^&ay", &options);
- g_variant_lookup (data->orig_crypttab_entry, "passphrase-path", "^&ay", &passphrase_path);
- if (!g_variant_lookup (data->orig_crypttab_entry, "passphrase-contents", "^&ay", &passphrase_contents))
- passphrase_contents = "";
- }
- else
- {
- configured = FALSE;
- name = "";
- options = "";
- passphrase_path = "";
- passphrase_contents = "";
- }
-
- ui_configured = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (data->configure_checkbutton));
- ui_name = gtk_entry_get_text (GTK_ENTRY (data->name_entry));
- ui_options = gtk_entry_get_text (GTK_ENTRY (data->options_entry));
- ui_passphrase_contents = gtk_entry_get_text (GTK_ENTRY (data->passphrase_entry));
-
- if (!configured)
- {
- if (strlen (ui_passphrase_contents) > 0)
- s = g_strdup_printf ("<i>%s</i>", _("Will be created"));
- else
- s = g_strdup_printf ("<i>%s</i>", _("None"));
- }
- else
- {
- if (g_str_has_prefix (passphrase_path, "/dev"))
- {
- /* if using a random source (for e.g. setting up swap), don't offer to edit the passphrase */
- gtk_widget_hide (data->passphrase_label);
- gtk_widget_hide (data->passphrase_entry);
- gtk_widget_hide (data->show_passphrase_checkbutton);
- gtk_widget_set_no_show_all (data->passphrase_label, TRUE);
- gtk_widget_set_no_show_all (data->passphrase_entry, TRUE);
- gtk_widget_set_no_show_all (data->show_passphrase_checkbutton, TRUE);
- s = g_strdup (passphrase_path);
- }
- else if (strlen (ui_passphrase_contents) > 0)
- {
- if (strlen (passphrase_path) == 0)
- s = g_strdup_printf ("<i>%s</i>", _("Will be created"));
- else
- s = g_strdup (passphrase_path);
- }
- else
- {
- if (strlen (passphrase_path) == 0)
- s = g_strdup_printf ("<i>%s</i>", _("None"));
- else
- s = g_strdup_printf ("<i>%s</i>", _("Will be deleted"));
- }
- }
- gtk_label_set_markup (GTK_LABEL (data->passphrase_path_value_label), s);
- g_free (s);
-
- can_apply = FALSE;
- if (configured != ui_configured)
- {
- can_apply = TRUE;
- }
- else if (ui_configured)
- {
- if (g_strcmp0 (ui_name, name) != 0 ||
- g_strcmp0 (ui_options, options) != 0 ||
- g_strcmp0 (ui_passphrase_contents, passphrase_contents) != 0)
- {
- can_apply = TRUE;
- }
- }
-
- gtk_dialog_set_response_sensitive (GTK_DIALOG (data->dialog),
- GTK_RESPONSE_APPLY,
- can_apply);
-}
-
-static void
-crypttab_dialog_property_changed (GObject *object,
- GParamSpec *pspec,
- gpointer user_data)
-{
- CrypttabDialogData *data = user_data;
- crypttab_dialog_update (data);
-}
-
-
-static void
-crypttab_dialog_present (CrypttabDialogData *data)
-{
- gboolean configured;
- gchar *name;
- const gchar *options;
- const gchar *passphrase_contents;
- gint response;
-
- if (data->orig_crypttab_entry != NULL)
- {
- configured = TRUE;
- g_variant_lookup (data->orig_crypttab_entry, "name", "^ay", &name);
- g_variant_lookup (data->orig_crypttab_entry, "options", "^&ay", &options);
- if (!g_variant_lookup (data->orig_crypttab_entry, "passphrase-contents", "^&ay", &passphrase_contents))
- passphrase_contents = "";
- }
- else
- {
- configured = FALSE;
- name = g_strdup_printf ("luks-%s", udisks_block_get_id_uuid (data->block));
- options = "";
- /* propose noauto if the media is removable - otherwise e.g. systemd will time out at boot */
- if (data->drive != NULL && gdu_utils_drive_treat_as_removable (data->drive, data->block))
- options = "noauto";
- passphrase_contents = "";
- }
- gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (data->configure_checkbutton), configured);
- gtk_entry_set_text (GTK_ENTRY (data->name_entry), name);
- gtk_entry_set_text (GTK_ENTRY (data->options_entry), options);
- gtk_entry_set_text (GTK_ENTRY (data->passphrase_entry), passphrase_contents);
-
- g_object_bind_property (data->show_passphrase_checkbutton,
- "active",
- data->passphrase_entry,
- "visibility",
- G_BINDING_SYNC_CREATE);
-
- g_object_bind_property (data->configure_checkbutton,
- "active",
- data->table,
- "sensitive",
- G_BINDING_SYNC_CREATE);
-
- g_signal_connect (data->configure_checkbutton,
- "notify::active", G_CALLBACK (crypttab_dialog_property_changed), data);
- g_signal_connect (data->name_entry,
- "notify::text", G_CALLBACK (crypttab_dialog_property_changed), data);
- g_signal_connect (data->options_entry,
- "notify::text", G_CALLBACK (crypttab_dialog_property_changed), data);
- g_signal_connect (data->passphrase_entry,
- "notify::text", G_CALLBACK (crypttab_dialog_property_changed), data);
-
- gtk_widget_show_all (data->dialog);
-
- crypttab_dialog_update (data);
-
- response = gtk_dialog_run (GTK_DIALOG (data->dialog));
-
- if (response == GTK_RESPONSE_APPLY)
- {
- gboolean ui_configured;
- const gchar *ui_name;
- const gchar *ui_options;
- const gchar *ui_passphrase_contents;
- const gchar *old_passphrase_path;
- GError *error;
- GVariant *old_item;
- GVariant *new_item;
-
- ui_configured = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (data->configure_checkbutton));
- ui_name = gtk_entry_get_text (GTK_ENTRY (data->name_entry));
- ui_options = gtk_entry_get_text (GTK_ENTRY (data->options_entry));
- ui_passphrase_contents = gtk_entry_get_text (GTK_ENTRY (data->passphrase_entry));
-
- gtk_widget_hide (data->dialog);
-
- old_item = NULL;
- new_item = NULL;
-
- old_passphrase_path = NULL;
- if (data->orig_crypttab_entry != NULL)
- {
- const gchar *s;
- if (g_variant_lookup (data->orig_crypttab_entry, "passphrase-path", "^&ay", &s))
- {
- if (strlen (s) > 0 && !g_str_has_prefix (s, "/dev"))
- old_passphrase_path = s;
- }
- error = NULL;
- old_item = g_variant_new ("(s a{sv})", "crypttab",
- data->orig_crypttab_entry);
- }
-
- if (ui_configured)
- {
- GVariantBuilder builder;
- gchar *s;
- g_variant_builder_init (&builder, G_VARIANT_TYPE_VARDICT);
- s = g_strdup_printf ("UUID=%s", udisks_block_get_id_uuid (data->block));
- g_variant_builder_add (&builder, "{sv}", "device", g_variant_new_bytestring (s));
- g_free (s);
- g_variant_builder_add (&builder, "{sv}", "name", g_variant_new_bytestring (ui_name));
- g_variant_builder_add (&builder, "{sv}", "options", g_variant_new_bytestring (ui_options));
- if (strlen (ui_passphrase_contents) > 0)
- {
- /* use old/existing passphrase file, if available */
- if (old_passphrase_path != NULL)
- {
- g_variant_builder_add (&builder, "{sv}", "passphrase-path",
- g_variant_new_bytestring (old_passphrase_path));
- }
- else
- {
- /* otherwise fall back to the requested name */
- s = g_strdup_printf ("/etc/luks-keys/%s", ui_name);
- g_variant_builder_add (&builder, "{sv}", "passphrase-path", g_variant_new_bytestring (s));
- g_free (s);
- }
- g_variant_builder_add (&builder, "{sv}", "passphrase-contents",
- g_variant_new_bytestring (ui_passphrase_contents));
-
- }
- else
- {
- g_variant_builder_add (&builder, "{sv}", "passphrase-path",
- g_variant_new_bytestring (""));
- g_variant_builder_add (&builder, "{sv}", "passphrase-contents",
- g_variant_new_bytestring (""));
- }
-
- new_item = g_variant_new ("(sa{sv})", "crypttab", &builder);
- }
-
- if (old_item != NULL && new_item == NULL)
- {
- error = NULL;
- if (!udisks_block_call_remove_configuration_item_sync (data->block,
- old_item,
- g_variant_new ("a{sv}", NULL), /* options */
- NULL, /* GCancellable */
- &error))
- {
- gdu_window_show_error (data->window,
- _("Error removing /etc/crypttab entry"),
- error);
- g_error_free (error);
- goto out;
- }
- }
- else if (old_item == NULL && new_item != NULL)
- {
- error = NULL;
- if (!udisks_block_call_add_configuration_item_sync (data->block,
- new_item,
- g_variant_new ("a{sv}", NULL), /* options */
- NULL, /* GCancellable */
- &error))
- {
- gdu_window_show_error (data->window,
- _("Error adding /etc/crypttab entry"),
- error);
- g_error_free (error);
- goto out;
- }
- }
- else if (old_item != NULL && new_item != NULL)
- {
- error = NULL;
- if (!udisks_block_call_update_configuration_item_sync (data->block,
- old_item,
- new_item,
- g_variant_new ("a{sv}", NULL), /* options */
- NULL, /* GCancellable */
- &error))
- {
- gdu_window_show_error (data->window,
- _("Error updating /etc/crypttab entry"),
- error);
- g_error_free (error);
- goto out;
- }
- }
- else
- {
- g_assert_not_reached ();
- }
- }
-
- out:
- crypttab_dialog_free (data);
- g_free (name);
-}
-
-static void
-crypttab_dialog_on_get_secrets_cb (UDisksBlock *block,
- GAsyncResult *res,
- gpointer user_data)
-{
- CrypttabDialogData *data = user_data;
- GError *error;
- GVariant *configuration;
- GVariantIter iter;
- const gchar *configuration_type;
- GVariant *configuration_dict;
-
- configuration = NULL;
- error = NULL;
- if (!udisks_block_call_get_secret_configuration_finish (block,
- &configuration,
- res,
- &error))
- {
- gdu_window_show_error (data->window,
- _("Error retrieving configuration data"),
- error);
- g_error_free (error);
- crypttab_dialog_free (data);
- goto out;
- }
-
- /* there could be multiple crypttab entries - we only consider the first one */
- g_variant_iter_init (&iter, configuration);
- while (g_variant_iter_next (&iter, "(&s a{sv})", &configuration_type, &configuration_dict))
- {
- if (g_strcmp0 (configuration_type, "crypttab") == 0)
- {
- if (data->orig_crypttab_entry != NULL)
- g_variant_unref (data->orig_crypttab_entry);
- data->orig_crypttab_entry = configuration_dict;
- break;
- }
- else
- {
- g_variant_unref (configuration_dict);
- }
- }
- g_variant_unref (configuration);
-
- crypttab_dialog_present (data);
-
- out:
- ;
-}
-
static void
on_generic_menu_item_configure_crypttab (GtkMenuItem *menu_item,
gpointer user_data)
{
GduWindow *window = GDU_WINDOW (user_data);
UDisksObject *object;
- UDisksObject *drive_object;
- GtkWidget *dialog;
- CrypttabDialogData *data;
- GVariantIter iter;
- const gchar *configuration_type;
- GVariant *configuration_dict;
- gboolean configured;
- gboolean get_passphrase_contents;
-
- data = g_new0 (CrypttabDialogData, 1);
- data->window = g_object_ref (window);
object = gdu_volume_grid_get_selected_device (GDU_VOLUME_GRID (window->volume_grid));
if (object == NULL)
object = gdu_volume_grid_get_block_object (GDU_VOLUME_GRID (window->volume_grid));
- data->block = udisks_object_peek_block (object);
- g_assert (data->block != NULL);
-
- data->drive = NULL;
- drive_object = (UDisksObject *) g_dbus_object_manager_get_object (udisks_client_get_object_manager (window->client),
- udisks_block_get_drive (data->block));
- if (drive_object != NULL)
- {
- data->drive = udisks_object_peek_drive (drive_object);
- g_object_unref (drive_object);
- }
-
- dialog = gdu_application_new_widget (window->application,
- "edit-crypttab-dialog.ui",
- "crypttab-dialog",
- &data->builder);
- gtk_window_set_transient_for (GTK_WINDOW (dialog), GTK_WINDOW (window));
- gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_OK);
-
- data->dialog = dialog;
- data->configure_checkbutton = GTK_WIDGET (gtk_builder_get_object (data->builder, "crypttab-configure-checkbutton"));
- data->table = GTK_WIDGET (gtk_builder_get_object (data->builder, "crypttab-table"));
- data->name_entry = GTK_WIDGET (gtk_builder_get_object (data->builder, "crypttab-name-entry"));
- data->options_entry = GTK_WIDGET (gtk_builder_get_object (data->builder, "crypttab-options-entry"));
- data->passphrase_label = GTK_WIDGET (gtk_builder_get_object (data->builder, "crypttab-passphrase-label"));
- data->passphrase_entry = GTK_WIDGET (gtk_builder_get_object (data->builder, "crypttab-passphrase-entry"));
- data->show_passphrase_checkbutton = GTK_WIDGET (gtk_builder_get_object (data->builder, "crypttab-show-passphrase-checkbutton"));
- data->passphrase_path_value_label = GTK_WIDGET (gtk_builder_get_object (data->builder, "crypttab-passphrase-path-value-label"));
-
- /* First check if there's an existing configuration */
- configured = FALSE;
- get_passphrase_contents = FALSE;
- g_variant_iter_init (&iter, udisks_block_get_configuration (data->block));
- while (g_variant_iter_next (&iter, "(&s a{sv})", &configuration_type, &configuration_dict))
- {
- if (g_strcmp0 (configuration_type, "crypttab") == 0)
- {
- const gchar *passphrase_path;
- configured = TRUE;
- g_variant_lookup (configuration_dict, "passphrase-path", "^&ay", &passphrase_path);
- if (g_strcmp0 (passphrase_path, "") != 0)
- {
- /* fetch contents of passphrase file, if it exists (unless special file) */
- if (!g_str_has_prefix (passphrase_path, "/dev"))
- {
- get_passphrase_contents = TRUE;
- }
- }
- data->orig_crypttab_entry = configuration_dict;
- break;
- }
- else
- {
- g_variant_unref (configuration_dict);
- }
- }
-
- /* if there is an existing configuration and it has a passphrase, get the actual passphrase
- * as well (involves polkit dialog)
- */
- if (configured && get_passphrase_contents)
- {
- udisks_block_call_get_secret_configuration (data->block,
- g_variant_new ("a{sv}", NULL), /* options */
- NULL, /* cancellable */
- (GAsyncReadyCallback) crypttab_dialog_on_get_secrets_cb,
- data);
- }
- else
- {
- /* otherwise just set up the dialog */
- crypttab_dialog_present (data);
- }
+ gdu_crypttab_dialog_show (window, object);
}
/* ---------------------------------------------------------------------------------------------------- */
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
