Changeset 4334

Timestamp:

09/05/08 15:26:58 (3 months ago)

Author:

martin

Message:

NM plugin supports (encrypted) private key files

Files:

• trunk/src/charon/plugins/nm/gnome/auth-dialog/main.c (modified) (4 diffs)
• trunk/src/charon/plugins/nm/gnome/properties/nm-strongswan-dialog.glade (modified) (2 diffs)
• trunk/src/charon/plugins/nm/gnome/properties/nm-strongswan.c (modified) (5 diffs)
• trunk/src/charon/plugins/nm/nm_service.c (modified) (7 diffs)

trunk/src/charon/plugins/nm/gnome/auth-dialog/main.c

@@ -64 +64 @@
-
-/**
-check if this connection needs a password
+get the connection type
- */
-gboolean need_password
+char* get_connection_type
-{
-    GConfClient *client;
@@ -76 +76 @@
-                          id, NM_SETTING_VPN_SETTING_NAME, "method");
-    str = gconf_client_get_string(client, key, NULL);
-    if (str && !strcmp(str, "eap"))
-    {
-        need_password = TRUE;
-    }
-    g_free(str);
-    g_free(key);
-    g_object_unref(client);
-need_password
+str
-}
-
@@ -93 +88 @@
-    GnomeProgram *program = NULL;
-    int exit_status = 1;
-
+, *type
-    guint32 itemid;
-    GtkWidget *dialog;
@@ -132 +127 @@
-    }
-    
-
+
+
+
+
+
+
+
+
-    {
-        pass = lookup_password(name, service);
-        if (!pass || retry)
-        {
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-            gnome_password_dialog_set_show_remember(GNOME_PASSWORD_DIALOG(dialog), TRUE);
-            gnome_password_dialog_set_show_username(GNOME_PASSWORD_DIALOG(dialog), FALSE);

trunk/src/charon/plugins/nm/gnome/properties/nm-strongswan-dialog.glade

@@ -38 +38 @@
-                    <property name="row_spacing">6</property>
-                    <child>
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-                        <property name="top_attach">1</property>
-                        <property name="bottom_attach">2</property>
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-                        <property name="top_attach">1</property>
-                        <property name="bottom_attach">2</property>
-                        <property name="x_options">GTK_FILL</property>
-                        <property name="y_options"></property>
-                      </packing>
-                    </child>
-                    <child>
-                      <widget class="GtkEntry" id="address-entry">
-                        <property name="visible">True</property>
-                        <property name="can_focus">True</property>
-                        <property name="has_tooltip">True</property>
-                        <property name="tooltip_text">An IP address or hostname the Gateway can be contacted.</property>
-                      </widget>
-                      <packing>
-                        <property name="left_attach">1</property>
-                        <property name="right_attach">2</property>
-                        <property name="y_options"></property>
-                      </packing>
-                    </child>
-                    <child>
-                      <widget class="GtkLabel" id="address-label">
-                        <property name="visible">True</property>
-                        <property name="xalign">0</property>
-                        <property name="label" translatable="yes">_Address:</property>
-                        <property name="use_underline">True</property>
-                        <property name="mnemonic_widget">address-entry</property>
-                      </widget>
-                      <packing>
-                        <property name="x_options">GTK_FILL</property>
-                        <property name="y_options"></property>
-                      </packing>
-                    </child>
@@ -125 +125 @@
-                  <widget class="GtkTable" id="client-table">
-                    <property name="visible">True</property>
-3
+4
-                    <property name="n_columns">2</property>
-                    <property name="column_spacing">6</property>
-                    <property name="row_spacing">6</property>
-                    <child>
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-                        <property name="top_attach">2</property>
-                        <property name="bottom_attach">3</property>
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-                        <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-entry">
-                        <property name="visible">True</property>
-                        <property name="can_focus">True</property>
-                        <property name="has_tooltip">True</property>
-                        <property name="tooltip_text">The username (identity) to use for authentication against the gateway.</property>
-                      </widget>
-                      <packing>
-                        <property name="left_attach">1</property>
-                        <property name="right_attach">2</property>
-                        <property name="top_attach">1</property>
-                        <property name="bottom_attach">2</property>
-                        <property name="y_options"></property>
-                      </packing>
-                    </child>
-                    <child>
-                      <widget class="GtkLabel" id="user-label">
-                        <property name="visible">True</property>
-                        <property name="xalign">0</property>
-                        <property name="label" translatable="yes">_Username:</property>
-                        <property name="use_underline">True</property>
-                        <property name="mnemonic_widget">user-entry</property>
-                      </widget>
-                      <packing>
-                        <property name="top_attach">1</property>
-                        <property name="bottom_attach">2</property>
-                        <property name="x_options">GTK_FILL</property>
-                        <property name="y_options"></property>
-                      </packing>
-                    </child>
-                    <child>
-                      <widget class="GtkLabel" id="method-label">
-                        <property name="visible">True</property>
-                        <property name="xalign">0</property>
-                        <property name="label" translatable="yes">Au_thentication:</property>
-                        <property name="use_underline">True</property>
-                        <property name="mnemonic_widget">method-combo</property>
-                      </widget>
-                      <packing>
-                        <property name="x_options">GTK_FILL</property>
-                        <property name="y_options"></property>
-                      </packing>
-                    </child>
-                    <child>
-                      <widget class="GtkComboBox" id="method-combo">
-                        <property name="visible">True</property>
-                        <property name="has_tooltip">True</property>
-                        <property name="tooltip_text">Authentication Method to use for authentication against the Gateway. </property>
-                        <property name="items"></property>
-                      </widget>
-                      <packing>
-                        <property name="left_attach">1</property>
-                        <property name="right_attach">2</property>
-                      </packing>
-                    </child>

trunk/src/charon/plugins/nm/gnome/properties/nm-strongswan.c

@@ -123 +123 @@
-}
-
+static void update_layout (GtkWidget *widget, StrongswanPluginUiWidgetPrivate *priv)
+{
+    switch (gtk_combo_box_get_active (GTK_COMBO_BOX (widget)))
+    {
+        default:
+            gtk_combo_box_set_active (GTK_COMBO_BOX (widget), 0);
+            /* FALL */
+        case 0:
+            gtk_widget_show (glade_xml_get_widget (priv->xml, "usercert-label"));
+            gtk_widget_show (glade_xml_get_widget (priv->xml, "usercert-button"));
+            gtk_widget_show (glade_xml_get_widget (priv->xml, "userkey-label"));
+            gtk_widget_show (glade_xml_get_widget (priv->xml, "userkey-button"));
+            gtk_widget_hide (glade_xml_get_widget (priv->xml, "user-label"));
+            gtk_widget_hide (glade_xml_get_widget (priv->xml, "user-entry"));
+            break;
+        case 1:
+            gtk_widget_show (glade_xml_get_widget (priv->xml, "usercert-label"));
+            gtk_widget_show (glade_xml_get_widget (priv->xml, "usercert-button"));
+            gtk_widget_hide (glade_xml_get_widget (priv->xml, "user-label"));
+            gtk_widget_hide (glade_xml_get_widget (priv->xml, "user-entry"));
+            gtk_widget_hide (glade_xml_get_widget (priv->xml, "userkey-label"));
+            gtk_widget_hide (glade_xml_get_widget (priv->xml, "userkey-button"));
+            break;
+        case 2:
+            gtk_widget_show (glade_xml_get_widget (priv->xml, "user-label"));
+            gtk_widget_show (glade_xml_get_widget (priv->xml, "user-entry"));
+            gtk_widget_hide (glade_xml_get_widget (priv->xml, "usercert-label"));
+            gtk_widget_hide (glade_xml_get_widget (priv->xml, "usercert-button"));
+            gtk_widget_hide (glade_xml_get_widget (priv->xml, "userkey-label"));
+            gtk_widget_hide (glade_xml_get_widget (priv->xml, "userkey-button"));
+            break;
+    }
+
+}
+
-static void
-settings_changed_cb (GtkWidget *widget, gpointer user_data)
-{
-    g_signal_emit_by_name (STRONGSWAN_PLUGIN_UI_WIDGET (user_data), "changed");
-}
-
-static void
-method_changed_cb (GtkWidget *widget, gpointer user_data)
-{
-    StrongswanPluginUiWidget *self = STRONGSWAN_PLUGIN_UI_WIDGET (user_data);
-    StrongswanPluginUiWidgetPrivate *priv = STRONGSWAN_PLUGIN_UI_WIDGET_GET_PRIVATE (self);
-    
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
-    }
-    g_signal_emit_by_name (STRONGSWAN_PLUGIN_UI_WIDGET (user_data), "changed");
@@ -184 +203 @@
-
-    widget = glade_xml_get_widget (priv->xml, "method-combo");
+    gtk_combo_box_append_text (GTK_COMBO_BOX (widget), _("Certificate/private key"));
-    gtk_combo_box_append_text (GTK_COMBO_BOX (widget), _("Certificate/ssh-agent"));
-    gtk_combo_box_append_text (GTK_COMBO_BOX (widget), _("EAP"));
-    value = g_hash_table_lookup (settings->data, "method");
-    if (value) {
-agent
+key
-            gtk_combo_box_set_active (GTK_COMBO_BOX (widget), 0);
-        }
-eap
+agent
-            gtk_combo_box_set_active (GTK_COMBO_BOX (widget), 1);
-        }
-
-
+
+
+
+
-    if (gtk_combo_box_get_active (GTK_COMBO_BOX (widget)) == -1)
-    {
-        gtk_combo_box_set_active (GTK_COMBO_BOX (widget), 0);
-    }
-
-
-
-
-
-
-
-
-
-
+
+
-    
-    widget = glade_xml_get_widget (priv->xml, "usercert-label");
@@ -216 +230 @@
-    gtk_widget_set_no_show_all (widget, TRUE);
-    value = g_hash_table_lookup (settings->data, "usercert");
+    if (value)
+        gtk_file_chooser_set_filename (GTK_FILE_CHOOSER (widget), value);
+    g_signal_connect (G_OBJECT (widget), "selection-changed", G_CALLBACK (settings_changed_cb), self);
+    
+    widget = glade_xml_get_widget (priv->xml, "userkey-label");
+    gtk_widget_set_no_show_all (widget, TRUE);
+    widget = glade_xml_get_widget (priv->xml, "userkey-button");
+    gtk_widget_set_no_show_all (widget, TRUE);
+    value = g_hash_table_lookup (settings->data, "userkey");
-    if (value)
-        gtk_file_chooser_set_filename (GTK_FILE_CHOOSER (widget), value);
@@ -291 +314 @@
-    switch (gtk_combo_box_get_active (GTK_COMBO_BOX (widget)))
-    {
+        default:
-        case 0:
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-            widget = glade_xml_get_widget (priv->xml, "usercert-button");
-            str = (char *) gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (widget));
@@ -300 +336 @@
-            str = "agent";
-            break;
-1
+2
-            widget = glade_xml_get_widget (priv->xml, "user-entry");
-            str = (char *) gtk_entry_get_text (GTK_ENTRY (widget));

