GNOME.org
 

[seahorse-nautilus] Use GcrPrompt for prompting

commit ff0c38ae75d14ae1df4c00e0c604cb2bd0a24f93
Author: Stef Walter <stefw gnome org>
Date:   Fri Jun 29 08:35:02 2012 +0200

    Use GcrPrompt for prompting
    
     * Now depends on gcr 3.4.0 or later

 configure.ac                  |    7 +
 tool/Makefile.am              |    5 +-
 tool/seahorse-passphrase.c    |  387 ++++++++--------------------------------
 tool/seahorse-passphrase.h    |    4 -
 tool/seahorse-secure-buffer.c |  196 ---------------------
 tool/seahorse-secure-buffer.h |   57 ------
 tool/seahorse-secure-memory.c |  128 --------------
 tool/seahorse-secure-memory.h |   39 ----
 tool/seahorse-tool.c          |    3 -
 9 files changed, 87 insertions(+), 739 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index a2c0b96..8ddd4ec 100644
--- a/configure.ac
+++ b/configure.ac
@@ -178,6 +178,13 @@ SEAHORSE_CFLAGS="$SEAHORSE_CFLAGS $LIBCRYPTUI_CFLAGS"
 SEAHORSE_LIBS="$SEAHORSE_LIBS $LIBCRYPTUI_LIBS"
 
 # -----------------------------------------------------------------------------
+# Gcr
+
+PKG_CHECK_MODULES(GCR, gcr-3 > 3.4.0)
+SEAHORSE_CFLAGS="$SEAHORSE_CFLAGS $GCR_CFLAGS"
+SEAHORSE_LIBS="$SEAHORSE_LIBS $GCR_LIBS"
+
+# -----------------------------------------------------------------------------
 # Libnotify
 
 LIBNOTIFY_REQUIRED=0.3
diff --git a/tool/Makefile.am b/tool/Makefile.am
index ae79697..4047e94 100644
--- a/tool/Makefile.am
+++ b/tool/Makefile.am
@@ -8,7 +8,8 @@ INCLUDES = -I$(top_builddir) \
 	-DLOCALEDIR=\"$(localedir)\" \
 	-DDATA_DIR=\""$(datadir)"\" \
 	-DSEAHORSE_UIDIR=\""$(uidir)"\" \
-	-DLIBCRYPTUI_API_SUBJECT_TO_CHANGE
+	-DLIBCRYPTUI_API_SUBJECT_TO_CHANGE \
+	-DGCR_API_SUBJECT_TO_CHANGE
 
 bin_PROGRAMS = seahorse-tool
 
@@ -22,8 +23,6 @@ seahorse_tool_SOURCES = \
 	seahorse-passphrase.c seahorse-passphrase.h \
 	seahorse-pgp-operation.c seahorse-pgp-operation.h \
 	seahorse-progress.c seahorse-progress.h \
-	seahorse-secure-buffer.c seahorse-secure-buffer.h \
-	seahorse-secure-memory.c seahorse-secure-memory.h \
 	seahorse-tool.c seahorse-tool.h \
 	seahorse-tool-files.c \
 	seahorse-tool-progress.c \
diff --git a/tool/seahorse-passphrase.c b/tool/seahorse-passphrase.c
index e2decbf..ffb44ec 100644
--- a/tool/seahorse-passphrase.c
+++ b/tool/seahorse-passphrase.c
@@ -3,6 +3,7 @@
  *
  * Copyright (C) 2003 Jacob Perkins
  * Copyright (C) 2004 - 2006 Stefan Walter
+ * Copyright (C) 2012 Red Hat
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -21,35 +22,14 @@
  */
 
 #include "config.h"
-#include <sys/types.h>
-#include <sys/param.h>
-#include <sys/signal.h>
-#include <sys/socket.h>
-#include <sys/un.h>
-#include <sys/wait.h>
-
-#include <signal.h>
-#include <stddef.h>
-#include <stdlib.h>
-#include <stdio.h>
-#include <err.h>
-#include <unistd.h>
-#include <syslog.h>
-#include <fcntl.h>
+
+#include "seahorse-passphrase.h"
+#include "seahorse-util.h"
 
 #include <glib/gi18n.h>
