Merge lp:~tj/ubuntu/trusty/network-manager-openvpn/lp1252832 into lp:ubuntu/trusty/network-manager-openvpn

[TJ]

SRU to fix broken multiple gateway entry, taken from unreleased upstream commit (details in DEP-3 header of the patch)

[Bin Li (binli)]

I found the upstream already accepted the change.

c55ba4e core/ui: allow specifying port and protocol for gateways (bgo #712710)

And the patch looks good, hope we could apply it into ubuntu.

review: Approve

[Mathieu Trudel-Lapierre (cyphermox)]

It seems to me like you forgot to bzr add the patch file when preparing this merge.

Also, this should also be landing in utopic before landing in trusty; would you please prepare a similar merge for that release?

Thanks!

review: Needs Fixing

[Mathieu Trudel-Lapierre (cyphermox)]

This is still missing a patch file rather than changing the files directly.

However, disregard my previous comment about landing in utopic -- it's no longer a supported release.

review: Needs Resubmitting

Unmerged revisions

20. By TJ on 2014-08-11

core/ui: allow specifying port and protocol for gateways (bgo #712710)

=== modified file '.pc/applied-patches'
--- .pc/applied-patches	2014-03-06 16:43:05 +0000
+++ .pc/applied-patches	2014-08-11 03:15:24 +0000
@@ -3,3 +3,4 @@
 gtk_table_to_gtk_grid.patch
 enable_ipv6.patch
 support-ipv6-dns
+lp1252832_fix_multiple_gateways_entry.patch
 
=== modified file 'debian/changelog'
--- debian/changelog	2014-03-06 16:43:05 +0000
+++ debian/changelog	2014-08-11 03:15:24 +0000
@@ -1,3 +1,9 @@
+network-manager-openvpn (0.9.8.2-1ubuntu5) trusty; urgency=medium
+
+  * Fix entry of multiple gateways (LP: #1252832).
+
+ -- TJ <[e-mail]>  Mon, 11 Aug 2014 04:04:43 +0100
+
 network-manager-openvpn (0.9.8.2-1ubuntu4) trusty; urgency=medium
 
   * Fix IPv6 DNS support. Return IPv6 DNS servers are now passed to
 
=== modified file 'debian/patches/series'
--- debian/patches/series	2014-03-06 16:43:05 +0000
+++ debian/patches/series	2014-08-11 03:15:24 +0000
@@ -4,3 +4,4 @@
 gtk_table_to_gtk_grid.patch
 enable_ipv6.patch
 support-ipv6-dns
+lp1252832_fix_multiple_gateways_entry.patch
 
=== modified file 'properties/nm-openvpn-dialog.ui'
--- properties/nm-openvpn-dialog.ui	2013-05-06 18:03:37 +0000
+++ properties/nm-openvpn-dialog.ui	2014-08-11 03:15:24 +0000
@@ -1234,7 +1234,7 @@
                       <object class="GtkEntry" id="gateway_entry">
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
-                        <property name="tooltip_text" translatable="yes">Remote host name or IP address. You can specify multiple items for redundancy (use commas to separate the entries).
+                        <property name="tooltip_text" translatable="yes">Remote gateway(s), with optional port and protocol (e.g. ovpn.corp.com:1234:tcp). You can specify multiple hosts for redundancy (use commas or spaces as delimiters).
 config: remote</property>
                       </object>
                     </child>
 
=== modified file 'properties/nm-openvpn.c'
--- properties/nm-openvpn.c	2014-03-06 11:58:16 +0000
+++ properties/nm-openvpn.c	2014-08-11 03:15:24 +0000
@@ -127,6 +127,51 @@
 	return etype;
 }
 
+/* Example: abc.com:1234:udp, ovpnserver.company.com:443, vpn.example.com::tcp */
+static gboolean
+check_gateway_entry (const char *str)
+{
+	char **list, **iter;
+	char *host, *port, *proto;
+	long int port_int;
+	gboolean success = FALSE;
+
+	if (!str || !*str)
+		return FALSE;
+
+	list = g_strsplit_set (str, " \t,", -1);
+	for (iter = list; iter && *iter; iter++) {
+		if (!**iter)
+			continue;
+		host = g_strstrip (*iter);
+		port = strchr (host, ':');
+		proto = port ? strchr (port + 1, ':') : NULL;
+		if (port)
+			*port++ = '\0';
+		if (proto)
+			*proto++ = '\0';
+
+		/* check hostname */
+		if (!host || !*host)
+			goto out;
+		/* check port */
+		if (port && *port) {
+			char *end;
+			errno = 0;
+			port_int = strtol (port, &end, 10);
+			if (errno != 0 || *end != '\0' || port_int < 1 || port_int > 65535)
+				goto out;
+		}
+		/* check proto */
+		if (proto && strcmp (proto, "udp") && strcmp (proto, "tcp"))
+			goto out;
+	}
+	success = TRUE;
+out:
+	g_strfreev (list);
+	return success;
+}
+
 static gboolean
 check_validity (OpenvpnPluginUiWidget *self, GError **error)
 {
@@ -136,10 +181,17 @@
 	GtkTreeModel *model;
 	GtkTreeIter iter;
 	const char *contype = NULL;
+	GdkRGBA rgba;
+	gboolean gateway_valid;
 
 	widget = GTK_WIDGET (gtk_builder_get_object (priv->builder, "gateway_entry"));
 	str = gtk_entry_get_text (GTK_ENTRY (widget));
-	if (!str || !strlen (str)) {
+	gateway_valid = check_gateway_entry (str);
+	/* Change entry background colour while editing */
+	if (!gateway_valid)
+		gdk_rgba_parse (&rgba, "red3");
+	gtk_widget_override_background_color (widget, GTK_STATE_NORMAL, !gateway_valid ? &rgba : NULL);
+	if (!gateway_valid) {
 		g_set_error (error,
 		             OPENVPN_PLUGIN_UI_ERROR,
 		             OPENVPN_PLUGIN_UI_ERROR_INVALID_PROPERTY,
 
=== modified file 'src/nm-openvpn-service.c'
--- src/nm-openvpn-service.c	2013-05-06 18:03:37 +0000
+++ src/nm-openvpn-service.c	2014-08-11 03:15:24 +0000
@@ -777,14 +777,48 @@
 	add_openvpn_arg (args, openvpn_binary);
 
 	tmp = nm_setting_vpn_get_data_item (s_vpn, NM_OPENVPN_KEY_REMOTE);
-	if (tmp && strlen (tmp)) {
-		char *tok;
-		while ((tok = strsep((char**)&tmp, " ,")) != NULL) {
-			if (strlen(tok)) {
+	if (tmp && *tmp) {
+		char *tok, *port, *proto;
+		char *tmp_dup = strdup (tmp);
+		while ((tok = strsep (&tmp_dup, " \t,")) != NULL) {
+			if (*tok) {
+				port = strchr (tok, ':');
+				proto = port ? strchr (port + 1, ':') : NULL;
+				if (port)
+					*port++ = '\0';
+				if (proto)
+					*proto++ = '\0';
+
 				add_openvpn_arg (args, "--remote");
 				add_openvpn_arg (args, tok);
+				if (port) {
+					if (!add_openvpn_arg_int (args, port)) {
+						g_set_error (error,
+						             NM_VPN_PLUGIN_ERROR,
+						             NM_VPN_PLUGIN_ERROR_BAD_ARGUMENTS,
+						             _("Invalid port number '%s'."), port);
+						free_openvpn_args (args);
+						g_free (tmp_dup);
+						return FALSE;
+					}
+				} else
+					add_openvpn_arg (args, "1194"); /* use default IANA port */
+				if (proto) {
+					if (!strcmp (proto, "udp") || !strcmp (proto, "tcp"))
+						add_openvpn_arg (args, proto);
+					else {
+						g_set_error (error,
+						             NM_VPN_PLUGIN_ERROR,
+						             NM_VPN_PLUGIN_ERROR_BAD_ARGUMENTS,
+						             _("Invalid proto '%s'."), proto);
+						free_openvpn_args (args);
+						g_free (tmp_dup);
+						return FALSE;
+					}
+				}
 			}
 		}
+		g_free (tmp_dup);
 	}
 
 	/* Remote random */