cli: update the existing connection on "dev wifi connect"lr/nm-d-wifi-con-update

If we find a matching connection, ensure it's exactly as we want it
before actually proceeding to activate it. Fixes this problem:

  # nmcli dev wifi connect "Network of Doom" password santa <-- bad
  Error: Connection activation failed: (7) Invalid secrets
  # nmcli dev wifi connect "Network of Doom" password satan <-- correct
  Error: Connection activation failed: (7) Invalid secrets

The password is now correct, but nmcli chose to re-activate the wrong
connection it created previously.

1 files changed, 49 insertions, 16 deletions

diff --git a/clients/cli/devices.c b/clients/cli/devices.c
index f2625eb68f..1e199d8af7 100644
--- a/clients/cli/devices.c
+++ b/clients/cli/devices.c
@@ -1838,12 +1838,14 @@ typedef struct {
 	NMDevice *device;
 	gboolean hotspot;
 	gboolean create;
+	char *specific_object;
 } AddAndActivateInfo;
 
 static void
 add_and_activate_info_free (AddAndActivateInfo *info)
 {
 	g_object_unref (info->device);
+	g_free (info->specific_object);
 	g_free (info);
 }
 
@@ -3125,6 +3127,35 @@ do_device_wifi_list (NmCli *nmc, int argc, char **argv)
 	return nmc->return_value;
 }
 
+static void
+activate_update2_cb (GObject *source_object, GAsyncResult *res, gpointer user_data)
+{
+	NMRemoteConnection *remote_con = NM_REMOTE_CONNECTION (source_object);
+	AddAndActivateInfo *info = (AddAndActivateInfo *) user_data;
+	NmCli *nmc = info->nmc;
+	gs_unref_variant GVariant *ret = NULL;
+	GError *error = NULL;
+
+	ret = nm_remote_connection_update2_finish (remote_con, res, &error);
+
+	if (!ret) {
+		g_string_printf (nmc->return_text, _("Error: %s."), error->message);
+		nmc->return_value = NMC_RESULT_ERROR_UNKNOWN;
+		g_error_free (error);
+		quit ();
+		add_and_activate_info_free (info);
+		return;
+	}
+
+	nm_client_activate_connection_async (nmc->client,
+	                                     NM_CONNECTION (remote_con),
+	                                     info->device,
+	                                     info->specific_object,
+	                                     NULL,
+	                                     add_and_activate_cb,
+	                                     info);
+}
+
 static NMCResultCode
 do_device_wifi_connect (NmCli *nmc, int argc, char **argv)
 {
@@ -3133,6 +3164,7 @@ do_device_wifi_connect (NmCli *nmc, int argc, char **argv)
 	NM80211ApFlags ap_flags;
 	NM80211ApSecurityFlags ap_wpa_flags;
 	NM80211ApSecurityFlags ap_rsn_flags;
+	NMRemoteConnection *remote_con = NULL;
 	NMConnection *connection = NULL;
 	NMSettingConnection *s_con;
 	NMSettingWireless *s_wifi;
@@ -3153,7 +3185,6 @@ do_device_wifi_connect (NmCli *nmc, int argc, char **argv)
 	char *passwd_ask = NULL;
 	const GPtrArray *avail_cons;
 	gboolean name_match = FALSE;
-	gboolean existing_con = FALSE;
 	int i;
 
 	/* Set default timeout waiting for operation completion. */
@@ -3402,19 +3433,19 @@ do_device_wifi_connect (NmCli *nmc, int argc, char **argv)
 			/* ap has been checked against bssid1, bssid2 and the ssid
 			 * and now avail_con has been checked against ap.
 			 */
-			connection = NM_CONNECTION (avail_con);
-			existing_con = TRUE;
+			remote_con = avail_con;
+			connection = NM_CONNECTION (remote_con);
 			break;
 		}
 	}
 
-	if (name_match && !existing_con) {
+	if (name_match && !remote_con) {
 		g_string_printf (nmc->return_text, _("Error: Connection '%s' exists but properties don't match."), con_name);
 		nmc->return_value = NMC_RESULT_ERROR_NOT_FOUND;
 		goto finish;
 	}
 
-	if (!existing_con) {
+	if (!remote_con) {
 		/* If there are some connection data from user, create a connection and
 		 * fill them into proper settings. */
 		if (con_name || private || bssid2_arr || hidden)
@@ -3533,20 +3564,22 @@ do_device_wifi_connect (NmCli *nmc, int argc, char **argv)
 	info->nmc = nmc;
 	info->device = g_object_ref (device);
 	info->hotspot = FALSE;
-	info->create = !existing_con;
-	if (existing_con) {
-		nm_client_activate_connection_async (nmc->client,
-		                                     connection,
-		                                     device,
-		                                     nm_object_get_path (NM_OBJECT (ap)),
-		                                     NULL,
-		                                     add_and_activate_cb,
-		                                     info);
+	info->create = !remote_con;
+	info->specific_object = g_strdup (nm_object_get_path (NM_OBJECT (ap)));
+
+	if (remote_con) {
+		nm_remote_connection_update2 (remote_con,
+		                              nm_connection_to_dbus (connection, NM_CONNECTION_SERIALIZE_ALL),
+		                              NM_SETTINGS_UPDATE2_FLAG_BLOCK_AUTOCONNECT,
+		                              NULL,
+		                              NULL,
+		                              activate_update2_cb,
+		                              info);
 	} else {
 		nm_client_add_and_activate_connection_async (nmc->client,
 		                                             connection,
-		                                             device,
-		                                             nm_object_get_path (NM_OBJECT (ap)),
+		                                             info->device,
+		                                             info->specific_object,
 		                                             NULL,
 		                                             add_and_activate_cb,
 		                                             info);