-#include <gtk/gtk.h>
-#include <gdk/gdkkeysyms.h>
-#if GTK_CHECK_VERSION (2,90,0)
-#include <gdk/gdkkeysyms-compat.h>
-#endif
-#include <gpgme.h>
 
-#include "seahorse-libdialogs.h"
-#include "seahorse-widget.h"
-#include "seahorse-util.h"
-#include "seahorse-passphrase.h"
-#include "seahorse-secure-buffer.h"
+#include <gcr/gcr.h>
+#include <gpgme.h>
 
 #define HIG_SMALL      6        /* gnome hig small space in pixels */
 #define HIG_LARGE     12        /* gnome hig large space in pixels */
@@ -77,313 +57,102 @@ utf8_validate (const gchar *text)
     return result;
 }
 
-static gboolean
-key_press (GtkWidget *widget, GdkEventKey *event, gpointer data)
-{
-    /* Close the dialog when hitting "Esc". */
-    if (event->keyval == GDK_Escape)
-    {
-        gtk_dialog_response(GTK_DIALOG (widget), GTK_RESPONSE_REJECT);
-        return TRUE;
-    }
-
-    return FALSE;
-}
+typedef struct {
+	GAsyncResult *result;
+	GMainLoop *loop;
+} SyncClosure;
 
-static gboolean
-grab_keyboard (GtkWidget *win, GdkEvent *event, gpointer data)
-{
-#ifndef _DEBUG
-	GdkGrabStatus status;
-	if (!g_object_get_data (G_OBJECT (win), "keyboard-grabbed")) {
-		status = gdk_keyboard_grab (gtk_widget_get_window (win), FALSE, gdk_event_get_time (event));
-		if (status == GDK_GRAB_SUCCESS)
-			g_object_set_data (G_OBJECT (win), "keyboard-grabbed", GINT_TO_POINTER (TRUE));
-		else
-			g_message ("could not grab keyboard: %d", (int)status);
-	}
-#endif
-	return FALSE;
-}
-
-/* ungrab_keyboard - remove grab */
-static gboolean
-ungrab_keyboard (GtkWidget *win, GdkEvent *event, gpointer data)
-{
-#ifndef _DEBUG
-	if (g_object_get_data (G_OBJECT (win), "keyboard-grabbed"))
-		gdk_keyboard_ungrab (gdk_event_get_time (event));
-	g_object_set_data (G_OBJECT (win), "keyboard-grabbed", NULL);
-#endif
-	return FALSE;
-}
-
-/* When enter is pressed in the confirm entry, move */
 static void
-confirm_callback (GtkWidget *widget, GtkDialog *dialog)
+on_sync_complete (GObject *source,
+                  GAsyncResult *result,
+                  gpointer user_data)
 {
-    GtkWidget *entry = GTK_WIDGET (g_object_get_data (G_OBJECT (dialog), "secure-entry"));
-    g_assert (GTK_IS_ENTRY (entry));
-    gtk_widget_grab_focus (entry);
+	SyncClosure *sync = user_data;
+	sync->result = g_object_ref (result);
+	g_main_loop_quit (sync->loop);
 }
 
