colin/NetworkManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

libnm-glib: don't fail creating connection in NMVPNPlugin

Browse Source 
The connection should be created best-effort. If the connection doesn't
validate, the request can still make sense for the plugin.
This commit is contained in:
Thomas Haller
2016-03-26 13:18:30 +01:00
parent fbb1662269
commit 0578be928b
1 changed files with 4 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
libnm-glib/nm-vpn-plugin.c
View File

@@ -29,6 +29,7 @@
#include "nm-utils.h" #include "nm-utils.h"
#include "nm-connection.h" #include "nm-connection.h"
#include "nm-dbus-glib-types.h" #include "nm-dbus-glib-types.h"
#include "nm-setting-private.h"
static gboolean impl_vpn_plugin_connect (NMVPNPlugin *plugin, static gboolean impl_vpn_plugin_connect (NMVPNPlugin *plugin,
GHashTable *connection, GHashTable *connection,
@@ -452,13 +453,7 @@ _connect_generic (NMVPNPlugin *plugin,
return FALSE; return FALSE;
} }
connection = nm_connection_new_from_hash (properties, &local); connection = _nm_connection_new_from_hash (properties);
if (!connection) {
g_set_error (error, NM_VPN_PLUGIN_ERROR, NM_VPN_PLUGIN_ERROR_BAD_ARGUMENTS,
"Invalid connection: %s", local->message);
g_clear_error (&local);
return FALSE;
}
priv->interactive = FALSE; priv->interactive = FALSE;
if (details && !vpn_class->connect_interactive) { if (details && !vpn_class->connect_interactive) {
@@ -526,22 +521,11 @@ impl_vpn_plugin_need_secrets (NMVPNPlugin *plugin,
char *sn = NULL; char *sn = NULL;
GError *ns_err = NULL; GError *ns_err = NULL;
gboolean needed = FALSE; gboolean needed = FALSE;
GError *cnfh_err = NULL;
g_return_val_if_fail (NM_IS_VPN_PLUGIN (plugin), FALSE); g_return_val_if_fail (NM_IS_VPN_PLUGIN (plugin), FALSE);
g_return_val_if_fail (properties != NULL, FALSE); g_return_val_if_fail (properties != NULL, FALSE);
connection = nm_connection_new_from_hash (properties, &cnfh_err); connection = _nm_connection_new_from_hash (properties);
if (!connection) {
g_set_error (err,
NM_VPN_PLUGIN_ERROR,
NM_VPN_PLUGIN_ERROR_CONNECTION_INVALID,
"The connection was invalid: '%s' / '%s' invalid.",
g_type_name (nm_connection_lookup_setting_type_by_quark (cnfh_err->domain)),
cnfh_err->message);
g_error_free (cnfh_err);
return FALSE;
}
if (!NM_VPN_PLUGIN_GET_CLASS (plugin)->need_secrets) { if (!NM_VPN_PLUGIN_GET_CLASS (plugin)->need_secrets) {
*setting_name = ""; *setting_name = "";
@@ -581,7 +565,6 @@ impl_vpn_plugin_new_secrets (NMVPNPlugin *plugin,
{ {
NMVPNPluginPrivate *priv = NM_VPN_PLUGIN_GET_PRIVATE (plugin); NMVPNPluginPrivate *priv = NM_VPN_PLUGIN_GET_PRIVATE (plugin);
NMConnection *connection; NMConnection *connection;
GError *local = NULL;
gboolean success; gboolean success;
if (priv->state != NM_VPN_SERVICE_STATE_STARTING) { if (priv->state != NM_VPN_SERVICE_STATE_STARTING) {
@@ -591,14 +574,7 @@ impl_vpn_plugin_new_secrets (NMVPNPlugin *plugin,
return FALSE; return FALSE;
} }
connection = nm_connection_new_from_hash (properties, &local); connection = _nm_connection_new_from_hash (properties);
if (!connection) {
g_set_error (error, NM_VPN_PLUGIN_ERROR, NM_VPN_PLUGIN_ERROR_BAD_ARGUMENTS,
"Invalid connection: %s",
local->message);
g_clear_error (&local);
return FALSE;
}
if (!NM_VPN_PLUGIN_GET_CLASS (plugin)->new_secrets) { if (!NM_VPN_PLUGIN_GET_CLASS (plugin)->new_secrets) {
g_set_error_literal (error, NM_VPN_PLUGIN_ERROR, NM_VPN_PLUGIN_ERROR_INTERACTIVE_NOT_SUPPORTED, g_set_error_literal (error, NM_VPN_PLUGIN_ERROR, NM_VPN_PLUGIN_ERROR_INTERACTIVE_NOT_SUPPORTED,