diff options
| author | Jiří Klimeš <jklimes@redhat.com> | 2015-11-10 14:46:57 +0100 |
|---|---|---|
| committer | Jiří Klimeš <jklimes@redhat.com> | 2015-11-18 10:34:59 +0100 |
| commit | 6bec8598a7497fc9e978d914ad6eaed9d8e15e8a (patch) | |
| tree | a8aceba32e4c631b488e72eabaebe1f2e7e47cf2 | |
| parent | 1a83664d38c88bc13166e57bdea86dcb51989abd (diff) | |
| download | NetworkManager-jk/con-add-verify-secrets-bgo757843.tar.gz | |
core: verify secrets when adding connection via D-Bus (bgo #757843)jk/con-add-verify-secrets-bgo757843
Fixes: dbbedce21f0dbb2849ed48bd2cee3b98e1ad2135
libnm: don't check for valid passwords in NMSetting:verify()
https://bugzilla.gnome.org/show_bug.cgi?id=757843
| -rw-r--r-- | src/settings/nm-settings.c | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/src/settings/nm-settings.c b/src/settings/nm-settings.c index bdea933249..d742333194 100644 --- a/src/settings/nm-settings.c +++ b/src/settings/nm-settings.c @@ -1407,7 +1407,11 @@ impl_settings_add_connection_helper (NMSettings *self, GError *error = NULL; connection = nm_simple_connection_new_from_dbus (settings, &error); + if (connection) { + if (!nm_connection_verify_secrets (connection, &error)) + goto failure; + nm_settings_add_connection_dbus (self, connection, save_to_disk, @@ -1415,10 +1419,12 @@ impl_settings_add_connection_helper (NMSettings *self, impl_settings_add_connection_add_cb, NULL); g_object_unref (connection); - } else { - g_assert (error); - g_dbus_method_invocation_take_error (context, error); + return; } + +failure: + g_assert (error); + g_dbus_method_invocation_take_error (context, error); } static void |