-/* When enter is pressed in the entry, we simulate an ok */
-static void
-enter_callback (GtkWidget *widget, GtkDialog *dialog)
-{
-    gtk_dialog_response (dialog, GTK_RESPONSE_ACCEPT);
-}
-
-static void
-entry_changed (GtkEditable *editable, GtkDialog *dialog)
+gpgme_error_t
+seahorse_passphrase_get (gconstpointer dummy, const gchar *passphrase_hint,
+                         const char* passphrase_info, int flags, int fd)
 {
-    GtkEntry *entry, *confirm;
+	gchar **split_uid = NULL;
+	gchar *label = NULL;
+	gchar *errmsg = NULL;
+	const gchar *pass;
+	GcrPrompt *prompt;
+	SyncClosure sync;
+	GError *error = NULL;
+	gchar *msg;
 
-    entry = GTK_ENTRY (g_object_get_data (G_OBJECT (dialog), "secure-entry"));
-    confirm = GTK_ENTRY (g_object_get_data (G_OBJECT (dialog), "confirm-entry"));
+	sync.result = NULL;
+	sync.loop = g_main_loop_new (NULL, FALSE);
 
-    gtk_dialog_set_response_sensitive (dialog, GTK_RESPONSE_ACCEPT,
-                                       strcmp (gtk_entry_get_text (entry),
-                                               gtk_entry_get_text (confirm)) == 0);
-}
-
-static gboolean
-window_state_changed (GtkWidget *win, GdkEventWindowState *event, gpointer data)
-{
-	GdkWindowState state = gdk_window_get_state (gtk_widget_get_window (win));
+	gcr_system_prompt_open_async (-1, NULL, on_sync_complete, &sync);
 
-	if (state & GDK_WINDOW_STATE_WITHDRAWN ||
-	    state & GDK_WINDOW_STATE_ICONIFIED ||
-	    state & GDK_WINDOW_STATE_FULLSCREEN ||
-	    state & GDK_WINDOW_STATE_MAXIMIZED)
-	    	ungrab_keyboard (win, (GdkEvent*)event, data);
-	else
-		grab_keyboard (win, (GdkEvent*)event, data);
+	g_main_loop_run (sync.loop);
+	g_assert (sync.result != NULL);
 
-	return FALSE;
-}
-
-static void
-constrain_size (GtkWidget *win, GtkRequisition *req, gpointer data)
-{
-    static gint width, height;
-    GdkGeometry geo;
-
-    if (req->width == width && req->height == height)
-        return;
-
-    width = req->width;
-    height = req->height;
-    geo.min_width = width;
-    geo.max_width = 10000;  /* limit is arbitrary, INT_MAX breaks other things */
-    geo.min_height = geo.max_height = height;
-    gtk_window_set_geometry_hints (GTK_WINDOW (win), NULL, &geo,
-                                   GDK_HINT_MIN_SIZE | GDK_HINT_MAX_SIZE);
-}
+	prompt = gcr_system_prompt_open_finish (sync.result, &error);
 
-GtkDialog*
-seahorse_passphrase_prompt_show (const gchar *title, const gchar *description,
-                                 const gchar *prompt, const gchar *check,
-                                 gboolean confirm)
-{
-    GtkEntryBuffer *buffer;
-    GtkEntry *entry;
-    GtkDialog *dialog;
-    GtkWidget *w;
-    GtkWidget *box;
-    GtkTable *table;
-    GtkWidget *wvbox;
-    GtkWidget *chbox;
-    gchar *msg;
-
-    if (!title)
-        title = _("Passphrase");
-
-    if (!prompt)
-        prompt = _("Password:");
-
-    w = gtk_dialog_new_with_buttons (title, NULL, 0, NULL);
-    gtk_window_set_icon_name (GTK_WINDOW (w), GTK_STOCK_DIALOG_AUTHENTICATION);
-
-    dialog = GTK_DIALOG (w);
-
-    g_signal_connect (G_OBJECT (dialog), "size-request", G_CALLBACK (constrain_size), NULL);
-    g_signal_connect_after (G_OBJECT (dialog), "map-event", G_CALLBACK (grab_keyboard), NULL);
-    g_signal_connect (G_OBJECT (dialog), "unmap-event", G_CALLBACK (ungrab_keyboard), NULL);
-    g_signal_connect (G_OBJECT (dialog), "window-state-event", G_CALLBACK (window_state_changed), NULL);
-
-    wvbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, HIG_LARGE * 2);
-    gtk_container_add (GTK_CONTAINER (gtk_dialog_get_content_area (dialog)), wvbox);
-    gtk_container_set_border_width (GTK_CONTAINER (wvbox), HIG_LARGE);
-
-    chbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, HIG_LARGE);
-    gtk_box_pack_start (GTK_BOX (wvbox), chbox, FALSE, FALSE, 0);
-
-    /* The image */
-    w = gtk_image_new_from_stock (GTK_STOCK_DIALOG_AUTHENTICATION, GTK_ICON_SIZE_DIALOG);
-    gtk_misc_set_alignment (GTK_MISC (w), 0.0, 0.0);
-    gtk_box_pack_start (GTK_BOX (chbox), w, FALSE, FALSE, 0);
-
-    box = gtk_box_new (GTK_ORIENTATION_VERTICAL, HIG_SMALL);
-    gtk_box_pack_start (GTK_BOX (chbox), box, TRUE, TRUE, 0);
-
-    /* The description text */
-    if (description) {
-        msg = utf8_validate (description);
-        w = gtk_label_new (msg);
-        g_free (msg);
-
-        gtk_misc_set_alignment (GTK_MISC (w), 0.0, 0.5);
-        gtk_label_set_line_wrap (GTK_LABEL (w), TRUE);
-        gtk_box_pack_start (GTK_BOX (box), w, TRUE, FALSE, 0);
-    }
+	g_main_loop_unref (sync.loop);
+	g_object_unref (sync.result);
 
