Changeset 4257

Timestamp:

08/19/08 17:19:45 (3 months ago)

Author:

martin

Message:

certificate based gateway authentication
prototype PSK user authentication with auth-dialog

Files:

• trunk/src/charon/plugins/nm/Makefile.am (modified) (1 diff)
• trunk/src/charon/plugins/nm/gnome/Makefile.am (modified) (1 diff)
• trunk/src/charon/plugins/nm/gnome/auth-dialog (added)
• trunk/src/charon/plugins/nm/gnome/auth-dialog/Makefile.am (added)
• trunk/src/charon/plugins/nm/gnome/auth-dialog/main.c (added)
• trunk/src/charon/plugins/nm/gnome/configure.in (modified) (1 diff)
• 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) (4 diffs)
• trunk/src/charon/plugins/nm/nm_creds.c (added)
• trunk/src/charon/plugins/nm/nm_creds.h (added)
• trunk/src/charon/plugins/nm/nm_plugin.c (modified) (5 diffs)
• trunk/src/charon/plugins/nm/nm_service.c (modified) (7 diffs)
• trunk/src/charon/plugins/nm/nm_service.h (modified) (2 diffs)

trunk/src/charon/plugins/nm/Makefile.am

@@ -6 +6 @@
-plugin_LTLIBRARIES = libstrongswan-nm.la
-libstrongswan_nm_la_SOURCES = \
-
+nm_creds.h nm_creds.c
-libstrongswan_nm_la_LDFLAGS = -module
-libstrongswan_nm_la_LIBADD = ${nm_LIBS}

trunk/src/charon/plugins/nm/gnome/Makefile.am

@@ -1 +1 @@
-AUTOMAKE_OPTIONS = foreign
-
-
+auth-dialog 
-
-dbusservicedir = $(sysconfdir)/dbus-1/system.d

trunk/src/charon/plugins/nm/gnome/configure.in

@@ -117 +117 @@
-Makefile
-properties/Makefile
+auth-dialog/Makefile
-po/Makefile.in
-])

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

@@ -79 +79 @@
-                    </child>
-                    <child>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-                      </packing>
-                    </child>
@@ -166 +159 @@
-                      <widget class="GtkComboBox" id="method-combo">
-                        <property name="visible">True</property>
-                        <property name="sensitive">False</property>
-                        <property name="has_tooltip">True</property>
-                        <property name="tooltip_text">Authentication Method to use for authentication against the Gateway. </property>

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

@@ -160 +160 @@
-    g_signal_connect (G_OBJECT (widget), "changed", G_CALLBACK (stuff_changed_cb), self);
-
+    widget = glade_xml_get_widget (priv->xml, "certificate-button");
+    if (!widget)
+        return FALSE;
+    value = g_hash_table_lookup (settings->data, "certificate");
+    if (value)
+        gtk_file_chooser_set_filename (GTK_FILE_CHOOSER (widget), value);
+    g_signal_connect (G_OBJECT (widget), "selection-changed", G_CALLBACK (stuff_changed_cb), self);
+
-    widget = glade_xml_get_widget (priv->xml, "user-entry");
-    if (!widget)
@@ -167 +175 @@
-        gtk_entry_set_text (GTK_ENTRY (widget), value);
-    g_signal_connect (G_OBJECT (widget), "changed", G_CALLBACK (stuff_changed_cb), self);
+
+    widget = glade_xml_get_widget (priv->xml, "method-combo");
+    if (!widget)
+        return FALSE;
+    gtk_combo_box_append_text (GTK_COMBO_BOX (widget), "EAP");
+    value = g_hash_table_lookup (settings->data, "method");
+    if (value) {
+        if (g_strcasecmp (value, "EAP") == 0) {
+            gtk_combo_box_set_active (GTK_COMBO_BOX (widget), 0);
+        }
+    }
+    g_signal_connect (G_OBJECT (widget), "changed", G_CALLBACK (stuff_changed_cb), self);
+    if (gtk_combo_box_get_active (GTK_COMBO_BOX (widget)) == -1)
+    {   /* default to EAP */    
+        gtk_combo_box_set_active (GTK_COMBO_BOX (widget), 0);
+    }   
-    
-    widget = glade_xml_get_widget (priv->xml, "virtual-check");
@@ -236 +260 @@
-    }
-
+    widget = glade_xml_get_widget (priv->xml, "certificate-button");
+    str = (char *) gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (widget));
+    if (str) {
+        g_hash_table_insert (settings->data, g_strdup ("certificate"), g_strdup(str));
+    }
+
-    widget = glade_xml_get_widget (priv->xml, "user-entry");
-    str = (char *) gtk_entry_get_text (GTK_ENTRY (widget));
@@ -242 +272 @@
-    }
-
+    widget = glade_xml_get_widget (priv->xml, "method-combo");
+    str = (char *) gtk_combo_box_get_active_text (GTK_COMBO_BOX (widget));
+    if (str) {
+        g_hash_table_insert (settings->data, g_strdup ("method"), g_strdup(str));
+    }
+    
-    widget = glade_xml_get_widget (priv->xml, "virtual-check");
-    active = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widget));

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

