mirror of
https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git
synced 2026-01-06 21:20:20 +01:00
e2d88f59e6
The core problem was that the Update would trigger a write to disk to save the connection's new settings, which called nm_settings_connection_replace_settings(). Which saved existing transient (agent/unsaved) secrets, replaced settings with the new ones from Update(), then copied back the old transient secrets. This was to ensure that changes triggered from getting agent secrets during activation (which might write the connection out to disk if new system secrets were provided, which triggered an inotify read-back of the connection, which blew away the transient secrets just returned from the agent) didn't blow away transient secrets. Unfortunately that fix was too general. As a quick hack for now, copy the new secrets and re-apply them after nm_connection_replace_settings() has run. We'll do the actual fix later, but it's more involved and needs more testing so we don't want to apply it this close to release.
706 lines
24 KiB
C
706 lines
24 KiB
C
/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */
|
|
/*
|
|
*
|
|
* This program is free software; you can redistribute it and/or modify
|
|
* it under the terms of the GNU General Public License as published by
|
|
* the Free Software Foundation; either version 2, or (at your option)
|
|
* any later version.
|
|
*
|
|
* This program is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
* GNU General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU General Public License along
|
|
* with this program; if not, write to the Free Software Foundation, Inc.,
|
|
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
|
|
*
|
|
* Copyright (C) 2008 - 2011 Red Hat, Inc.
|
|
*
|
|
*/
|
|
|
|
#include <glib.h>
|
|
#include <string.h>
|
|
|
|
#include "nm-test-helpers.h"
|
|
#include <nm-utils.h>
|
|
|
|
#include "nm-setting-connection.h"
|
|
#include "nm-setting-wired.h"
|
|
#include "nm-setting-8021x.h"
|
|
#include "nm-setting-ip4-config.h"
|
|
#include "nm-setting-wireless.h"
|
|
#include "nm-setting-wireless-security.h"
|
|
#include "nm-setting-cdma.h"
|
|
#include "nm-setting-gsm.h"
|
|
#include "nm-setting-ppp.h"
|
|
#include "nm-setting-pppoe.h"
|
|
#include "nm-setting-vpn.h"
|
|
|
|
|
|
#define TEST_NEED_SECRETS_EAP_TLS_CA_CERT TEST_CERT_DIR "/test_ca_cert.pem"
|
|
#define TEST_NEED_SECRETS_EAP_TLS_CLIENT_CERT TEST_CERT_DIR "/test_key_and_cert.pem"
|
|
#define TEST_NEED_SECRETS_EAP_TLS_PRIVATE_KEY TEST_CERT_DIR "/test_key_and_cert.pem"
|
|
|
|
static gboolean
|
|
find_hints_item (GPtrArray *hints, const char *item)
|
|
{
|
|
int i;
|
|
|
|
for (i = 0; i < hints->len; i++) {
|
|
if (!strcmp (item, (const char *) g_ptr_array_index (hints, i)))
|
|
return TRUE;
|
|
}
|
|
return FALSE;
|
|
}
|
|
|
|
static NMConnection *
|
|
make_tls_connection (const char *detail, NMSetting8021xCKScheme scheme)
|
|
{
|
|
NMConnection *connection;
|
|
NMSettingConnection *s_con;
|
|
NMSetting8021x *s_8021x;
|
|
NMSettingWired *s_wired;
|
|
NMSettingIP4Config *s_ip4;
|
|
char *uuid;
|
|
gboolean success;
|
|
GError *error = NULL;
|
|
|
|
connection = nm_connection_new ();
|
|
ASSERT (connection != NULL,
|
|
detail, "failed to allocate new connection");
|
|
|
|
/* Connection setting */
|
|
s_con = (NMSettingConnection *) nm_setting_connection_new ();
|
|
ASSERT (s_con != NULL,
|
|
detail, "failed to allocate new %s setting",
|
|
NM_SETTING_CONNECTION_SETTING_NAME);
|
|
nm_connection_add_setting (connection, NM_SETTING (s_con));
|
|
|
|
uuid = nm_utils_uuid_generate ();
|
|
g_object_set (s_con,
|
|
NM_SETTING_CONNECTION_ID, "Test Need TLS Secrets",
|
|
NM_SETTING_CONNECTION_UUID, uuid,
|
|
NM_SETTING_CONNECTION_AUTOCONNECT, TRUE,
|
|
NM_SETTING_CONNECTION_TYPE, NM_SETTING_WIRED_SETTING_NAME,
|
|
NULL);
|
|
g_free (uuid);
|
|
|
|
/* Wired setting */
|
|
s_wired = (NMSettingWired *) nm_setting_wired_new ();
|
|
ASSERT (s_wired != NULL,
|
|
detail, "failed to allocate new %s setting",
|
|
NM_SETTING_WIRED_SETTING_NAME);
|
|
nm_connection_add_setting (connection, NM_SETTING (s_wired));
|
|
|
|
/* Wireless security setting */
|
|
s_8021x = (NMSetting8021x *) nm_setting_802_1x_new ();
|
|
ASSERT (s_8021x != NULL,
|
|
detail, "failed to allocate new %s setting",
|
|
NM_SETTING_802_1X_SETTING_NAME);
|
|
nm_connection_add_setting (connection, NM_SETTING (s_8021x));
|
|
|
|
g_object_set (s_8021x, NM_SETTING_802_1X_IDENTITY, "Bill Smith", NULL);
|
|
|
|
nm_setting_802_1x_add_eap_method (s_8021x, "tls");
|
|
|
|
success = nm_setting_802_1x_set_ca_cert (s_8021x,
|
|
TEST_NEED_SECRETS_EAP_TLS_CA_CERT,
|
|
scheme,
|
|
NULL,
|
|
&error);
|
|
ASSERT (success == TRUE,
|
|
detail, "failed to set CA certificate '%s': %s",
|
|
TEST_NEED_SECRETS_EAP_TLS_CA_CERT, error->message);
|
|
|
|
success = nm_setting_802_1x_set_client_cert (s_8021x,
|
|
TEST_NEED_SECRETS_EAP_TLS_CLIENT_CERT,
|
|
scheme,
|
|
NULL,
|
|
&error);
|
|
ASSERT (success == TRUE,
|
|
detail, "failed to set client certificate '%s': %s",
|
|
TEST_NEED_SECRETS_EAP_TLS_CLIENT_CERT, error->message);
|
|
|
|
success = nm_setting_802_1x_set_private_key (s_8021x,
|
|
TEST_NEED_SECRETS_EAP_TLS_PRIVATE_KEY,
|
|
"test",
|
|
scheme,
|
|
NULL,
|
|
&error);
|
|
ASSERT (success == TRUE,
|
|
detail, "failed to set private key '%s': %s",
|
|
TEST_NEED_SECRETS_EAP_TLS_PRIVATE_KEY, error->message);
|
|
|
|
/* IP4 setting */
|
|
s_ip4 = (NMSettingIP4Config *) nm_setting_ip4_config_new ();
|
|
ASSERT (s_ip4 != NULL,
|
|
detail, "failed to allocate new %s setting",
|
|
NM_SETTING_IP4_CONFIG_SETTING_NAME);
|
|
nm_connection_add_setting (connection, NM_SETTING (s_ip4));
|
|
|
|
g_object_set (s_ip4, NM_SETTING_IP4_CONFIG_METHOD, NM_SETTING_IP4_CONFIG_METHOD_AUTO, NULL);
|
|
|
|
ASSERT (nm_connection_verify (connection, &error) == TRUE,
|
|
detail, "failed to verify connection: %s",
|
|
(error && error->message) ? error->message : "(unknown)");
|
|
|
|
return connection;
|
|
}
|
|
|
|
static void
|
|
test_need_tls_secrets_path (void)
|
|
{
|
|
NMConnection *connection;
|
|
const char *setting_name;
|
|
GPtrArray *hints = NULL;
|
|
|
|
connection = make_tls_connection ("need-tls-secrets-path-key", NM_SETTING_802_1X_CK_SCHEME_PATH);
|
|
ASSERT (connection != NULL,
|
|
"need-tls-secrets-path-key",
|
|
"error creating test connection");
|
|
|
|
/* Ensure we don't need any secrets since we just set up the connection */
|
|
setting_name = nm_connection_need_secrets (connection, &hints);
|
|
ASSERT (setting_name == NULL,
|
|
"need-tls-secrets-path-key",
|
|
"secrets are unexpectedly required");
|
|
ASSERT (hints == NULL,
|
|
"need-tls-secrets-path-key",
|
|
"hints should be NULL since no secrets were required");
|
|
|
|
/* Connection is good; clear secrets and ensure private key password is then required */
|
|
nm_connection_clear_secrets (connection);
|
|
|
|
hints = NULL;
|
|
setting_name = nm_connection_need_secrets (connection, &hints);
|
|
ASSERT (setting_name != NULL,
|
|
"need-tls-secrets-path-key-password",
|
|
"unexpected secrets success");
|
|
ASSERT (strcmp (setting_name, NM_SETTING_802_1X_SETTING_NAME) == 0,
|
|
"need-tls-secrets-path-key-password",
|
|
"unexpected setting secrets required");
|
|
|
|
ASSERT (hints != NULL,
|
|
"need-tls-secrets-path-key-password",
|
|
"expected returned secrets hints");
|
|
ASSERT (find_hints_item (hints, NM_SETTING_802_1X_PRIVATE_KEY_PASSWORD),
|
|
"need-tls-secrets-path-key-password",
|
|
"expected to require private key password, but it wasn't");
|
|
|
|
g_object_unref (connection);
|
|
}
|
|
|
|
static void
|
|
test_need_tls_secrets_blob (void)
|
|
{
|
|
NMConnection *connection;
|
|
const char *setting_name;
|
|
GPtrArray *hints = NULL;
|
|
|
|
connection = make_tls_connection ("need-tls-secrets-blob-key", NM_SETTING_802_1X_CK_SCHEME_BLOB);
|
|
ASSERT (connection != NULL,
|
|
"need-tls-secrets-blob-key",
|
|
"error creating test connection");
|
|
|
|
/* Ensure we don't need any secrets since we just set up the connection */
|
|
setting_name = nm_connection_need_secrets (connection, &hints);
|
|
ASSERT (setting_name == NULL,
|
|
"need-tls-secrets-blob-key",
|
|
"secrets are unexpectedly required");
|
|
ASSERT (hints == NULL,
|
|
"need-tls-secrets-blob-key",
|
|
"hints should be NULL since no secrets were required");
|
|
|
|
/* Clear secrets and ensure password is again required */
|
|
nm_connection_clear_secrets (connection);
|
|
|
|
hints = NULL;
|
|
setting_name = nm_connection_need_secrets (connection, &hints);
|
|
ASSERT (setting_name != NULL,
|
|
"need-tls-secrets-blob-key-password",
|
|
"unexpected secrets success");
|
|
ASSERT (strcmp (setting_name, NM_SETTING_802_1X_SETTING_NAME) == 0,
|
|
"need-tls-secrets-blob-key-password",
|
|
"unexpected setting secrets required");
|
|
|
|
ASSERT (hints != NULL,
|
|
"need-tls-secrets-blob-key-password",
|
|
"expected returned secrets hints");
|
|
ASSERT (find_hints_item (hints, NM_SETTING_802_1X_PRIVATE_KEY_PASSWORD),
|
|
"need-tls-secrets-blob-key-password",
|
|
"expected to require private key password, but it wasn't");
|
|
|
|
g_object_unref (connection);
|
|
}
|
|
|
|
static NMConnection *
|
|
make_tls_phase2_connection (const char *detail, NMSetting8021xCKScheme scheme)
|
|
{
|
|
NMConnection *connection;
|
|
NMSettingConnection *s_con;
|
|
NMSetting8021x *s_8021x;
|
|
NMSettingWired *s_wired;
|
|
NMSettingIP4Config *s_ip4;
|
|
char *uuid;
|
|
gboolean success;
|
|
GError *error = NULL;
|
|
|
|
connection = nm_connection_new ();
|
|
ASSERT (connection != NULL,
|
|
detail, "failed to allocate new connection");
|
|
|
|
/* Connection setting */
|
|
s_con = (NMSettingConnection *) nm_setting_connection_new ();
|
|
ASSERT (s_con != NULL,
|
|
detail, "failed to allocate new %s setting",
|
|
NM_SETTING_CONNECTION_SETTING_NAME);
|
|
nm_connection_add_setting (connection, NM_SETTING (s_con));
|
|
|
|
uuid = nm_utils_uuid_generate ();
|
|
g_object_set (s_con,
|
|
NM_SETTING_CONNECTION_ID, "Test Need TLS Secrets",
|
|
NM_SETTING_CONNECTION_UUID, uuid,
|
|
NM_SETTING_CONNECTION_AUTOCONNECT, TRUE,
|
|
NM_SETTING_CONNECTION_TYPE, NM_SETTING_WIRED_SETTING_NAME,
|
|
NULL);
|
|
g_free (uuid);
|
|
|
|
/* Wired setting */
|
|
s_wired = (NMSettingWired *) nm_setting_wired_new ();
|
|
ASSERT (s_wired != NULL,
|
|
detail, "failed to allocate new %s setting",
|
|
NM_SETTING_WIRED_SETTING_NAME);
|
|
nm_connection_add_setting (connection, NM_SETTING (s_wired));
|
|
|
|
/* Wireless security setting */
|
|
s_8021x = (NMSetting8021x *) nm_setting_802_1x_new ();
|
|
ASSERT (s_8021x != NULL,
|
|
detail, "failed to allocate new %s setting",
|
|
NM_SETTING_802_1X_SETTING_NAME);
|
|
nm_connection_add_setting (connection, NM_SETTING (s_8021x));
|
|
|
|
g_object_set (s_8021x, NM_SETTING_802_1X_ANONYMOUS_IDENTITY, "blahblah", NULL);
|
|
g_object_set (s_8021x, NM_SETTING_802_1X_IDENTITY, "Bill Smith", NULL);
|
|
|
|
nm_setting_802_1x_add_eap_method (s_8021x, "ttls");
|
|
g_object_set (s_8021x, NM_SETTING_802_1X_PHASE2_AUTH, "tls", NULL);
|
|
|
|
success = nm_setting_802_1x_set_phase2_ca_cert (s_8021x,
|
|
TEST_NEED_SECRETS_EAP_TLS_CA_CERT,
|
|
scheme,
|
|
NULL,
|
|
&error);
|
|
ASSERT (success == TRUE,
|
|
detail, "failed to set phase2 CA certificate '%s': %s",
|
|
TEST_NEED_SECRETS_EAP_TLS_CA_CERT, error->message);
|
|
|
|
success = nm_setting_802_1x_set_phase2_client_cert (s_8021x,
|
|
TEST_NEED_SECRETS_EAP_TLS_CLIENT_CERT,
|
|
scheme,
|
|
NULL,
|
|
&error);
|
|
ASSERT (success == TRUE,
|
|
detail, "failed to set phase2 client certificate '%s': %s",
|
|
TEST_NEED_SECRETS_EAP_TLS_CLIENT_CERT, error->message);
|
|
|
|
success = nm_setting_802_1x_set_phase2_private_key (s_8021x,
|
|
TEST_NEED_SECRETS_EAP_TLS_PRIVATE_KEY,
|
|
"test",
|
|
scheme,
|
|
NULL,
|
|
&error);
|
|
ASSERT (success == TRUE,
|
|
detail, "failed to set phase2 private key '%s': %s",
|
|
TEST_NEED_SECRETS_EAP_TLS_PRIVATE_KEY, error->message);
|
|
|
|
/* IP4 setting */
|
|
s_ip4 = (NMSettingIP4Config *) nm_setting_ip4_config_new ();
|
|
ASSERT (s_ip4 != NULL,
|
|
detail, "failed to allocate new %s setting",
|
|
NM_SETTING_IP4_CONFIG_SETTING_NAME);
|
|
nm_connection_add_setting (connection, NM_SETTING (s_ip4));
|
|
|
|
g_object_set (s_ip4, NM_SETTING_IP4_CONFIG_METHOD, NM_SETTING_IP4_CONFIG_METHOD_AUTO, NULL);
|
|
|
|
ASSERT (nm_connection_verify (connection, &error) == TRUE,
|
|
detail, "failed to verify connection: %s",
|
|
(error && error->message) ? error->message : "(unknown)");
|
|
|
|
return connection;
|
|
}
|
|
|
|
static void
|
|
test_need_tls_phase2_secrets_path (void)
|
|
{
|
|
NMConnection *connection;
|
|
const char *setting_name;
|
|
GPtrArray *hints = NULL;
|
|
|
|
connection = make_tls_phase2_connection ("need-tls-phase2-secrets-path-key",
|
|
NM_SETTING_802_1X_CK_SCHEME_PATH);
|
|
ASSERT (connection != NULL,
|
|
"need-tls-phase2-secrets-path-key",
|
|
"error creating test connection");
|
|
|
|
/* Ensure we don't need any secrets since we just set up the connection */
|
|
setting_name = nm_connection_need_secrets (connection, &hints);
|
|
ASSERT (setting_name == NULL,
|
|
"need-tls-phase2-secrets-path-key",
|
|
"secrets are unexpectedly required");
|
|
ASSERT (hints == NULL,
|
|
"need-tls-phase2-secrets-path-key",
|
|
"hints should be NULL since no secrets were required");
|
|
|
|
/* Connection is good; clear secrets and ensure private key password is then required */
|
|
nm_connection_clear_secrets (connection);
|
|
|
|
hints = NULL;
|
|
setting_name = nm_connection_need_secrets (connection, &hints);
|
|
ASSERT (setting_name != NULL,
|
|
"need-tls-phase2-secrets-path-key-password",
|
|
"unexpected secrets success");
|
|
ASSERT (strcmp (setting_name, NM_SETTING_802_1X_SETTING_NAME) == 0,
|
|
"need-tls-phase2-secrets-path-key-password",
|
|
"unexpected setting secrets required");
|
|
|
|
ASSERT (hints != NULL,
|
|
"need-tls-phase2-secrets-path-key-password",
|
|
"expected returned secrets hints");
|
|
ASSERT (find_hints_item (hints, NM_SETTING_802_1X_PHASE2_PRIVATE_KEY_PASSWORD),
|
|
"need-tls-phase2-secrets-path-key-password",
|
|
"expected to require private key password, but it wasn't");
|
|
|
|
g_object_unref (connection);
|
|
}
|
|
|
|
static void
|
|
test_need_tls_phase2_secrets_blob (void)
|
|
{
|
|
NMConnection *connection;
|
|
const char *setting_name;
|
|
GPtrArray *hints = NULL;
|
|
|
|
connection = make_tls_phase2_connection ("need-tls-phase2-secrets-blob-key",
|
|
NM_SETTING_802_1X_CK_SCHEME_BLOB);
|
|
ASSERT (connection != NULL,
|
|
"need-tls-phase2-secrets-blob-key",
|
|
"error creating test connection");
|
|
|
|
/* Ensure we don't need any secrets since we just set up the connection */
|
|
setting_name = nm_connection_need_secrets (connection, &hints);
|
|
ASSERT (setting_name == NULL,
|
|
"need-tls-phase2-secrets-blob-key",
|
|
"secrets are unexpectedly required");
|
|
ASSERT (hints == NULL,
|
|
"need-tls-phase2-secrets-blob-key",
|
|
"hints should be NULL since no secrets were required");
|
|
|
|
/* Connection is good; clear secrets and ensure private key password is then required */
|
|
nm_connection_clear_secrets (connection);
|
|
|
|
hints = NULL;
|
|
setting_name = nm_connection_need_secrets (connection, &hints);
|
|
ASSERT (setting_name != NULL,
|
|
"need-tls-phase2-secrets-blob-key-password",
|
|
"unexpected secrets success");
|
|
ASSERT (strcmp (setting_name, NM_SETTING_802_1X_SETTING_NAME) == 0,
|
|
"need-tls-phase2-secrets-blob-key-password",
|
|
"unexpected setting secrets required");
|
|
|
|
ASSERT (hints != NULL,
|
|
"need-tls-phase2-secrets-blob-key-password",
|
|
"expected returned secrets hints");
|
|
ASSERT (find_hints_item (hints, NM_SETTING_802_1X_PHASE2_PRIVATE_KEY_PASSWORD),
|
|
"need-tls-phase2-secrets-blob-key-password",
|
|
"expected to require private key password, but it wasn't");
|
|
|
|
g_object_unref (connection);
|
|
}
|
|
|
|
static NMConnection *
|
|
wifi_connection_new (void)
|
|
{
|
|
NMConnection *connection;
|
|
NMSettingConnection *s_con;
|
|
NMSettingWireless *s_wifi;
|
|
NMSettingWirelessSecurity *s_wsec;
|
|
unsigned char tmpssid[] = { 0x31, 0x33, 0x33, 0x37 };
|
|
char *uuid;
|
|
GByteArray *ssid;
|
|
|
|
connection = nm_connection_new ();
|
|
g_assert (connection);
|
|
|
|
/* Connection setting */
|
|
s_con = (NMSettingConnection *) nm_setting_connection_new ();
|
|
g_assert (s_con);
|
|
|
|
uuid = nm_utils_uuid_generate ();
|
|
g_object_set (s_con,
|
|
NM_SETTING_CONNECTION_ID, "Test Wireless",
|
|
NM_SETTING_CONNECTION_UUID, uuid,
|
|
NM_SETTING_CONNECTION_AUTOCONNECT, FALSE,
|
|
NM_SETTING_CONNECTION_TYPE, NM_SETTING_WIRELESS_SETTING_NAME,
|
|
NULL);
|
|
g_free (uuid);
|
|
nm_connection_add_setting (connection, NM_SETTING (s_con));
|
|
|
|
/* Wireless setting */
|
|
s_wifi = (NMSettingWireless *) nm_setting_wireless_new ();
|
|
g_assert (s_wifi);
|
|
|
|
ssid = g_byte_array_sized_new (sizeof (tmpssid));
|
|
g_byte_array_append (ssid, &tmpssid[0], sizeof (tmpssid));
|
|
g_object_set (s_wifi,
|
|
NM_SETTING_WIRELESS_SSID, ssid,
|
|
NM_SETTING_WIRELESS_SEC, NM_SETTING_WIRELESS_SECURITY_SETTING_NAME,
|
|
NULL);
|
|
g_byte_array_free (ssid, TRUE);
|
|
nm_connection_add_setting (connection, NM_SETTING (s_wifi));
|
|
|
|
/* Wifi security */
|
|
s_wsec = (NMSettingWirelessSecurity *) nm_setting_wireless_security_new ();
|
|
g_assert (s_wsec);
|
|
|
|
g_object_set (G_OBJECT (s_wsec),
|
|
NM_SETTING_WIRELESS_SECURITY_KEY_MGMT, "none",
|
|
NULL);
|
|
nm_connection_add_setting (connection, NM_SETTING (s_wsec));
|
|
|
|
return connection;
|
|
}
|
|
|
|
static void
|
|
value_destroy (gpointer data)
|
|
{
|
|
GValue *value = (GValue *) data;
|
|
|
|
g_value_unset (value);
|
|
g_slice_free (GValue, value);
|
|
}
|
|
|
|
static GValue *
|
|
string_to_gvalue (const char *str)
|
|
{
|
|
GValue *val = g_slice_new0 (GValue);
|
|
|
|
g_value_init (val, G_TYPE_STRING);
|
|
g_value_set_string (val, str);
|
|
return val;
|
|
}
|
|
|
|
static GValue *
|
|
uint_to_gvalue (guint32 i)
|
|
{
|
|
GValue *val;
|
|
|
|
val = g_slice_new0 (GValue);
|
|
g_value_init (val, G_TYPE_UINT);
|
|
g_value_set_uint (val, i);
|
|
return val;
|
|
}
|
|
|
|
static void
|
|
test_update_secrets_wifi_single_setting (void)
|
|
{
|
|
NMConnection *connection;
|
|
NMSettingWirelessSecurity *s_wsec;
|
|
GHashTable *secrets;
|
|
GError *error = NULL;
|
|
gboolean success;
|
|
const char *wepkey = "11111111111111111111111111";
|
|
const char *tmp;
|
|
|
|
connection = wifi_connection_new ();
|
|
|
|
/* Build up the secrets hash */
|
|
secrets = g_hash_table_new_full (g_str_hash, g_str_equal, NULL, value_destroy);
|
|
g_hash_table_insert (secrets, NM_SETTING_WIRELESS_SECURITY_WEP_KEY0, string_to_gvalue (wepkey));
|
|
g_hash_table_insert (secrets, NM_SETTING_WIRELESS_SECURITY_WEP_KEY_TYPE, uint_to_gvalue (NM_WEP_KEY_TYPE_KEY));
|
|
|
|
success = nm_connection_update_secrets (connection,
|
|
NM_SETTING_WIRELESS_SECURITY_SETTING_NAME,
|
|
secrets,
|
|
&error);
|
|
g_assert_no_error (error);
|
|
g_assert (success);
|
|
|
|
/* Make sure the secret is now in the connection */
|
|
s_wsec = (NMSettingWirelessSecurity *) nm_connection_get_setting (connection, NM_TYPE_SETTING_WIRELESS_SECURITY);
|
|
g_assert (s_wsec);
|
|
tmp = nm_setting_wireless_security_get_wep_key (s_wsec, 0);
|
|
g_assert_cmpstr (tmp, ==, wepkey);
|
|
|
|
g_object_unref (connection);
|
|
}
|
|
|
|
static void
|
|
test_update_secrets_wifi_full_hash (void)
|
|
{
|
|
NMConnection *connection;
|
|
NMSettingWirelessSecurity *s_wsec;
|
|
GHashTable *secrets, *all;
|
|
GError *error = NULL;
|
|
gboolean success;
|
|
const char *wepkey = "11111111111111111111111111";
|
|
const char *tmp;
|
|
|
|
connection = wifi_connection_new ();
|
|
|
|
/* Build up the secrets hash */
|
|
all = g_hash_table_new_full (g_str_hash, g_str_equal, NULL, (GDestroyNotify) g_hash_table_destroy);
|
|
secrets = g_hash_table_new_full (g_str_hash, g_str_equal, NULL, value_destroy);
|
|
g_hash_table_insert (secrets, NM_SETTING_WIRELESS_SECURITY_WEP_KEY0, string_to_gvalue (wepkey));
|
|
g_hash_table_insert (secrets, NM_SETTING_WIRELESS_SECURITY_WEP_KEY_TYPE, uint_to_gvalue (NM_WEP_KEY_TYPE_KEY));
|
|
g_hash_table_insert (all, NM_SETTING_WIRELESS_SECURITY_SETTING_NAME, secrets);
|
|
|
|
success = nm_connection_update_secrets (connection,
|
|
NM_SETTING_WIRELESS_SECURITY_SETTING_NAME,
|
|
all,
|
|
&error);
|
|
g_assert_no_error (error);
|
|
g_assert (success);
|
|
|
|
/* Make sure the secret is now in the connection */
|
|
s_wsec = (NMSettingWirelessSecurity *) nm_connection_get_setting (connection, NM_TYPE_SETTING_WIRELESS_SECURITY);
|
|
g_assert (s_wsec);
|
|
tmp = nm_setting_wireless_security_get_wep_key (s_wsec, 0);
|
|
g_assert_cmpstr (tmp, ==, wepkey);
|
|
|
|
g_object_unref (connection);
|
|
}
|
|
|
|
static void
|
|
test_update_secrets_wifi_bad_setting_name (void)
|
|
{
|
|
NMConnection *connection;
|
|
GHashTable *secrets;
|
|
GError *error = NULL;
|
|
gboolean success;
|
|
const char *wepkey = "11111111111111111111111111";
|
|
|
|
connection = wifi_connection_new ();
|
|
|
|
/* Build up the secrets hash */
|
|
secrets = g_hash_table_new_full (g_str_hash, g_str_equal, NULL, value_destroy);
|
|
g_hash_table_insert (secrets, NM_SETTING_WIRELESS_SECURITY_WEP_KEY0, string_to_gvalue (wepkey));
|
|
g_hash_table_insert (secrets, NM_SETTING_WIRELESS_SECURITY_WEP_KEY_TYPE, uint_to_gvalue (NM_WEP_KEY_TYPE_KEY));
|
|
|
|
success = nm_connection_update_secrets (connection,
|
|
"asdfasdfasdfasf",
|
|
secrets,
|
|
&error);
|
|
g_assert_error (error, NM_CONNECTION_ERROR, NM_CONNECTION_ERROR_SETTING_NOT_FOUND);
|
|
g_assert (success == FALSE);
|
|
|
|
g_object_unref (connection);
|
|
}
|
|
|
|
static void
|
|
test_update_secrets_whole_connection (void)
|
|
{
|
|
NMConnection *connection;
|
|
NMSettingWirelessSecurity *s_wsec;
|
|
GHashTable *secrets, *wsec_hash;
|
|
GError *error = NULL;
|
|
gboolean success;
|
|
const char *wepkey = "11111111111111111111111111";
|
|
|
|
connection = wifi_connection_new ();
|
|
|
|
/* Build up the secrets hash */
|
|
secrets = nm_connection_to_hash (connection, NM_SETTING_HASH_FLAG_ALL);
|
|
wsec_hash = g_hash_table_lookup (secrets, NM_SETTING_WIRELESS_SECURITY_SETTING_NAME);
|
|
g_assert (wsec_hash);
|
|
g_hash_table_insert (wsec_hash, NM_SETTING_WIRELESS_SECURITY_WEP_KEY0, string_to_gvalue (wepkey));
|
|
|
|
success = nm_connection_update_secrets (connection, NULL, secrets, &error);
|
|
g_assert_no_error (error);
|
|
g_assert (success == TRUE);
|
|
|
|
s_wsec = nm_connection_get_setting_wireless_security (connection);
|
|
g_assert (s_wsec);
|
|
g_assert_cmpstr (nm_setting_wireless_security_get_wep_key (s_wsec, 0), ==, wepkey);
|
|
|
|
g_object_unref (connection);
|
|
}
|
|
|
|
static void
|
|
test_update_secrets_whole_connection_empty_hash (void)
|
|
{
|
|
NMConnection *connection;
|
|
GHashTable *secrets;
|
|
GError *error = NULL;
|
|
gboolean success;
|
|
|
|
connection = wifi_connection_new ();
|
|
secrets = g_hash_table_new (g_str_hash, g_str_equal);
|
|
success = nm_connection_update_secrets (connection, NULL, secrets, &error);
|
|
g_assert_no_error (error);
|
|
g_assert (success == TRUE);
|
|
g_object_unref (connection);
|
|
}
|
|
|
|
static void
|
|
test_update_secrets_whole_connection_bad_setting (void)
|
|
{
|
|
NMConnection *connection;
|
|
GHashTable *secrets, *wsec_hash;
|
|
GError *error = NULL;
|
|
gboolean success;
|
|
const char *wepkey = "11111111111111111111111111";
|
|
|
|
connection = wifi_connection_new ();
|
|
|
|
/* Build up the secrets hash */
|
|
secrets = nm_connection_to_hash (connection, NM_SETTING_HASH_FLAG_ALL);
|
|
wsec_hash = g_hash_table_lookup (secrets, NM_SETTING_WIRELESS_SECURITY_SETTING_NAME);
|
|
g_assert (wsec_hash);
|
|
g_hash_table_insert (wsec_hash, NM_SETTING_WIRELESS_SECURITY_WEP_KEY0, string_to_gvalue (wepkey));
|
|
|
|
/* Steal the wsec setting hash so it's not deallocated, and stuff it back
|
|
* in with a different name so we ensure libnm-util is returning the right
|
|
* error when it finds an entry in the connection hash that doesn't match
|
|
* any setting in the connection.
|
|
*/
|
|
g_hash_table_steal (secrets, NM_SETTING_WIRELESS_SECURITY_SETTING_NAME);
|
|
g_hash_table_insert (secrets, "asdfasdfasdfasdf", wsec_hash);
|
|
|
|
success = nm_connection_update_secrets (connection, NULL, secrets, &error);
|
|
g_assert_error (error, NM_CONNECTION_ERROR, NM_CONNECTION_ERROR_SETTING_NOT_FOUND);
|
|
g_assert (success == FALSE);
|
|
|
|
g_object_unref (connection);
|
|
}
|
|
|
|
int main (int argc, char **argv)
|
|
{
|
|
GError *error = NULL;
|
|
char *base;
|
|
|
|
g_type_init ();
|
|
|
|
if (!nm_utils_init (&error))
|
|
FAIL ("nm-utils-init", "failed to initialize libnm-util: %s", error->message);
|
|
|
|
/* The tests */
|
|
test_need_tls_secrets_path ();
|
|
test_need_tls_secrets_blob ();
|
|
test_need_tls_phase2_secrets_path ();
|
|
test_need_tls_phase2_secrets_blob ();
|
|
|
|
test_update_secrets_wifi_single_setting ();
|
|
test_update_secrets_wifi_full_hash ();
|
|
test_update_secrets_wifi_bad_setting_name ();
|
|
|
|
test_update_secrets_whole_connection ();
|
|
test_update_secrets_whole_connection_empty_hash ();
|
|
test_update_secrets_whole_connection_bad_setting ();
|
|
|
|
base = g_path_get_basename (argv[0]);
|
|
fprintf (stdout, "%s: SUCCESS\n", base);
|
|
g_free (base);
|
|
return 0;
|
|
}
|
|
|