-    /* Two entries (usually on is hidden)  in a vbox */
-    table = GTK_TABLE (gtk_table_new (3, 2, FALSE));
-    gtk_table_set_row_spacings (table, HIG_SMALL);
-    gtk_table_set_col_spacings (table, HIG_LARGE);
-    gtk_box_pack_start (GTK_BOX (box), GTK_WIDGET (table), FALSE, FALSE, 0);
-
-    /* The first entry if we have one */
-    if (confirm) {
-        msg = utf8_validate (prompt);
-        w = gtk_label_new (msg);
-        g_free (msg);
-        gtk_table_attach (table, w, 0, 1, 0, 1, GTK_FILL, 0, 0, 0);
-
-        buffer = seahorse_secure_buffer_new ();
-        entry = GTK_ENTRY (gtk_entry_new_with_buffer (buffer));
-        gtk_entry_set_visibility (entry, FALSE);
-        g_object_unref (buffer);
-        gtk_widget_set_size_request (GTK_WIDGET (entry), 200, -1);
-        g_object_set_data (G_OBJECT (dialog), "confirm-entry", entry);
-        g_signal_connect (G_OBJECT (entry), "activate", G_CALLBACK (confirm_callback), dialog);
-        g_signal_connect (G_OBJECT (entry), "changed", G_CALLBACK (entry_changed), dialog);
-        gtk_table_attach_defaults (table, GTK_WIDGET (entry), 1, 2, 0, 1);
-        gtk_widget_grab_focus (GTK_WIDGET (entry));
-    }
+	if (error != NULL) {
+		g_message ("Couldn't open system prompt: %s", error->message);
+		g_error_free (error);
+		return gpgme_error (GPG_ERR_CANCELED);
+	}
 
-    /* The second and main entry */
-    msg = utf8_validate (confirm ? _("Confirm:") : prompt);
-    w = gtk_label_new (msg);
-    g_free (msg);
-    gtk_table_attach (table, w, 0, 1, 1, 2, GTK_FILL, 0, 0, 0);
-
-    buffer = seahorse_secure_buffer_new ();
-    entry = GTK_ENTRY (gtk_entry_new_with_buffer (buffer));
-    gtk_entry_set_visibility (entry, FALSE);
-    g_object_unref (buffer);
-    gtk_widget_set_size_request (GTK_WIDGET (entry), 200, -1);
-    g_object_set_data (G_OBJECT (dialog), "secure-entry", entry);
-    g_signal_connect (G_OBJECT (entry), "activate", G_CALLBACK (enter_callback), dialog);
-    gtk_table_attach_defaults (table, GTK_WIDGET (entry), 1, 2, 1, 2);
-    if (!confirm)
-        gtk_widget_grab_focus (GTK_WIDGET (entry));
-    else
-        g_signal_connect (G_OBJECT (entry), "changed", G_CALLBACK (entry_changed), dialog);
-
-    /* The checkbox */
-    if (check) {
-        w = gtk_check_button_new_with_mnemonic (check);
-        gtk_table_attach_defaults (table, w, 1, 2, 2, 3);
-        g_object_set_data (G_OBJECT (dialog), "check-option", w);
-    }
+	if (passphrase_info && strlen(passphrase_info) < 16)
+		flags |= SEAHORSE_PASS_NEW;
 