@@ -18 +18 @@
-#include "nm_plugin.h"
-#include "nm_service.h"
+#include "nm_creds.h"
-
-#include <daemon.h>
@@ -34 +35 @@
-    nm_plugin_t public;
-    
+    /**
+     * Glib main loop for a thread, handles DBUS calls
+     */
-    GMainLoop *loop;
+    
+    /**
+     * credential set registered at the daemon
+     */
+    nm_creds_t *creds;
-};
-
@@ -45 +54 @@
-    GMainLoop *loop;
-
-
+this->creds
-    
-    this->loop = loop = g_main_loop_new(NULL, FALSE);
@@ -65 +74 @@
-        g_main_loop_quit(this->loop);
-    }
+    charon->credentials->remove_set(charon->credentials, &this->creds->set);
+    this->creds->destroy(this->creds);
-    free(this);
-}
@@ -84 +95 @@
-    }
-    
+    this->creds = nm_creds_create();
+    charon->credentials->add_set(charon->credentials, &this->creds->set);
+    
-    charon->processor->queue_job(charon->processor, 
-         (job_t*)callback_job_create((callback_job_cb_t)run, this, NULL, NULL));

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

@@ -37 +37 @@
-    ike_sa_t *ike_sa;
-    NMVPNPlugin *plugin;
+    nm_creds_t *creds;
-} NMStrongswanPluginPrivate;
-
@@ -162 +163 @@
-                         GError **err)
-{
+    nm_creds_t *creds;
-    NMSettingVPN *settings;
-    identification_t *user = NULL;
@@ -178 +180 @@
-                                                        NM_TYPE_SETTING_VPN));
-    
-2
+1
-         nm_setting_to_string(NM_SETTING(settings)));
-    str = g_hash_table_lookup(settings->data, "user");
@@ -208 +210 @@
-    
-    /**
+     * Register credentials
+     */
+    creds = NM_STRONGSWAN_PLUGIN_GET_PRIVATE(plugin)->creds;
+     
+    str = g_hash_table_lookup(settings->data, "certificate");
+    if (str)
+    {
+        certificate_t *cert;
+        
+        cert = lib->creds->create(lib->creds, CRED_CERTIFICATE, CERT_X509,
+                                  BUILD_FROM_FILE, str, BUILD_END);
+        creds->set_certificate(creds, cert);
+    }
+    str = g_hash_table_lookup(settings->data, "password");
+    if (str)
+    {
+        creds->set_password(creds, str);
+    }
+    
+    /**
-     * Set up configurations
-     */
@@ -214 +236 @@
-    peer_cfg = peer_cfg_create(CONFIG_NAME, 2, ike_cfg, user,
-                    identification_create_from_encoding(ID_ANY, chunk_empty),
-UBKEY
+SK
-                    0, 0, 1, /* EAP method, vendor, keyingtries */
-                    18000, 0, /* rekey 5h, reauth none */
@@ -273 +295 @@
-                             char **setting_name, GError **error)
-{
+    NMSettingVPN *settings;
+    
+    settings = NM_SETTING_VPN(nm_connection_get_setting(connection,
+                                                        NM_TYPE_SETTING_VPN));
+    if (!g_hash_table_lookup(settings->data, "password"))
+    {
+        *setting_name = NM_SETTING_VPN_SETTING_NAME;
+        return TRUE;
+    }
-    return FALSE;
-}
@@ -328 +359 @@
- * Object constructor
- */
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+

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

@@ -28 +28 @@
-#include <nm-vpn-plugin.h>
-
+#include "nm_creds.h"
+
-#define NM_TYPE_STRONGSWAN_PLUGIN            (nm_strongswan_plugin_get_type ())
-#define NM_STRONGSWAN_PLUGIN(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), NM_TYPE_STRONGSWAN_PLUGIN, NMSTRONGSWANPlugin))
@@ -49 +51 @@
-GType nm_strongswan_plugin_get_type(void);
-
-void
+nm_creds_t *creds
-
-#endif /* NM_SERVICE_H_ */