NetworkManager r4030 - in trunk/vpn-daemons/vpnc: . auth-dialog common-gnome properties
- From: dcbw svn gnome org
- To: svn-commits-list gnome org
- Subject: NetworkManager r4030 - in trunk/vpn-daemons/vpnc: . auth-dialog common-gnome properties
- Date: Wed, 3 Sep 2008 21:00:37 +0000 (UTC)
Author: dcbw
Date: Wed Sep 3 21:00:36 2008
New Revision: 4030
URL: http://svn.gnome.org/viewvc/NetworkManager?rev=4030&view=rev
Log:
2008-09-03 Dan Williams <dcbw redhat com>
* common-gnome/Makefile.am
common-gnome/keyring-helpers.c
common-gnome/keyring-helpers.h
Makefile.am
- Split out keyring read/write routines to common library
* configure.in
- Don't require libgnomeui anymore
* auth-dialog/main.c
- (get_secrets): use common keyring helpers
- (main): remove usage of libgnomeui
* auth-dialog/gnome-two-password-dialog.c
- (gnome_two_password_dialog_get_password,
gnome_two_password_dialog_get_password_secondary): use gnome-keyring
secure memory
* properties/nm-vpnc.c
properties/nm-vpnc-dialog.glade
properties/Makefile.am
- Grab VPN passwords from the keyring if available and allow them to
be edited
Added:
trunk/vpn-daemons/vpnc/common-gnome/
trunk/vpn-daemons/vpnc/common-gnome/Makefile.am
trunk/vpn-daemons/vpnc/common-gnome/keyring-helpers.c
trunk/vpn-daemons/vpnc/common-gnome/keyring-helpers.h
Modified:
trunk/vpn-daemons/vpnc/ChangeLog
trunk/vpn-daemons/vpnc/Makefile.am
trunk/vpn-daemons/vpnc/auth-dialog/Makefile.am
trunk/vpn-daemons/vpnc/auth-dialog/gnome-two-password-dialog.c
trunk/vpn-daemons/vpnc/auth-dialog/main.c
trunk/vpn-daemons/vpnc/configure.in
trunk/vpn-daemons/vpnc/properties/Makefile.am
trunk/vpn-daemons/vpnc/properties/nm-vpnc-dialog.glade
trunk/vpn-daemons/vpnc/properties/nm-vpnc.c
Modified: trunk/vpn-daemons/vpnc/Makefile.am
==============================================================================
--- trunk/vpn-daemons/vpnc/Makefile.am (original)
+++ trunk/vpn-daemons/vpnc/Makefile.am Wed Sep 3 21:00:36 2008
@@ -1,7 +1,7 @@
AUTOMAKE_OPTIONS = foreign
if WITH_GNOME
-SUBDIRS = src auth-dialog properties po
+SUBDIRS = src common-gnome auth-dialog properties po
else
SUBDIRS = src
endif
Modified: trunk/vpn-daemons/vpnc/auth-dialog/Makefile.am
==============================================================================
--- trunk/vpn-daemons/vpnc/auth-dialog/Makefile.am (original)
+++ trunk/vpn-daemons/vpnc/auth-dialog/Makefile.am Wed Sep 3 21:00:36 2008
@@ -2,33 +2,28 @@
libexec_PROGRAMS = nm-vpnc-auth-dialog
-nm_vpnc_auth_dialog_CPPFLAGS = \
- $(NM_UTILS_CFLAGS) \
- $(GTHREAD_CFLAGS) \
- $(GTK_CFLAGS) \
- $(LIBGNOMEUI_CFLAGS) \
- $(GNOMEKEYRING_CFLAGS) \
- -DICONDIR=\""$(datadir)/pixmaps"\" \
- -DGLADEDIR=\""$(gladedir)"\" \
- -DBINDIR=\""$(bindir)"\" \
- -DDBUS_API_SUBJECT_TO_CHANGE \
- -DG_DISABLE_DEPRECATED \
- -DGDK_DISABLE_DEPRECATED \
- -DGNOME_DISABLE_DEPRECATED \
- -DGNOMELOCALEDIR=\"$(datadir)/locale\" \
- -DVERSION=\"$(VERSION)\" \
- $(NULL)
+nm_vpnc_auth_dialog_CPPFLAGS = \
+ $(NM_UTILS_CFLAGS) \
+ $(GTHREAD_CFLAGS) \
+ $(GTK_CFLAGS) \
+ $(GNOMEKEYRING_CFLAGS) \
+ -DICONDIR=\""$(datadir)/pixmaps"\" \
+ -DGLADEDIR=\""$(gladedir)"\" \
+ -DBINDIR=\""$(bindir)"\" \
+ -DDBUS_API_SUBJECT_TO_CHANGE \
+ -DG_DISABLE_DEPRECATED \
+ -DGDK_DISABLE_DEPRECATED \
+ -DGNOME_DISABLE_DEPRECATED \
+ -DGNOMELOCALEDIR=\"$(datadir)/locale\" \
+ -DVERSION=\"$(VERSION)\"
-nm_vpnc_auth_dialog_SOURCES = \
- main.c \
- gnome-two-password-dialog.c \
- gnome-two-password-dialog.h \
- $(NULL)
+nm_vpnc_auth_dialog_SOURCES = \
+ main.c \
+ gnome-two-password-dialog.c \
+ gnome-two-password-dialog.h
-nm_vpnc_auth_dialog_LDADD = \
- $(GTK_LIBS) \
- $(LIBGNOMEUI_LIBS) \
- $(GNOMEKEYRING_LIBS) \
- $(NULL)
+nm_vpnc_auth_dialog_LDADD = \
+ $(GTK_LIBS) \
+ $(top_builddir)/common-gnome/libnm-vpnc-common-gnome.la
CLEANFILES = *~
Modified: trunk/vpn-daemons/vpnc/auth-dialog/gnome-two-password-dialog.c
==============================================================================
--- trunk/vpn-daemons/vpnc/auth-dialog/gnome-two-password-dialog.c (original)
+++ trunk/vpn-daemons/vpnc/auth-dialog/gnome-two-password-dialog.c Wed Sep 3 21:00:36 2008
@@ -38,6 +38,7 @@
#include <gtk/gtkvbox.h>
#include <gtk/gtkradiobutton.h>
#include <gtk/gtkstock.h>
+#include <gnome-keyring-memory.h>
#include <glib/gi18n.h>
#include <gtk/gtk.h>
@@ -638,7 +639,7 @@
{
g_return_val_if_fail (GNOME_IS_TWO_PASSWORD_DIALOG (password_dialog), NULL);
- return g_strdup (gtk_entry_get_text (GTK_ENTRY (password_dialog->details->password_entry)));
+ return gnome_keyring_memory_strdup (gtk_entry_get_text (GTK_ENTRY (password_dialog->details->password_entry)));
}
char *
@@ -646,7 +647,7 @@
{
g_return_val_if_fail (GNOME_IS_TWO_PASSWORD_DIALOG (password_dialog), NULL);
- return g_strdup (gtk_entry_get_text (GTK_ENTRY (password_dialog->details->password_entry_secondary)));
+ return gnome_keyring_memory_strdup (gtk_entry_get_text (GTK_ENTRY (password_dialog->details->password_entry_secondary)));
}
void
Modified: trunk/vpn-daemons/vpnc/auth-dialog/main.c
==============================================================================
--- trunk/vpn-daemons/vpnc/auth-dialog/main.c (original)
+++ trunk/vpn-daemons/vpnc/auth-dialog/main.c Wed Sep 3 21:00:36 2008
@@ -27,121 +27,19 @@
#include <string.h>
#include <glib/gi18n.h>
#include <gtk/gtk.h>
-#include <libgnomeui/libgnomeui.h>
#include <gnome-keyring.h>
+#include <gnome-keyring-memory.h>
#include <nm-setting-vpn.h>
-#include "../src/nm-vpnc-service.h"
+#include "common-gnome/keyring-helpers.h"
+#include "src/nm-vpnc-service.h"
#include "gnome-two-password-dialog.h"
#define KEYRING_UUID_TAG "connection-uuid"
#define KEYRING_SN_TAG "setting-name"
#define KEYRING_SK_TAG "setting-key"
-static char *
-find_one_password (const char *vpn_uuid,
- const char *secret_name,
- gboolean *is_session)
-{
- GList *found_list = NULL;
- GnomeKeyringResult ret;
- GnomeKeyringFound *found;
- char *secret;
-
- ret = gnome_keyring_find_itemsv_sync (GNOME_KEYRING_ITEM_GENERIC_SECRET,
- &found_list,
- KEYRING_UUID_TAG,
- GNOME_KEYRING_ATTRIBUTE_TYPE_STRING,
- vpn_uuid,
- KEYRING_SN_TAG,
- GNOME_KEYRING_ATTRIBUTE_TYPE_STRING,
- NM_SETTING_VPN_SETTING_NAME,
- KEYRING_SK_TAG,
- GNOME_KEYRING_ATTRIBUTE_TYPE_STRING,
- secret_name,
- NULL);
- if ((ret != GNOME_KEYRING_RESULT_OK) || (g_list_length (found_list) == 0))
- return NULL;
-
- found = (GnomeKeyringFound *) found_list->data;
-
- if (strcmp (found->keyring, "session") == 0)
- *is_session = TRUE;
- else
- *is_session = FALSE;
-
- secret = found->secret ? g_strdup (found->secret) : NULL;
- gnome_keyring_found_list_free (found_list);
-
- return secret;
-}
-
-static gboolean
-lookup_secrets (const char *vpn_uuid,
- char **password,
- char **group_password,
- gboolean *is_session)
-{
- g_return_val_if_fail (password != NULL, FALSE);
- g_return_val_if_fail (*password == NULL, FALSE);
- g_return_val_if_fail (group_password != NULL, FALSE);
- g_return_val_if_fail (*group_password == NULL, FALSE);
-
- *password = find_one_password (vpn_uuid, "password", is_session);
- if (!*password)
- return FALSE;
-
- *group_password = find_one_password (vpn_uuid, "group-password", is_session);
- if (!*group_password) {
- g_free (*password);
- *password = NULL;
- return FALSE;
- }
-
- return TRUE;
-}
-
-static void
-save_vpn_password (const char *vpn_uuid,
- const char *vpn_name,
- const char *vpn_service,
- const char *keyring,
- const char *secret_name,
- const char *secret)
-{
- char *display_name;
- GnomeKeyringResult ret;
- GnomeKeyringAttributeList *attrs = NULL;
- guint32 id = 0;
-
- display_name = g_strdup_printf ("VPN %s secret for %s/%s/" NM_SETTING_VPN_SETTING_NAME,
- secret_name,
- vpn_name,
- vpn_service);
-
- attrs = gnome_keyring_attribute_list_new ();
- gnome_keyring_attribute_list_append_string (attrs,
- KEYRING_UUID_TAG,
- vpn_uuid);
- gnome_keyring_attribute_list_append_string (attrs,
- KEYRING_SN_TAG,
- NM_SETTING_VPN_SETTING_NAME);
- gnome_keyring_attribute_list_append_string (attrs,
- KEYRING_SK_TAG,
- secret_name);
-
- ret = gnome_keyring_item_create_sync (keyring,
- GNOME_KEYRING_ITEM_GENERIC_SECRET,
- display_name,
- attrs,
- secret,
- TRUE,
- &id);
- gnome_keyring_attribute_list_free (attrs);
- g_free (display_name);
-}
-
static gboolean
get_secrets (const char *vpn_uuid,
const char *vpn_name,
@@ -162,7 +60,7 @@
g_return_val_if_fail (group_password != NULL, FALSE);
g_return_val_if_fail (*group_password == NULL, FALSE);
- found = lookup_secrets (vpn_uuid, password, group_password, &is_session);
+ found = keyring_helpers_lookup_secrets (vpn_uuid, password, group_password, &is_session);
if (!retry && found && *password && *group_password)
return TRUE;
@@ -189,12 +87,12 @@
/* if retrying, pre-fill dialog with the password */
if (*password) {
gnome_two_password_dialog_set_password (dialog, *password);
- g_free (*password);
+ gnome_keyring_memory_free (*password);
*password = NULL;
}
if (*group_password) {
gnome_two_password_dialog_set_password_secondary (dialog, *group_password);
- g_free (*group_password);
+ gnome_keyring_memory_free (*group_password);
*group_password = NULL;
}
@@ -206,12 +104,12 @@
switch (gnome_two_password_dialog_get_remember (dialog)) {
case GNOME_TWO_PASSWORD_DIALOG_REMEMBER_SESSION:
- save_vpn_password (vpn_uuid, vpn_name, vpn_service, "session", "password", *password);
- save_vpn_password (vpn_uuid, vpn_name, vpn_service, "session", "group-password", *group_password);
+ keyring_helpers_save_secret (vpn_uuid, vpn_name, vpn_service, "session", "password", *password);
+ keyring_helpers_save_secret (vpn_uuid, vpn_name, vpn_service, "session", "group-password", *group_password);
break;
case GNOME_TWO_PASSWORD_DIALOG_REMEMBER_FOREVER:
- save_vpn_password (vpn_uuid, vpn_name, vpn_service, NULL, "password", *password);
- save_vpn_password (vpn_uuid, vpn_name, vpn_service, NULL, "group-password", *group_password);
+ keyring_helpers_save_secret (vpn_uuid, vpn_name, vpn_service, NULL, "password", *password);
+ keyring_helpers_save_secret (vpn_uuid, vpn_name, vpn_service, NULL, "group-password", *group_password);
break;
default:
break;
@@ -234,9 +132,9 @@
gchar *vpn_service = NULL;
char *password = NULL, *group_password = NULL;
char buf[1];
- int ret, exit_status = 1;
+ int ret;
+ GError *error = NULL;
GOptionContext *context;
- GnomeProgram *program;
GOptionEntry entries[] = {
{ "reprompt", 'r', 0, G_OPTION_ARG_NONE, &retry, "Reprompt for passwords", NULL},
{ "uuid", 'u', 0, G_OPTION_ARG_STRING, &vpn_uuid, "UUID of VPN connection", NULL},
@@ -247,29 +145,32 @@
bindtextdomain (GETTEXT_PACKAGE, NULL);
bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
+ gtk_init (&argc, &argv);
textdomain (GETTEXT_PACKAGE);
context = g_option_context_new ("- vpnc auth dialog");
g_option_context_add_main_entries (context, entries, GETTEXT_PACKAGE);
- program = gnome_program_init ("nm-vpnc-auth-dialog", VERSION,
- LIBGNOMEUI_MODULE,
- argc, argv,
- GNOME_PARAM_GOPTION_CONTEXT, context,
- GNOME_PARAM_NONE);
+ if (!g_option_context_parse (context, &argc, &argv, &error)) {
+ g_warning ("Error parsing options: %s\n", error->message);
+ g_error_free (error);
+ return 1;
+ }
+
+ g_option_context_free (context);
if (vpn_uuid == NULL || vpn_name == NULL || vpn_service == NULL) {
fprintf (stderr, "Have to supply UUID, name, and service\n");
- goto out;
+ return 1;
}
if (strcmp (vpn_service, NM_DBUS_SERVICE_VPNC) != 0) {
fprintf (stderr, "This dialog only works with the '%s' service\n", NM_DBUS_SERVICE_VPNC);
- goto out;
+ return 1;
}
if (!get_secrets (vpn_uuid, vpn_name, vpn_service, retry, &password, &group_password))
- goto out;
+ return 1;
/* dump the passwords to stdout */
printf ("%s\n%s\n", NM_VPNC_KEY_XAUTH_PASSWORD, password);
@@ -278,21 +179,17 @@
if (password) {
memset (password, 0, strlen (password));
- g_free (password);
+ gnome_keyring_memory_free (password);
}
if (group_password) {
memset (group_password, 0, strlen (group_password));
- g_free (group_password);
+ gnome_keyring_memory_free (group_password);
}
- exit_status = 0;
/* for good measure, flush stdout since Kansas is going Bye-Bye */
fflush (stdout);
/* wait for data on stdin */
ret = fread (buf, sizeof (char), sizeof (buf), stdin);
-
-out:
- g_object_unref (program);
- return exit_status;
+ return 0;
}
Added: trunk/vpn-daemons/vpnc/common-gnome/Makefile.am
==============================================================================
--- (empty file)
+++ trunk/vpn-daemons/vpnc/common-gnome/Makefile.am Wed Sep 3 21:00:36 2008
@@ -0,0 +1,17 @@
+lib_LTLIBRARIES=libnm-vpnc-common-gnome.la
+
+libnm_vpnc_common_gnome_la_CPPFLAGS = \
+ $(NM_UTILS_CFLAGS) \
+ $(GLIB_CFLAGS) \
+ $(GNOMEKEYRING_CFLAGS) \
+ -DG_DISABLE_DEPRECATED
+
+libnm_vpnc_common_gnome_la_SOURCES= \
+ keyring-helpers.c \
+ keyring-helpers.h
+
+libnm_vpnc_common_gnome_la_LIBADD = \
+ $(NM_UTILS_LIBS) \
+ $(GLIB_LIBS) \
+ $(GNOMEKEYRING_LIBS)
+
Added: trunk/vpn-daemons/vpnc/common-gnome/keyring-helpers.c
==============================================================================
--- (empty file)
+++ trunk/vpn-daemons/vpnc/common-gnome/keyring-helpers.c Wed Sep 3 21:00:36 2008
@@ -0,0 +1,140 @@
+/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */
+/* NetworkManager Wireless Applet -- Display wireless access points and allow user control
+ *
+ * Dan Williams <dcbw redhat com>
+ *
+ * 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
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * (C) Copyright 2004 - 2008 Red Hat, Inc.
+ */
+
+#include <string.h>
+#include <gnome-keyring-memory.h>
+
+#include <nm-setting-vpn.h>
+
+#include "keyring-helpers.h"
+
+#define KEYRING_UUID_TAG "connection-uuid"
+#define KEYRING_SN_TAG "setting-name"
+#define KEYRING_SK_TAG "setting-key"
+
+static char *
+find_one_password (const char *vpn_uuid,
+ const char *secret_name,
+ gboolean *is_session)
+{
+ GList *found_list = NULL;
+ GnomeKeyringResult ret;
+ GnomeKeyringFound *found;
+ char *secret;
+
+ ret = gnome_keyring_find_itemsv_sync (GNOME_KEYRING_ITEM_GENERIC_SECRET,
+ &found_list,
+ KEYRING_UUID_TAG,
+ GNOME_KEYRING_ATTRIBUTE_TYPE_STRING,
+ vpn_uuid,
+ KEYRING_SN_TAG,
+ GNOME_KEYRING_ATTRIBUTE_TYPE_STRING,
+ NM_SETTING_VPN_SETTING_NAME,
+ KEYRING_SK_TAG,
+ GNOME_KEYRING_ATTRIBUTE_TYPE_STRING,
+ secret_name,
+ NULL);
+ if ((ret != GNOME_KEYRING_RESULT_OK) || (g_list_length (found_list) == 0))
+ return NULL;
+
+ found = (GnomeKeyringFound *) found_list->data;
+
+ if (is_session) {
+ if (strcmp (found->keyring, "session") == 0)
+ *is_session = TRUE;
+ else
+ *is_session = FALSE;
+ }
+
+ secret = found->secret ? gnome_keyring_memory_strdup (found->secret) : NULL;
+ gnome_keyring_found_list_free (found_list);
+
+ return secret;
+}
+
+gboolean
+keyring_helpers_lookup_secrets (const char *vpn_uuid,
+ char **password,
+ char **group_password,
+ gboolean *is_session)
+{
+ g_return_val_if_fail (password != NULL, FALSE);
+ g_return_val_if_fail (*password == NULL, FALSE);
+ g_return_val_if_fail (group_password != NULL, FALSE);
+ g_return_val_if_fail (*group_password == NULL, FALSE);
+
+ *password = find_one_password (vpn_uuid, "password", is_session);
+ if (!*password)
+ return FALSE;
+
+ *group_password = find_one_password (vpn_uuid, "group-password", is_session);
+ if (!*group_password) {
+ memset (*password, 0, strlen (*password));
+ gnome_keyring_memory_free (*password);
+ *password = NULL;
+ return FALSE;
+ }
+
+ return TRUE;
+}
+
+GnomeKeyringResult
+keyring_helpers_save_secret (const char *vpn_uuid,
+ const char *vpn_name,
+ const char *vpn_service,
+ const char *keyring,
+ const char *secret_name,
+ const char *secret)
+{
+ char *display_name;
+ GnomeKeyringResult ret;
+ GnomeKeyringAttributeList *attrs = NULL;
+ guint32 id = 0;
+
+ display_name = g_strdup_printf ("VPN %s secret for %s/%s/" NM_SETTING_VPN_SETTING_NAME,
+ secret_name,
+ vpn_name,
+ vpn_service);
+
+ attrs = gnome_keyring_attribute_list_new ();
+ gnome_keyring_attribute_list_append_string (attrs,
+ KEYRING_UUID_TAG,
+ vpn_uuid);
+ gnome_keyring_attribute_list_append_string (attrs,
+ KEYRING_SN_TAG,
+ NM_SETTING_VPN_SETTING_NAME);
+ gnome_keyring_attribute_list_append_string (attrs,
+ KEYRING_SK_TAG,
+ secret_name);
+
+ ret = gnome_keyring_item_create_sync (keyring,
+ GNOME_KEYRING_ITEM_GENERIC_SECRET,
+ display_name,
+ attrs,
+ secret,
+ TRUE,
+ &id);
+ gnome_keyring_attribute_list_free (attrs);
+ g_free (display_name);
+ return ret;
+}
+
Added: trunk/vpn-daemons/vpnc/common-gnome/keyring-helpers.h
==============================================================================
--- (empty file)
+++ trunk/vpn-daemons/vpnc/common-gnome/keyring-helpers.h Wed Sep 3 21:00:36 2008
@@ -0,0 +1,42 @@
+/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */
+/* NetworkManager Wireless Applet -- Display wireless access points and allow user control
+ *
+ * Dan Williams <dcbw redhat com>
+ *
+ * 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
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * (C) Copyright 2004 - 2008 Red Hat, Inc.
+ */
+
+#ifndef KEYRING_HELPERS_H
+#define KEYRING_HELPERS_H
+
+#include <glib.h>
+#include <gnome-keyring.h>
+
+gboolean keyring_helpers_lookup_secrets (const char *vpn_uuid,
+ char **password,
+ char **group_password,
+ gboolean *is_session);
+
+GnomeKeyringResult keyring_helpers_save_secret (const char *vpn_uuid,
+ const char *vpn_name,
+ const char *vpn_service,
+ const char *keyring,
+ const char *secret_name,
+ const char *secret);
+
+#endif /* KEYRING_HELPERS_H */
+
Modified: trunk/vpn-daemons/vpnc/configure.in
==============================================================================
--- trunk/vpn-daemons/vpnc/configure.in (original)
+++ trunk/vpn-daemons/vpnc/configure.in Wed Sep 3 21:00:36 2008
@@ -69,10 +69,6 @@
AC_SUBST(GLADE_CFLAGS)
AC_SUBST(GLADE_LIBS)
- PKG_CHECK_MODULES(LIBGNOMEUI, libgnomeui-2.0)
- AC_SUBST(LIBGNOMEUI_CFLAGS)
- AC_SUBST(LIBGNOMEUI_LIBS)
-
PKG_CHECK_MODULES(GCONF, gconf-2.0)
AC_SUBST(GCONF_CFLAGS)
AC_SUBST(GCONF_LIBS)
@@ -122,6 +118,7 @@
AC_OUTPUT([
Makefile
src/Makefile
+common-gnome/Makefile
auth-dialog/Makefile
properties/Makefile
po/Makefile.in
Modified: trunk/vpn-daemons/vpnc/properties/Makefile.am
==============================================================================
--- trunk/vpn-daemons/vpnc/properties/Makefile.am (original)
+++ trunk/vpn-daemons/vpnc/properties/Makefile.am Wed Sep 3 21:00:36 2008
@@ -1,3 +1,5 @@
+INCLUDES = -I${top_srcdir}
+
plugindir = $(libdir)/NetworkManager
plugin_LTLIBRARIES = libnm-vpnc-properties.la
@@ -10,31 +12,30 @@
gladedir = $(datadir)/gnome-vpn-properties/vpnc
glade_DATA = nm-vpnc-dialog.glade
-libnm_vpnc_properties_la_CFLAGS = \
- $(GLADE_CFLAGS) \
- $(GTK_CFLAGS) \
- $(GCONF_CFLAGS) \
- $(LIBGNOMEUI_CFLAGS) \
- $(NM_UTILS_CFLAGS) \
- -DICONDIR=\""$(datadir)/pixmaps"\" \
- -DGLADEDIR=\""$(gladedir)"\" \
- -DG_DISABLE_DEPRECATED \
- -DGDK_DISABLE_DEPRECATED \
- -DGNOME_DISABLE_DEPRECATED \
- -DGNOMELOCALEDIR=\"$(datadir)/locale\" \
- -DVERSION=\"$(VERSION)\"
+libnm_vpnc_properties_la_CPPFLAGS = \
+ $(GLADE_CFLAGS) \
+ $(GTK_CFLAGS) \
+ $(GCONF_CFLAGS) \
+ $(GNOMEKEYRING_CFLAGS) \
+ $(NM_UTILS_CFLAGS) \
+ -DICONDIR=\""$(datadir)/pixmaps"\" \
+ -DGLADEDIR=\""$(gladedir)"\" \
+ -DG_DISABLE_DEPRECATED \
+ -DGDK_DISABLE_DEPRECATED \
+ -DGNOME_DISABLE_DEPRECATED \
+ -DGNOMELOCALEDIR=\"$(datadir)/locale\" \
+ -DVERSION=\"$(VERSION)\"
libnm_vpnc_properties_la_LIBADD = \
- $(GLADE_LIBS) \
- $(GTK_LIBS) \
- $(GCONF_LIBS) \
- $(LIBGNOMEUI_LIBS) \
- $(NM_UTILS_LIBS)
+ $(GLADE_LIBS) \
+ $(GTK_LIBS) \
+ $(GCONF_LIBS) \
+ $(NM_UTILS_LIBS) \
+ $(top_builddir)/common-gnome/libnm-vpnc-common-gnome.la
-libnm_vpnc_properties_la_LDFLAGS = \
+libnm_vpnc_properties_la_LDFLAGS = \
-avoid-version
CLEANFILES = *.bak *.gladep *~
-EXTRA_DIST = \
- $(glade_DATA)
+EXTRA_DIST = $(glade_DATA)
Modified: trunk/vpn-daemons/vpnc/properties/nm-vpnc-dialog.glade
==============================================================================
--- trunk/vpn-daemons/vpnc/properties/nm-vpnc-dialog.glade (original)
+++ trunk/vpn-daemons/vpnc/properties/nm-vpnc-dialog.glade Wed Sep 3 21:00:36 2008
@@ -32,11 +32,58 @@
<child>
<widget class="GtkTable" id="table2">
<property name="visible">True</property>
- <property name="n_rows">2</property>
+ <property name="n_rows">5</property>
<property name="n_columns">2</property>
<property name="column_spacing">6</property>
<property name="row_spacing">6</property>
<child>
+ <placeholder/>
+ </child>
+ <child>
+ <widget class="GtkCheckButton" id="show_passwords_checkbutton">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="label" translatable="yes">Show passwords</property>
+ <property name="response_id">0</property>
+ <property name="draw_indicator">True</property>
+ </widget>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
+ <property name="top_attach">4</property>
+ <property name="bottom_attach">5</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkEntry" id="group_password_entry">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="visibility">False</property>
+ </widget>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
+ <property name="top_attach">3</property>
+ <property name="bottom_attach">4</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkLabel" id="label4">
+ <property name="visible">True</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Gro_up password:</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">group_entry</property>
+ </widget>
+ <packing>
+ <property name="top_attach">3</property>
+ <property name="bottom_attach">4</property>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+ <child>
<widget class="GtkLabel" id="label23">
<property name="visible">True</property>
<property name="xalign">0</property>
@@ -53,7 +100,7 @@
<widget class="GtkLabel" id="label24">
<property name="visible">True</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">G_roup Name:</property>
+ <property name="label" translatable="yes">G_roup name:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">group_entry</property>
</widget>
@@ -88,6 +135,35 @@
<property name="y_options"></property>
</packing>
</child>
+ <child>
+ <widget class="GtkLabel" id="label3">
+ <property name="visible">True</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">_User password:</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">group_entry</property>
+ </widget>
+ <packing>
+ <property name="top_attach">2</property>
+ <property name="bottom_attach">3</property>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkEntry" id="user_password_entry">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="visibility">False</property>
+ </widget>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
+ <property name="top_attach">2</property>
+ <property name="bottom_attach">3</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
</widget>
</child>
</widget>
@@ -161,7 +237,7 @@
<widget class="GtkLabel" id="label1">
<property name="visible">True</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">Encryption Method:</property>
+ <property name="label" translatable="yes">Encryption method:</property>
</widget>
<packing>
<property name="top_attach">2</property>
@@ -220,7 +296,7 @@
<widget class="GtkLabel" id="label2">
<property name="visible">True</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">NAT Traversal:</property>
+ <property name="label" translatable="yes">NAT traversal:</property>
</widget>
<packing>
<property name="top_attach">3</property>
Modified: trunk/vpn-daemons/vpnc/properties/nm-vpnc.c
==============================================================================
--- trunk/vpn-daemons/vpnc/properties/nm-vpnc.c (original)
+++ trunk/vpn-daemons/vpnc/properties/nm-vpnc.c Wed Sep 3 21:00:36 2008
@@ -35,6 +35,8 @@
#include <string.h>
#include <gtk/gtk.h>
#include <glade/glade.h>
+#include <gnome-keyring.h>
+#include <gnome-keyring-memory.h>
#define NM_VPN_API_SUBJECT_TO_CHANGE
@@ -43,7 +45,8 @@
#include <nm-setting-connection.h>
#include <nm-setting-ip4-config.h>
-#include "../src/nm-vpnc-service.h"
+#include "src/nm-vpnc-service.h"
+#include "common-gnome/keyring-helpers.h"
#include "pcf-file.h"
#include "nm-vpnc.h"
@@ -155,6 +158,68 @@
}
static gboolean
+fill_vpn_passwords (VpncPluginUiWidget *self, NMConnection *connection)
+{
+ VpncPluginUiWidgetPrivate *priv = VPNC_PLUGIN_UI_WIDGET_GET_PRIVATE (self);
+ GtkWidget *widget;
+ gboolean success = FALSE;
+ char *password = NULL;
+ char *group_password = NULL;
+
+ /* Grab secrets from the keyring */
+ if (connection) {
+ NMSettingConnection *s_con;
+
+ s_con = NM_SETTING_CONNECTION (nm_connection_get_setting (connection, NM_TYPE_SETTING_CONNECTION));
+ keyring_helpers_lookup_secrets (s_con->uuid, &password, &group_password, NULL);
+ }
+
+ /* User password */
+ widget = glade_xml_get_widget (priv->xml, "user_password_entry");
+ gtk_size_group_add_widget (priv->group, GTK_WIDGET (widget));
+ if (!widget)
+ goto out;
+ if (password)
+ gtk_entry_set_text (GTK_ENTRY (widget), password);
+ g_signal_connect (G_OBJECT (widget), "changed", G_CALLBACK (stuff_changed_cb), self);
+
+ /* Group password */
+ widget = glade_xml_get_widget (priv->xml, "group_password_entry");
+ gtk_size_group_add_widget (priv->group, GTK_WIDGET (widget));
+ if (!widget)
+ goto out;
+ if (group_password)
+ gtk_entry_set_text (GTK_ENTRY (widget), group_password);
+ g_signal_connect (G_OBJECT (widget), "changed", G_CALLBACK (stuff_changed_cb), self);
+
+ success = TRUE;
+
+out:
+ gnome_keyring_memory_free (password);
+ gnome_keyring_memory_free (group_password);
+
+ return success;
+}
+
+static void
+show_toggled_cb (GtkCheckButton *button, VpncPluginUiWidget *self)
+{
+ VpncPluginUiWidgetPrivate *priv = VPNC_PLUGIN_UI_WIDGET_GET_PRIVATE (self);
+ GtkWidget *widget;
+ gboolean visible;
+
+ visible = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (button));
+
+ widget = glade_xml_get_widget (priv->xml, "user_password_entry");
+ g_assert (widget);
+ gtk_entry_set_visibility (GTK_ENTRY (widget), visible);
+
+ widget = glade_xml_get_widget (priv->xml, "group_password_entry");
+ g_assert (widget);
+ gtk_entry_set_visibility (GTK_ENTRY (widget), visible);
+}
+
+static gboolean
init_plugin_ui (VpncPluginUiWidget *self, NMConnection *connection, GError **error)
{
VpncPluginUiWidgetPrivate *priv = VPNC_PLUGIN_UI_WIDGET_GET_PRIVATE (self);
@@ -171,8 +236,7 @@
priv->group = gtk_size_group_new (GTK_SIZE_GROUP_HORIZONTAL);
widget = glade_xml_get_widget (priv->xml, "gateway_entry");
- if (!widget)
- return FALSE;
+ g_return_val_if_fail (widget != NULL, FALSE);
gtk_size_group_add_widget (priv->group, GTK_WIDGET (widget));
if (s_vpn) {
value = g_hash_table_lookup (s_vpn->data, NM_VPNC_KEY_GATEWAY);
@@ -182,8 +246,7 @@
g_signal_connect (G_OBJECT (widget), "changed", G_CALLBACK (stuff_changed_cb), self);
widget = glade_xml_get_widget (priv->xml, "group_entry");
- if (!widget)
- return FALSE;
+ g_return_val_if_fail (widget != NULL, FALSE);
gtk_size_group_add_widget (priv->group, GTK_WIDGET (widget));
if (s_vpn) {
value = g_hash_table_lookup (s_vpn->data, NM_VPNC_KEY_ID);
@@ -193,8 +256,7 @@
g_signal_connect (G_OBJECT (widget), "changed", G_CALLBACK (stuff_changed_cb), self);
widget = glade_xml_get_widget (priv->xml, "encryption_combo");
- if (!widget)
- return FALSE;
+ g_return_val_if_fail (widget != NULL, FALSE);
gtk_size_group_add_widget (priv->group, GTK_WIDGET (widget));
store = gtk_list_store_new (1, G_TYPE_STRING);
@@ -224,8 +286,7 @@
g_signal_connect (G_OBJECT (widget), "changed", G_CALLBACK (stuff_changed_cb), self);
widget = glade_xml_get_widget (priv->xml, "user_entry");
- if (!widget)
- return FALSE;
+ g_return_val_if_fail (widget != NULL, FALSE);
gtk_size_group_add_widget (priv->group, GTK_WIDGET (widget));
if (s_vpn) {
value = g_hash_table_lookup (s_vpn->data, NM_VPNC_KEY_XAUTH_USER);
@@ -235,8 +296,7 @@
g_signal_connect (G_OBJECT (widget), "changed", G_CALLBACK (stuff_changed_cb), self);
widget = glade_xml_get_widget (priv->xml, "domain_entry");
- if (!widget)
- return FALSE;
+ g_return_val_if_fail (widget != NULL, FALSE);
gtk_size_group_add_widget (priv->group, GTK_WIDGET (widget));
if (s_vpn) {
value = g_hash_table_lookup (s_vpn->data, NM_VPNC_KEY_DOMAIN);
@@ -272,8 +332,7 @@
}
widget = glade_xml_get_widget (priv->xml, "natt_combo");
- if (!widget)
- return FALSE;
+ g_return_val_if_fail (widget != NULL, FALSE);
gtk_size_group_add_widget (priv->group, GTK_WIDGET (widget));
gtk_combo_box_set_model (GTK_COMBO_BOX (widget), GTK_TREE_MODEL (store));
g_object_unref (store);
@@ -281,8 +340,7 @@
g_signal_connect (G_OBJECT (widget), "changed", G_CALLBACK (stuff_changed_cb), self);
widget = glade_xml_get_widget (priv->xml, "disable_dpd_checkbutton");
- if (!widget)
- return FALSE;
+ g_return_val_if_fail (widget != NULL, FALSE);
if (s_vpn) {
value = g_hash_table_lookup (s_vpn->data, NM_VPNC_KEY_DPD_IDLE_TIMEOUT);
if (value) {
@@ -299,6 +357,14 @@
}
g_signal_connect (G_OBJECT (widget), "toggled", G_CALLBACK (stuff_changed_cb), self);
+ fill_vpn_passwords (self, connection);
+
+ widget = glade_xml_get_widget (priv->xml, "show_passwords_checkbutton");
+ g_return_val_if_fail (widget != NULL, FALSE);
+ g_signal_connect (G_OBJECT (widget), "toggled",
+ (GCallback) show_toggled_cb,
+ self);
+
return TRUE;
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