-    gtk_widget_show_all (GTK_WIDGET (table));
+	if (passphrase_hint)
+		split_uid = g_strsplit (passphrase_hint, " ", 2);
 
-    w = gtk_button_new_from_stock (GTK_STOCK_CANCEL);
-    gtk_dialog_add_action_widget (dialog, w, GTK_RESPONSE_REJECT);
-    gtk_widget_set_can_default (w, TRUE);
+	if (flags & SEAHORSE_PASS_BAD)
+		errmsg = g_strdup_printf (_("Wrong passphrase."));
 
-    w = gtk_button_new_from_stock (GTK_STOCK_OK);
-    gtk_dialog_add_action_widget (dialog, w, GTK_RESPONSE_ACCEPT);
-    gtk_widget_set_can_default (w, TRUE);
-    g_signal_connect_object (G_OBJECT (entry), "focus_in_event",
-                             G_CALLBACK (gtk_widget_grab_default), G_OBJECT (w), 0);
-    gtk_widget_grab_default (w);
+	if (split_uid && split_uid[0] && split_uid[1]) {
+		if (flags & SEAHORSE_PASS_NEW)
+			label = g_strdup_printf (_("Enter new passphrase for '%s'"), split_uid[1]);
+		else
+			label = g_strdup_printf (_("Enter passphrase for '%s'"), split_uid[1]);
+	} else {
+		if (flags & SEAHORSE_PASS_NEW)
+			label = g_strdup (_("Enter new passphrase"));
+		else
+			label = g_strdup (_("Enter passphrase"));
+	}
 
-    g_signal_connect (dialog, "key_press_event", G_CALLBACK (key_press), NULL);
+	g_strfreev (split_uid);
 
-    gtk_window_set_position (GTK_WINDOW (dialog), GTK_WIN_POS_CENTER);
-    gtk_window_set_resizable (GTK_WINDOW (dialog), FALSE);
-    gtk_window_set_type_hint (GTK_WINDOW (dialog), GDK_WINDOW_TYPE_HINT_NORMAL);
-    gtk_window_set_keep_above (GTK_WINDOW (dialog), TRUE);
-    gtk_widget_show_all (GTK_WIDGET (dialog));
-    gdk_window_focus (gtk_widget_get_window (GTK_WIDGET (dialog)), GDK_CURRENT_TIME);
+	gcr_prompt_set_message (prompt, _("Passphrase"));
 
-    if (confirm)
-        entry_changed (NULL, dialog);
+	msg = utf8_validate (errmsg ? errmsg : label);
+	gcr_prompt_set_description (prompt, msg);
+	g_free (msg);
 
-    return dialog;
-}
+	gcr_prompt_set_password_new (prompt, flags & SEAHORSE_PASS_NEW);
 
-const gchar*
-seahorse_passphrase_prompt_get (GtkDialog *dialog)
-{
-    GtkEntry *entry;
+	gcr_prompt_set_continue_label (prompt, _("Ok"));
+	gcr_prompt_set_cancel_label (prompt, _("Cancel"));
 
-    entry = GTK_ENTRY (g_object_get_data (G_OBJECT (dialog), "secure-entry"));
-    return gtk_entry_get_text (entry);
-}
+	g_free (label);
+	g_free (errmsg);
 
-gboolean
-seahorse_passphrase_prompt_checked (GtkDialog *dialog)
-{
-    GtkToggleButton *button = GTK_TOGGLE_BUTTON (g_object_get_data (G_OBJECT (dialog), "check-option"));
-    return GTK_IS_TOGGLE_BUTTON (button) ? gtk_toggle_button_get_active (button) : FALSE;
-}
+	pass = gcr_prompt_password_run (prompt, NULL, &error);
+	if (pass != NULL)
+		seahorse_util_printf_fd (fd, "%s\n", pass);
 
