Commit 224acba8 authored by Lubomir Rintel's avatar Lubomir Rintel 🥕

cli,vpn: merge branch 'lr/nm-1-0-fixes'

Fixes for various issues identified during 1.0 testing.

https://bugzilla.gnome.org/show_bug.cgi?id=740135
parents 1706bd03 991df804
......@@ -142,11 +142,12 @@ static NMCResultCode
do_agent_secret (NmCli *nmc, int argc, char **argv)
{
/* Create secret agent */
nmc->secret_agent = nm_secret_agent_simple_new ("nmcli-agent", NULL);
nmc->secret_agent = nm_secret_agent_simple_new ("nmcli-agent");
if (nmc->secret_agent) {
/* We keep running */
nmc->should_wait = TRUE;
nm_secret_agent_simple_enable (nmc->secret_agent);
g_signal_connect (nmc->secret_agent, "request-secrets", G_CALLBACK (secrets_requested), nmc);
g_print (_("nmcli successfully registered as a NetworkManager's secret agent.\n"));
} else {
......
......@@ -1175,7 +1175,8 @@ nmc_active_connection_details (NMActiveConnection *acon, NmCli *nmc)
NMSettingConnection *s_con;
NMSettingVpn *s_vpn;
NMVpnConnectionState vpn_state;
char *type_str, *banner_str, *vpn_state_str;
char *type_str, *banner_str = NULL, *vpn_state_str;
const char *banner;
const char *username = NULL;
char **vpn_data_array = NULL;
guint32 items_num;
......@@ -1208,7 +1209,9 @@ nmc_active_connection_details (NMActiveConnection *acon, NmCli *nmc)
}
type_str = get_vpn_connection_type (con);
banner_str = g_strescape (nm_vpn_connection_get_banner (NM_VPN_CONNECTION (acon)), "");
banner = nm_vpn_connection_get_banner (NM_VPN_CONNECTION (acon));
if (banner)
banner_str = g_strescape (banner, "");
vpn_state = nm_vpn_connection_get_vpn_state (NM_VPN_CONNECTION (acon));
vpn_state_str = g_strdup_printf ("%d - %s", vpn_state, vpn_connection_state_to_string (vpn_state));
......@@ -1777,6 +1780,14 @@ active_connection_state_cb (NMActiveConnection *active, GParamSpec *pspec, gpoin
const GPtrArray *devices;
NMDevice *device;
if (nmc->secret_agent) {
NMRemoteConnection *connection = nm_active_connection_get_connection (active);
const gchar *path = nm_connection_get_path (NM_CONNECTION (connection));
nm_secret_agent_simple_set_connection_path (nmc->secret_agent, path);
nm_secret_agent_simple_enable (nmc->secret_agent);
}
devices = nm_active_connection_get_devices (active);
device = devices->len ? g_ptr_array_index (devices, 0) : NULL;
if ( device
......@@ -2161,9 +2172,16 @@ nmc_activate_connection (NmCli *nmc,
nmc->pwds_hash = pwds_hash;
/* Create secret agent */
nmc->secret_agent = nm_secret_agent_simple_new ("nmcli-connect", nm_object_get_path (NM_OBJECT (connection)));
if (nmc->secret_agent)
nmc->secret_agent = nm_secret_agent_simple_new ("nmcli-connect");
if (nmc->secret_agent) {
g_signal_connect (nmc->secret_agent, "request-secrets", G_CALLBACK (secrets_requested), nmc);
if (connection) {
const gchar *path = nm_object_get_path (NM_OBJECT (connection));
nm_secret_agent_simple_set_connection_path (nmc->secret_agent, path);
nm_secret_agent_simple_enable (nmc->secret_agent);
}
}
info = g_malloc0 (sizeof (ActivateConnectionInfo));
info->nmc = nmc;
......@@ -2221,8 +2239,14 @@ do_connection_up (NmCli *nmc, int argc, char **argv)
next_arg (&argc, &argv);
}
if (name)
if (name) {
connection = nmc_find_connection (nmc->connections, selector, name, NULL);
if (!connection) {
g_string_printf (nmc->return_text, _("Error: Connection '%s' does not exist."), name);
nmc->return_value = NMC_RESULT_ERROR_NOT_FOUND;
goto error;
}
}
while (argc > 0) {
if (strcmp (*argv, "ifname") == 0) {
......
......@@ -63,6 +63,7 @@ typedef struct {
GHashTable *requests;
char *path;
gboolean enabled;
} NMSecretAgentSimplePrivate;
static void
......@@ -451,14 +452,6 @@ nm_secret_agent_simple_get_secrets (NMSecretAgent *agent,
return;
}
if (priv->path && g_strcmp0 (priv->path, connection_path) != 0) {
/* We only handle requests for connection with @path if set. */
error = g_error_new (NM_SECRET_AGENT_ERROR, NM_SECRET_AGENT_ERROR_FAILED,
"Request for %s secrets doesn't match path %s",
request_id, priv->path);
goto nope;
}
s_con = nm_connection_get_setting_connection (connection);
connection_type = nm_setting_connection_get_connection_type (s_con);
......@@ -485,7 +478,8 @@ nm_secret_agent_simple_get_secrets (NMSecretAgent *agent,
request->request_id = request_id;
g_hash_table_replace (priv->requests, request->request_id, request);
request_secrets_from_ui (request);
if (priv->enabled)
request_secrets_from_ui (request);
}
/**
......@@ -588,6 +582,59 @@ nm_secret_agent_simple_delete_secrets (NMSecretAgent *agent,
callback (agent, connection, NULL, callback_data);
}
/**
* nm_secret_agent_simple_set_connection_path:
* @agent: the #NMSecretAgentSimple
* @path: the path of the connection the agent handle secrets for
*
* Sets the path for a new #NMSecretAgentSimple.
*/
void
nm_secret_agent_simple_set_connection_path (NMSecretAgent *agent, const char *path)
{
NMSecretAgentSimplePrivate *priv = NM_SECRET_AGENT_SIMPLE_GET_PRIVATE (agent);
g_free (priv->path);
priv->path = g_strdup (path);
}
/**
* nm_secret_agent_simple_enable:
* @agent: the #NMSecretAgentSimple
*
* Enables servicing the requests including the already queued ones.
*/
void
nm_secret_agent_simple_enable (NMSecretAgent *agent)
{
NMSecretAgentSimplePrivate *priv = NM_SECRET_AGENT_SIMPLE_GET_PRIVATE (agent);
GList *requests, *iter;
GError *error;
if (priv->enabled)
return;
priv->enabled = TRUE;
/* Service pending secret requests. */
requests = g_hash_table_get_values (priv->requests);
for (iter = requests; iter; iter = g_list_next (iter)) {
NMSecretAgentSimpleRequest *request = iter->data;
if (!g_str_has_prefix (request->request_id, priv->path)) {
request_secrets_from_ui (request);
} else {
/* We only handle requests for connection with @path if set. */
error = g_error_new (NM_SECRET_AGENT_ERROR, NM_SECRET_AGENT_ERROR_FAILED,
"Request for %s secrets doesn't match path %s",
request->request_id, priv->path);
request->callback (agent, request->connection, NULL, error, request->callback_data);
g_hash_table_remove (priv->requests, request->request_id);
g_error_free (error);
}
}
g_list_free (requests);
}
void
nm_secret_agent_simple_class_init (NMSecretAgentSimpleClass *klass)
{
......@@ -639,22 +686,21 @@ nm_secret_agent_simple_class_init (NMSecretAgentSimpleClass *klass)
/**
* nm_secret_agent_simple_new:
* @name: the identifier of secret agent
* @path: (allow-none): the path of the connection the agent handle secrets for,
* or %NULL to handle requests for all connections
*
* Creates a new #NMSecretAgentSimple.
* Creates a new #NMSecretAgentSimple. It does not serve any requests until
* nm_secret_agent_simple_enable() is called.
*
* Returns: a new #NMSecretAgentSimple
* Returns: a new #NMSecretAgentSimple if the agent creation is successful
* or %NULL in case of a failure.
*/
NMSecretAgent *
nm_secret_agent_simple_new (const char *name, const char *path)
nm_secret_agent_simple_new (const char *name)
{
NMSecretAgent *agent;
agent = g_initable_new (NM_TYPE_SECRET_AGENT_SIMPLE, NULL, NULL,
NM_SECRET_AGENT_IDENTIFIER, name,
NULL);
NM_SECRET_AGENT_SIMPLE_GET_PRIVATE (agent)->path = g_strdup (path);
return agent;
}
......@@ -47,10 +47,13 @@ typedef struct {
GType nm_secret_agent_simple_get_type (void);
NMSecretAgent *nm_secret_agent_simple_new (const char *name, const char *path);
NMSecretAgent *nm_secret_agent_simple_new (const char *name);
void nm_secret_agent_simple_response (NMSecretAgentSimple *self,
const char *request_id,
GPtrArray *secrets);
void nm_secret_agent_simple_set_connection_path (NMSecretAgent *agent,
const char *path);
void nm_secret_agent_simple_enable (NMSecretAgent *agent);
G_END_DECLS
......
......@@ -145,8 +145,15 @@ activate_connection (NMConnection *connection,
label = nmt_newt_label_new (_("Connecting..."));
nmt_newt_form_set_content (form, label);
agent = nm_secret_agent_simple_new ("nmtui", nm_object_get_path (NM_OBJECT (connection)));
g_signal_connect (agent, "request-secrets", G_CALLBACK (secrets_requested), NULL);
agent = nm_secret_agent_simple_new ("nmtui");
if (agent) {
if (connection) {
nm_secret_agent_simple_set_connection_path (agent,
nm_object_get_path (NM_OBJECT (connection)));
nm_secret_agent_simple_enable (agent);
}
g_signal_connect (agent, "request-secrets", G_CALLBACK (secrets_requested), NULL);
}
specific_object_path = specific_object ? nm_object_get_path (specific_object) : NULL;
......@@ -182,6 +189,16 @@ activate_connection (NMConnection *connection,
goto done;
}
if (!connection) {
connection = NM_CONNECTION (nm_active_connection_get_connection (ac));
if (connection) {
const gchar *path = nm_object_get_path (NM_OBJECT (connection));
nm_secret_agent_simple_set_connection_path (agent, path);
nm_secret_agent_simple_enable (agent);
}
}
/* Now wait for the connection to actually reach the ACTIVATED state,
* allowing the user to cancel if it takes too long.
*/
......
......@@ -818,9 +818,12 @@ recheck_pending_activations (NMManager *self)
devices = nm_active_connection_get_devices (candidate);
if (devices->len == 0)
continue;
device = devices->pdata[0];
if (nm_device_get_active_connection (device) != candidate)
continue;
if (!NM_IS_VPN_CONNECTION (candidate)) {
device = devices->pdata[0];
if (nm_device_get_active_connection (device) != candidate)
continue;
}
activate_info_complete (info, candidate, NULL);
break;
......
......@@ -54,7 +54,7 @@ typedef struct {
#define VPN_CONNECTION_GROUP "VPN Connection"
static gboolean start_pending_vpn (NMVpnService *self);
static gboolean start_pending_vpn (NMVpnService *self, GError **error);
NMVpnService *
nm_vpn_service_new (const char *namefile, GError **error)
......@@ -130,7 +130,7 @@ connection_vpn_state_changed (NMVpnConnection *connection,
g_signal_handlers_disconnect_by_func (connection, G_CALLBACK (connection_vpn_state_changed), self);
if (connection == priv->active) {
priv->active = NULL;
start_pending_vpn (self);
start_pending_vpn (self, NULL);
} else
priv->pending = g_slist_remove (priv->pending, connection);
g_object_unref (connection);
......@@ -253,7 +253,7 @@ start_active_vpn (NMVpnService *self, GError **error)
}
static gboolean
start_pending_vpn (NMVpnService *self)
start_pending_vpn (NMVpnService *self, GError **error)
{
NMVpnServicePrivate *priv = NM_VPN_SERVICE_GET_PRIVATE (self);
......@@ -266,7 +266,7 @@ start_pending_vpn (NMVpnService *self)
priv->active = g_slist_nth_data (priv->pending, 0);
priv->pending = g_slist_remove (priv->pending, priv->active);
return start_active_vpn (self, NULL);
return start_active_vpn (self, error);
}
gboolean
......@@ -300,7 +300,7 @@ nm_vpn_service_activate (NMVpnService *service,
}
/* Otherwise start the next VPN */
return start_pending_vpn (service);
return start_pending_vpn (service, error);
}
static void
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment