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

ifcfg-rh: add support for NMSettingWireless:mac-address-randomization

Browse source 
Old init-scripts that did not yet understand this key will have
mac-address-randomization explicitly disabled. This is to ensure
that old connections don't change behavior.
Thus, the writer must always write the value explicitly.

Downside is, if somebody creates a quick ifcfg-file, the feature
is disabled by default.
This commit is contained in:
Thomas Haller 2015-10-08 13:32:36 +02:00
parent 190e0e31cd
commit 6a46dfca26
9 changed files with 221 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
libnm-core/nm-setting-wireless.c
View file

@ -1398,6 +1398,15 @@ nm_setting_wireless_class_init (NMSettingWirelessClass *setting_class)
*
* Since: 1.2
**/
/* ---ifcfg-rh---
* property: mac-address-randomization
* variable: MAC_ADDRESS_RANDOMIZATION(+)
* values: 0 (default), (1) never, (2) always
* default: 1
* description: Enables or disables Wi-Fi MAC address randomization.
* example: MAC_ADDRESS_RANDOMIZATION=2
* ---end---
*/
g_object_class_install_property
(object_class, PROP_MAC_ADDRESS_RANDOMIZATION,
g_param_spec_uint (NM_SETTING_WIRELESS_MAC_ADDRESS_RANDOMIZATION, "", "",

22
src/settings/plugins/ifcfg-rh/reader.c
View file

@ -3314,6 +3314,7 @@ make_wireless_setting (shvarFile *ifcfg,
NMSettingWireless *s_wireless;
char *value = NULL;
gint64 chan = 0;
NMSettingMacRandomization mac_randomization = NM_SETTING_MAC_RANDOMIZATION_NEVER;
s_wireless = NM_SETTING_WIRELESS (nm_setting_wireless_new ());
@ -3496,6 +3497,27 @@ make_wireless_setting (shvarFile *ifcfg,
svGetValueBoolean (ifcfg, "POWERSAVE", FALSE) ? 1 : 0,
NULL);
value = svGetValueFull (ifcfg, "MAC_ADDRESS_RANDOMIZATION", FALSE);
if (value) {
if (strcmp (value, "default") == 0)
mac_randomization = NM_SETTING_MAC_RANDOMIZATION_DEFAULT;
else if (strcmp (value, "never") == 0)
mac_randomization = NM_SETTING_MAC_RANDOMIZATION_NEVER;
else if (strcmp (value, "always") == 0)
mac_randomization = NM_SETTING_MAC_RANDOMIZATION_ALWAYS;
else {
g_set_error (error, NM_SETTINGS_ERROR, NM_SETTINGS_ERROR_INVALID_CONNECTION,
"Invalid MAC_ADDRESS_RANDOMIZATION value '%s'", value);
goto error;
}
} else
mac_randomization = NM_SETTING_MAC_RANDOMIZATION_NEVER;
g_object_set (s_wireless,
NM_SETTING_WIRELESS_MAC_ADDRESS_RANDOMIZATION,
mac_randomization,
NULL);
return NM_SETTING (s_wireless);
error:

4
src/settings/plugins/ifcfg-rh/tests/network-scripts/Makefile.am
View file

@ -67,6 +67,10 @@ EXTRA_DIST = \
ifcfg-test-wifi-band-a \
ifcfg-test-wifi-band-a-channel-mismatch \
ifcfg-test-wifi-band-bg-channel-mismatch \
ifcfg-test-wifi-mac-random-always \
ifcfg-test-wifi-mac-random-never \
ifcfg-test-wifi-mac-random-default \
ifcfg-test-wifi-mac-random-missing \
test_ca_cert.pem \
test1_key_and_cert.pem \
ifcfg-test-ibft \

7
src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-mac-random-always Normal file
View file

@ -0,0 +1,7 @@
TYPE=Wireless
DEVICE=eth2
BOOTPROTO=dhcp
ESSID=blahblah
ONBOOT=yes
MAC_ADDRESS_RANDOMIZATION=always

6
src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-mac-random-default Normal file
View file

@ -0,0 +1,6 @@
TYPE=Wireless
DEVICE=eth2
BOOTPROTO=dhcp
ESSID=blahblah
ONBOOT=yes
MAC_ADDRESS_RANDOMIZATION=default

6
src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-mac-random-missing Normal file
View file

@ -0,0 +1,6 @@
TYPE=Wireless
DEVICE=eth2
BOOTPROTO=dhcp
ESSID=blahblah
ONBOOT=yes

6
src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-mac-random-never Normal file
View file

@ -0,0 +1,6 @@
TYPE=Wireless
DEVICE=eth2
BOOTPROTO=dhcp
ESSID=blahblah
ONBOOT=yes
MAC_ADDRESS_RANDOMIZATION=never

146
src/settings/plugins/ifcfg-rh/tests/test-ifcfg-rh.c
View file

@ -58,6 +58,12 @@
#include "nm-test-utils.h"
typedef struct {
const char *name;
const NMSettingMacRandomization value;
const char *write_expected;
} WifiMacRandomData;
#if 0
static void
connection_diff (NMConnection *a, NMConnection *b)
@ -5465,6 +5471,117 @@ test_write_wifi_hidden (void)
g_object_unref (reread);
}
static void
test_read_wifi_mac_random (gconstpointer user_data)
{
const WifiMacRandomData *test_data = user_data;
NMConnection *connection;
NMSettingWireless *s_wifi;
gboolean success;
GError *error = NULL;
char *path;
path = g_strdup_printf (TEST_IFCFG_DIR"/network-scripts/ifcfg-test-wifi-mac-random-%s", test_data->name);
connection = connection_from_file_test (path, NULL, TYPE_WIRELESS, NULL, &error);
g_free (path);
g_assert_no_error (error);
g_assert (connection);
success = nm_connection_verify (connection, &error);
g_assert_no_error (error);
g_assert (success);
s_wifi = nm_connection_get_setting_wireless (connection);
g_assert (s_wifi);
g_assert_cmpint (nm_setting_wireless_get_mac_address_randomization (s_wifi), ==, test_data->value);
g_object_unref (connection);
}
static void
test_write_wifi_mac_random (gconstpointer user_data)
{
const WifiMacRandomData *test_data = user_data;
NMConnection *connection, *reread;
NMSettingConnection *s_con;
NMSettingWireless *s_wifi;
char *uuid, *testfile = NULL, *val;
gboolean success;
GError *error = NULL;
shvarFile *f;
GBytes *ssid;
const unsigned char ssid_data[] = { 0x54, 0x65, 0x73, 0x74, 0x20, 0x53, 0x53, 0x49, 0x44 };
connection = nm_simple_connection_new ();
/* Connection setting */
s_con = (NMSettingConnection *) nm_setting_connection_new ();
nm_connection_add_setting (connection, NM_SETTING (s_con));
uuid = nm_utils_uuid_generate ();
val = g_strdup_printf ("Test Write WiFi MAC %s", test_data->name);
g_object_set (s_con,
NM_SETTING_CONNECTION_ID, val,
NM_SETTING_CONNECTION_UUID, uuid,
NM_SETTING_CONNECTION_TYPE, NM_SETTING_WIRELESS_SETTING_NAME,
NULL);
g_free (uuid);
g_free (val);
/* Wifi setting */
s_wifi = (NMSettingWireless *) nm_setting_wireless_new ();
nm_connection_add_setting (connection, NM_SETTING (s_wifi));
ssid = g_bytes_new (ssid_data, sizeof (ssid_data));
g_object_set (s_wifi,
NM_SETTING_WIRELESS_SSID, ssid,
NM_SETTING_WIRELESS_MODE, "infrastructure",
NM_SETTING_WIRELESS_MAC_ADDRESS_RANDOMIZATION, test_data->value,
NULL);
g_bytes_unref (ssid);
success = nm_connection_verify (connection, &error);
g_assert_no_error (error);
g_assert (success);
/* Save the ifcfg */
success = writer_new_connection (connection,
TEST_SCRATCH_DIR "/network-scripts/",
&testfile,
&error);
g_assert_no_error (error);
g_assert (success);
f = svOpenFile (testfile, &error);
g_assert_no_error (error);
g_assert (f);
/* re-read the file to check that what key was written. */
val = svGetValue (f, "MAC_ADDRESS_RANDOMIZATION", FALSE);
g_assert_cmpstr (val, ==, test_data->write_expected);
g_free (val);
svCloseFile (f);
/* reread will be normalized, so we must normalize connection too. */
nm_connection_normalize (connection, NULL, NULL, NULL);
/* re-read the connection for comparison */
reread = connection_from_file_test (testfile, NULL, TYPE_WIRELESS, NULL, &error);
unlink (testfile);
g_assert_no_error (error);
g_assert (reread);
success = nm_connection_verify (reread, &error);
g_assert_no_error (error);
g_assert (success);
g_assert (nm_connection_compare (connection, reread, NM_SETTING_COMPARE_FLAG_EXACT));
g_free (testfile);
g_object_unref (connection);
g_object_unref (reread);
}
static void
test_write_wired_wake_on_lan (void)
{
@ -13061,6 +13178,35 @@ int main (int argc, char **argv)
g_test_add_func (TPATH "wifi/read-band-a-channel-mismatch", test_read_wifi_band_a_channel_mismatch);
g_test_add_func (TPATH "wifi/read-band-bg-channel-mismatch", test_read_wifi_band_bg_channel_mismatch);
g_test_add_func (TPATH "wifi/read-hidden", test_read_wifi_hidden);
{
static const WifiMacRandomData test_wifi_mac_random[] = {
{ "always", NM_SETTING_MAC_RANDOMIZATION_ALWAYS, "always" },
{ "never", NM_SETTING_MAC_RANDOMIZATION_NEVER, "never" },
{ "default", NM_SETTING_MAC_RANDOMIZATION_DEFAULT, "default" },
{ "missing", NM_SETTING_MAC_RANDOMIZATION_NEVER, "never" },
};
int i;
for (i = 0; i < G_N_ELEMENTS (test_wifi_mac_random); i++) {
char *tpath;
tpath = g_strdup_printf (TPATH "wifi/read-mac-random-%s", test_wifi_mac_random[i].name);
g_test_add_data_func_full (tpath,
g_memdup (&test_wifi_mac_random[i], sizeof (test_wifi_mac_random[i])),
test_read_wifi_mac_random,
g_free);
g_free (tpath);
tpath = g_strdup_printf (TPATH "wifi/write-mac-random-%s", test_wifi_mac_random[i].name);
g_test_add_data_func_full (tpath,
g_memdup (&test_wifi_mac_random[i], sizeof (test_wifi_mac_random[i])),
test_write_wifi_mac_random,
g_free);
g_free (tpath);
}
}
test_read_wired_qeth_static ();
test_read_wired_ctc_static ();
test_read_wifi_wep_no_keys ();

16
src/settings/plugins/ifcfg-rh/writer.c
View file

@ -967,7 +967,7 @@ write_wireless_setting (NMConnection *connection,
tmp = g_strdup_printf ("KEY_PASSPHRASE%d", i + 1);
set_secret (ifcfg, tmp, NULL, "WEP_KEY_FLAGS", NM_SETTING_SECRET_FLAG_NONE, FALSE);
g_free (tmp);
tmp = g_strdup_printf ("KEY%d", i + 1);
set_secret (ifcfg, tmp, NULL, "WEP_KEY_FLAGS", NM_SETTING_SECRET_FLAG_NONE, FALSE);
g_free (tmp);
@ -989,6 +989,20 @@ write_wireless_setting (NMConnection *connection,
svSetValue (ifcfg, "SSID_HIDDEN", nm_setting_wireless_get_hidden (s_wireless) ? "yes" : NULL, TRUE);
svSetValue (ifcfg, "POWERSAVE", nm_setting_wireless_get_powersave (s_wireless) ? "yes" : NULL, TRUE);
svSetValue (ifcfg, "MAC_ADDRESS_RANDOMIZATION", NULL, TRUE);
switch (nm_setting_wireless_get_mac_address_randomization (s_wireless)) {
case NM_SETTING_MAC_RANDOMIZATION_DEFAULT:
svSetValue (ifcfg, "MAC_ADDRESS_RANDOMIZATION", "default", TRUE);
break;
case NM_SETTING_MAC_RANDOMIZATION_ALWAYS:
svSetValue (ifcfg, "MAC_ADDRESS_RANDOMIZATION", "always", TRUE);
break;
default:
case NM_SETTING_MAC_RANDOMIZATION_NEVER:
svSetValue (ifcfg, "MAC_ADDRESS_RANDOMIZATION", "never", TRUE);
break;
}
svSetValue (ifcfg, "TYPE", TYPE_WIRELESS, FALSE);
return TRUE;