+	gcr_system_prompt_close_async (GCR_SYSTEM_PROMPT (prompt), NULL, NULL, NULL);
+	g_object_unref (prompt);
 
-gpgme_error_t
-seahorse_passphrase_get (gconstpointer dummy, const gchar *passphrase_hint,
-                         const char* passphrase_info, int flags, int fd)
-{
-    GtkDialog *dialog;
-    gpgme_error_t err;
-    gchar **split_uid = NULL;
-    gchar *label = NULL;
-    gchar *errmsg = NULL;
-    const gchar *pass;
-
-    if (passphrase_info && strlen(passphrase_info) < 16)
-        flags |= SEAHORSE_PASS_NEW;
-
-    if (passphrase_hint)
-        split_uid = g_strsplit (passphrase_hint, " ", 2);
-
-    if (flags & SEAHORSE_PASS_BAD)
-        errmsg = g_strdup_printf (_("Wrong passphrase."));
-
-    if (split_uid && split_uid[0] && split_uid[1]) {
-        if (flags & SEAHORSE_PASS_NEW)
-            label = g_strdup_printf (_("Enter new passphrase for '%s'"), split_uid[1]);
-        else
-            label = g_strdup_printf (_("Enter passphrase for '%s'"), split_uid[1]);
-    } else {
-        if (flags & SEAHORSE_PASS_NEW)
-            label = g_strdup (_("Enter new passphrase"));
-        else
-            label = g_strdup (_("Enter passphrase"));
-    }
+	if (error != NULL) {
+		g_message ("Couldn't prompt for password: %s", error->message);
+		g_error_free (error);
+		return gpgme_error (GPG_ERR_CANCELED);
+	}
 
-    g_strfreev (split_uid);
-
-    dialog = seahorse_passphrase_prompt_show (NULL, errmsg ? errmsg : label,
-                                              NULL, NULL, FALSE);
-    g_free (label);
-    g_free (errmsg);
-
-    switch (gtk_dialog_run (dialog)) {
-    case GTK_RESPONSE_ACCEPT:
-        pass = seahorse_passphrase_prompt_get (dialog);
-        seahorse_util_printf_fd (fd, "%s\n", pass);
-        err = 0;
-        break;
-    default:
-        err = gpgme_error (GPG_ERR_CANCELED);
-        break;
-    };
-
-    gtk_widget_destroy (GTK_WIDGET (dialog));
-    return err;
+	return 0;
 }
diff --git a/tool/seahorse-passphrase.h b/tool/seahorse-passphrase.h
index 0407a8d..1035f8c 100644
--- a/tool/seahorse-passphrase.h
+++ b/tool/seahorse-passphrase.h
@@ -34,10 +34,6 @@ GtkDialog*      seahorse_passphrase_prompt_show     (const gchar *title,
                                                      const gchar *check,
                                                      gboolean confirm);
 
-const gchar*    seahorse_passphrase_prompt_get      (GtkDialog *dialog);
-
-gboolean        seahorse_passphrase_prompt_checked  (GtkDialog *dialog);
-
 gpgme_error_t   seahorse_passphrase_get             (gconstpointer dummy,
                                                      const gchar *passphrase_hint,
                                                      const char* passphrase_info,
diff --git a/tool/seahorse-tool.c b/tool/seahorse-tool.c
index c0a375a..bb840ce 100644
--- a/tool/seahorse-tool.c
+++ b/tool/seahorse-tool.c
@@ -33,7 +33,6 @@
 #include "cryptui.h"
 #include "cryptui-key-store.h"
 
-#include "seahorse-secure-memory.h"
 #include "seahorse-tool.h"
 #include "seahorse-util.h"
 #include "seahorse-vfs-data.h"
@@ -677,8 +676,6 @@ main (int argc, char **argv)
     gchar **uris = NULL;
     int ret = 0;
 
-    seahorse_secure_memory_init ();
-
 #ifdef ENABLE_NLS
     bindtextdomain (GETTEXT_PACKAGE, LOCALEDIR);
     bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]