Imported Upstream version 0.8.9997upstream/0.8.9997

6 files changed, 74 insertions, 19 deletions

diff --git a/callouts/nm-dispatcher-utils.c b/callouts/nm-dispatcher-utils.c
index 97ee1a4be..887e80dda 100644
--- a/callouts/nm-dispatcher-utils.c
+++ b/callouts/nm-dispatcher-utils.c
@@ -410,6 +410,12 @@ nm_dispatcher_utils_construct_envp (const char *action,
 	if (!strcmp (action, "hostname"))
 		return g_new0 (char *, 1);
 
+	/* Canonicalize the VPN interface name; "" is used when passing it through
+	 * D-Bus so make sure that's fixed up here.
+	 */
+	if (vpn_ip_iface && !strlen (vpn_ip_iface))
+		vpn_ip_iface = NULL;
+
 	con_setting_hash = g_hash_table_lookup (connection_hash, NM_SETTING_CONNECTION_SETTING_NAME);
 	if (!con_setting_hash) {
 		g_warning ("Failed to read connection setting");
@@ -437,6 +443,8 @@ nm_dispatcher_utils_construct_envp (const char *action,
 		return NULL;
 	}
 	iface = g_value_get_string (value);
+	if (iface && !strlen (iface))
+		iface = NULL;
 
 	/* IP interface name */
 	value = g_hash_table_lookup (device_props, NMD_DEVICE_PROPS_IP_INTERFACE);
diff --git a/callouts/tests/dispatcher-old-down b/callouts/tests/dispatcher-old-down
index 4210921d3..6396287f7 100644
--- a/callouts/tests/dispatcher-old-down
+++ b/callouts/tests/dispatcher-old-down
@@ -1,6 +1,6 @@
 [main]
 action=down
-iface=wlan0
+expected-iface=wlan0
 uuid=3fd2a33a-d81b-423f-ae99-e6baba742311
 id=Random Connection
 
diff --git a/callouts/tests/dispatcher-old-up b/callouts/tests/dispatcher-old-up
index ed15fef54..76e3be8de 100644
--- a/callouts/tests/dispatcher-old-up
+++ b/callouts/tests/dispatcher-old-up
@@ -1,6 +1,6 @@
 [main]
 action=up
-iface=wlan0
+expected-iface=wlan0
 uuid=3fd2a33a-d81b-423f-ae99-e6baba742311
 id=Random Connection
 
diff --git a/callouts/tests/dispatcher-old-vpn-down b/callouts/tests/dispatcher-old-vpn-down
index b45d8ea85..c11cbfd1e 100644
--- a/callouts/tests/dispatcher-old-vpn-down
+++ b/callouts/tests/dispatcher-old-vpn-down
@@ -1,6 +1,6 @@
 [main]
 action=vpn-down
-iface=tun0
+expected-iface=tun0
 uuid=355653c0-34d3-4777-ad25-f9a498b7ef8e
 id=Random Connection
 
diff --git a/callouts/tests/dispatcher-old-vpn-up b/callouts/tests/dispatcher-old-vpn-up
index f3b502def..ad47c91d5 100644
--- a/callouts/tests/dispatcher-old-vpn-up
+++ b/callouts/tests/dispatcher-old-vpn-up
@@ -1,6 +1,6 @@
 [main]
 action=vpn-up
-iface=tun0
+expected-iface=tun0
 uuid=355653c0-34d3-4777-ad25-f9a498b7ef8e
 id=Random Connection
 
diff --git a/callouts/tests/test-dispatcher-envp.c b/callouts/tests/test-dispatcher-envp.c
index b4dbd784a..34b9dbf54 100644
--- a/callouts/tests/test-dispatcher-envp.c
+++ b/callouts/tests/test-dispatcher-envp.c
@@ -130,18 +130,21 @@ static gboolean
 parse_main (GKeyFile *kf,
             GHashTable **out_con_hash,
             GHashTable **out_con_props,
-            char **out_iface,
+            char **out_expected_iface,
             char **out_action,
+            char **out_vpn_ip_iface,
             GError **error)
 {
 	char *uuid, *id;
 	NMConnection *connection;
 	NMSettingConnection *s_con;
 
-	*out_iface = g_key_file_get_string (kf, "main", "iface", error);
-	if (*out_iface == NULL)
+	*out_expected_iface = g_key_file_get_string (kf, "main", "expected-iface", error);
+	if (*out_expected_iface == NULL)
 		return FALSE;
 
+	*out_vpn_ip_iface = g_key_file_get_string (kf, "main", "vpn-ip-iface", NULL);
+
 	*out_action = g_key_file_get_string (kf, "main", "action", error);
 	if (*out_action == NULL)
 		return FALSE;
@@ -413,7 +416,7 @@ get_dispatcher_file (const char *file,
                      GHashTable **out_device_ip6_props,
                      GHashTable **out_device_dhcp4_props,
                      GHashTable **out_device_dhcp6_props,
-                     const char **out_vpn_ip_iface,
+                     char **out_vpn_ip_iface,
                      GHashTable **out_vpn_ip4_props,
                      GHashTable **out_vpn_ip6_props,
                      char **out_expected_iface,
@@ -429,7 +432,13 @@ get_dispatcher_file (const char *file,
 	if (!g_key_file_load_from_file (kf, file, G_KEY_FILE_NONE, error))
 		return FALSE;
 
-	if (!parse_main (kf, out_con_hash, out_con_props, out_expected_iface, out_action, error))
+	if (!parse_main (kf,
+	                 out_con_hash,
+	                 out_con_props,
+	                 out_expected_iface,
+	                 out_action,
+	                 out_vpn_ip_iface,
+	                 error))
 		goto out;
 
 	if (!parse_device (kf, out_device_props, error))
@@ -474,7 +483,7 @@ out:
 /*******************************************/
 
 static void
-test_generic (const char *path, const char *file)
+test_generic (const char *path, const char *file, const char *override_vpn_ip_iface)
 {
 	GHashTable *con_hash = NULL;
 	GHashTable *con_props = NULL;
@@ -483,7 +492,7 @@ test_generic (const char *path, const char *file)
 	GHashTable *device_ip6_props = NULL;
 	GHashTable *device_dhcp4_props = NULL;
 	GHashTable *device_dhcp6_props = NULL;
-	const char *vpn_ip_iface = NULL;
+	char *vpn_ip_iface = NULL;
 	GHashTable *vpn_ip4_props = NULL;
 	GHashTable *vpn_ip6_props = NULL;
 	char *expected_iface = NULL;
@@ -525,25 +534,31 @@ test_generic (const char *path, const char *file)
 	                                           device_ip6_props,
 	                                           device_dhcp4_props,
 	                                           device_dhcp6_props,
-	                                           vpn_ip_iface,
+	                                           override_vpn_ip_iface ? override_vpn_ip_iface : vpn_ip_iface,
 	                                           vpn_ip4_props,
 	                                           vpn_ip6_props,
 	                                           &out_iface);
 
 	/* Print out environment for now */
-	g_message ("\n");
+#ifdef DEBUG
+	g_message ("\n******* Generated environment:");
 	for (iter = denv; iter && *iter; iter++)
 		g_message ("   %s", *iter);
+#endif
 
-	g_assert_cmpint (g_strv_length (denv), ==, g_hash_table_size (expected_env));
-
+#ifdef DEBUG
 	{
 		GHashTableIter k;
 		const char *key;
+
+		g_message ("\n******* Expected environment:");
 		g_hash_table_iter_init (&k, expected_env);
 		while (g_hash_table_iter_next (&k, (gpointer) &key, NULL))
 			g_message ("   %s", key);
 	}
+#endif
+
+	g_assert_cmpint (g_strv_length (denv), ==, g_hash_table_size (expected_env));
 
 	/* Compare dispatcher generated env and expected env */
 	for (iter = denv; iter && *iter; iter++) {
@@ -556,6 +571,27 @@ test_generic (const char *path, const char *file)
 	}
 
 	g_assert_cmpstr (expected_iface, ==, out_iface);
+
+	g_free (out_iface);
+	g_free (vpn_ip_iface);
+	g_free (expected_iface);
+	g_free (action);
+	g_hash_table_destroy (con_hash);
+	g_hash_table_destroy (con_props);
+	g_hash_table_destroy (device_props);
+	if (device_ip4_props)
+		g_hash_table_destroy (device_ip4_props);
+	if (device_ip6_props)
+		g_hash_table_destroy (device_ip6_props);
+	if (device_dhcp4_props)
+		g_hash_table_destroy (device_dhcp4_props);
+	if (device_dhcp6_props)
+		g_hash_table_destroy (device_dhcp6_props);
+	if (vpn_ip4_props)
+		g_hash_table_destroy (vpn_ip4_props);
+	if (vpn_ip6_props)
+		g_hash_table_destroy (vpn_ip6_props);
+	g_hash_table_destroy (expected_env);
 }
 
 /*******************************************/
@@ -563,25 +599,34 @@ test_generic (const char *path, const char *file)
 static void
 test_old_up (const char *path)
 {
-	test_generic (path, "dispatcher-old-up");
+	test_generic (path, "dispatcher-old-up", NULL);
 }
 
 static void
 test_old_down (const char *path)
 {
-	test_generic (path, "dispatcher-old-down");
+	test_generic (path, "dispatcher-old-down", NULL);
 }
 
 static void
 test_old_vpn_up (const char *path)
 {
-	test_generic (path, "dispatcher-old-vpn-up");
+	test_generic (path, "dispatcher-old-vpn-up", NULL);
 }
 
 static void
 test_old_vpn_down (const char *path)
 {
-	test_generic (path, "dispatcher-old-vpn-down");
+	test_generic (path, "dispatcher-old-vpn-down", NULL);
+}
+
+static void
+test_up_empty_vpn_iface (const char *path)
+{
+	/* Test that an empty VPN iface variable, like is passed through D-Bus
+	 * from NM, is ignored by the dispatcher environment construction code.
+	 */
+	test_generic (path, "dispatcher-old-up", "");
 }
 
 /*******************************************/
@@ -610,6 +655,8 @@ int main (int argc, char **argv)
 	g_test_suite_add (suite, TESTCASE (test_old_vpn_up, argv[1]));
 	g_test_suite_add (suite, TESTCASE (test_old_vpn_down, argv[1]));
 
+	g_test_suite_add (suite, TESTCASE (test_up_empty_vpn_iface, argv[1]));
+
 	return g_test_run ();
 }