fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-05-02 01:28:02 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

cli: enable secret-agent only after activation

Browse source 
Change the activation procedure for connections that require secrets
in the following way:

 - nmcli creates a secret-agent and leaves it disabled so that
   incoming requests are queued
 - nmcli calls ActivateConnection()
 - when the method returns success, the secret-agent gets enabled and
   all queued requests are processed

When the user activates a connection which is already auto-activating,
NM will deactivate the current active-connection and will call
CancelGetSecrets() for it before the new ActivateConnection()
returns. In this way, when the secret-agent is enabled by nmcli, we
have the guarantee that there aren't any queued requests for
the deactivating connections.

https://bugzilla.redhat.com/show_bug.cgi?id=1438476
This commit is contained in:
Beniamino Galvani 2017-10-27 15:12:33 +02:00
parent a25db64f7c
commit 61b666902b
1 changed files with 10 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
clients/cli/connections.c
View file

@ -2397,10 +2397,6 @@ nmc_activate_connection (NmCli *nmc,
NM_SECRET_AGENT_SIMPLE_REQUEST_SECRETS,
G_CALLBACK (nmc_secrets_requested),
nmc);
if (connection) {
nm_secret_agent_simple_enable (NM_SECRET_AGENT_SIMPLE (nmc->secret_agent),
nm_object_get_path (NM_OBJECT (connection)));
}
}
info = g_malloc0 (sizeof (ActivateConnectionInfo));
@ -6182,6 +6178,7 @@ typedef struct {
NMDevice *device;
NMActiveConnection *ac;
guint monitor_id;
NmCli *nmc;
} MonitorACInfo;
static gboolean nmc_editor_cb_called;
@ -6259,6 +6256,14 @@ progress_activation_editor_cb (gpointer user_data)
goto finish; /* we are done */
}
if (info->nmc->secret_agent) {
NMRemoteConnection *connection;
connection = nm_active_connection_get_connection (ac);
nm_secret_agent_simple_enable (NM_SECRET_AGENT_SIMPLE (info->nmc->secret_agent),
nm_object_get_path (NM_OBJECT (connection)));
}
return TRUE;
finish:
@ -6294,6 +6299,7 @@ activate_connection_editor_cb (GObject *client,
monitor_ac_info->device = g_object_ref (device);
monitor_ac_info->ac = active;
monitor_ac_info->monitor_id = g_timeout_add (120, progress_activation_editor_cb, monitor_ac_info);
monitor_ac_info->nmc = info->nmc;
} else
g_object_unref (active);
}