trunk/src/charon/plugins/nm/nm_service.c

@@ -20 +20 @@
-
-#include <daemon.h>
+#include <asn1/pem.h>
-#include <utils/host.h>
-#include <utils/identification.h>
@@ -175 +176 @@
-    auth_class_t auth_class = AUTH_CLASS_EAP;
-    certificate_t *cert = NULL;
+    bool agent = FALSE;
-    
-    /**
@@ -207 +209 @@
-        {
-            auth_class = AUTH_CLASS_PUBKEY;
+            agent = TRUE;
+        }
+        else if (streq(str, "key"))
+        {
+            auth_class = AUTH_CLASS_PUBKEY;
-        }
-    }
@@ -254 +261 @@
-            
-            cert = lib->creds->create(lib->creds, CRED_CERTIFICATE, CERT_X509,
-
+
+
+
-            str = g_hash_table_lookup(settings->data, "agent");
-
+agent && 
-            {
-                public = cert->get_public_key(cert);
@@ -267 +276 @@
-                                                 BUILD_END);
-                    public->destroy(public);
+                }
+            }
+            /* ... or key file */  
+            str = g_hash_table_lookup(settings->data, "userkey");
+            if (!agent && str && cert)
+            {
+                chunk_t secret, chunk;
+                bool pgp = FALSE;
+                
+                secret.ptr = g_hash_table_lookup(settings->data, "password");
+                if (secret.ptr)
+                {
+                    secret.len = strlen(secret.ptr);
+                }
+                if (pem_asn1_load_file(str, &secret, &chunk, &pgp))
+                {
+                    private = lib->creds->create(lib->creds, CRED_PRIVATE_KEY,
+                                KEY_RSA, BUILD_BLOB_ASN1_DER, chunk, BUILD_END);
+                    free(chunk.ptr);
-                }
-            }
@@ -360 +388 @@
-{
-    NMSettingVPN *settings;
-
+
+
+
-    
-    settings = NM_SETTING_VPN(nm_connection_get_setting(connection,
@@ -379 +409 @@
-            {
-                return FALSE;
+            }
+        }
+        else if (streq(method, "key"))
+        {
+            path = g_hash_table_lookup(settings->data, "userkey");
+            if (path)
+            {
+                secret.ptr = g_hash_table_lookup(settings->data, "password");
+                if (secret.ptr)
+                {
+                    secret.len = strlen(secret.ptr);
+                }
+                if (pem_asn1_load_file(path, &secret, &key, &pgp))
+                {
+                    free(key.ptr);
+                    return FALSE;
+                }
-            }
-        }