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

merge: branch 'ih/initrd-fix-bond-ip6'

Browse Source 
nm-initrd-generator: fix IPv6 with square brackets in bond options

Closes #1755 and #1731

https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/merge_requests/2197
This commit is contained in:
Íñigo Huguet
2025-05-14 05:36:37 +00:00
parent 9e585b6cdc 6f6bb17a28
commit 34255b2692
2 changed files with 175 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

78
src/nm-initrd-generator/nmi-cmdline-reader.c
View File

@@ -299,33 +299,44 @@ get_word(char **argument, const char separator)
{
char *word;
int nest = 0;
char *last_ch;
char *first_close = NULL;
if (*argument == NULL)
return NULL;
if (**argument == '[') {
nest++;
(*argument)++;
}
word = *argument;
word = last_ch = *argument;
while (**argument != '\0') {
if (nest && **argument == ']') {
**argument = '\0';
(*argument)++;
nest--;
continue;
}
if (nest == 0 && **argument == separator) {
**argument = '\0';
(*argument)++;
break;
}
if (**argument == '[') {
nest++;
} else if (nest && **argument == ']') {
nest--;
if (!first_close && nest == 0)
first_close = *argument;
}
last_ch = *argument;
(*argument)++;
}
/* If the word is surrounded with the nesting symbols [], strip them so we return
* the inner content only.
* If there were nesting symbols but embracing only part of the inner content, don't
* remove them. Example:
* Remove [] in get_word("[fc08::1]:other_token", ":")
* Don't remove [] in get_word("ip6=[fc08::1]:other_token", ":")
*/
if (*word == '[' && *last_ch == ']' && last_ch == first_close) {
word++;
*last_ch = '\0';
}
return *word ? word : NULL;
}
@@ -533,7 +544,7 @@ reader_parse_ip(Reader *reader, const char *sysfs_dir, char *argument)
NMSettingConnection *s_con;
NMSettingIPConfig *s_ip4 = NULL, *s_ip6 = NULL;
gs_unref_hashtable GHashTable *ibft = NULL;
const char *tmp;
char *tmp;
const char *tmp2;
const char *tmp3;
const char *kind;
@@ -578,15 +589,25 @@ reader_parse_ip(Reader *reader, const char *sysfs_dir, char *argument)
kind = tmp3;
} else {
/* <client-IP>:[<peer>]:<gateway-IP>:<netmask>:<client_hostname>:<kind> */
client_ip = tmp;
/* note: split here address and prefix to normalize IPs defined as
* [dead::beef]/64. Latter parsing would fail due to the '[]'. */
client_ip = get_word(&tmp, '/');
if (client_ip) {
client_ip_family = get_ip_address_family(client_ip, TRUE);
client_ip_family = get_ip_address_family(client_ip, FALSE);
if (client_ip_family == AF_UNSPEC) {
_LOGW(LOGD_CORE, "Invalid IP address '%s'.", client_ip);
return;
}
}
if (!nm_str_is_empty(tmp)) {
gboolean is_ipv4 = client_ip_family == AF_INET;
client_ip_prefix = _nm_utils_ascii_str_to_int64(tmp, 10, 0, is_ipv4 ? 32 : 128, -1);
}
peer = tmp2;
gateway_ip = get_word(&argument, ':');
netmask = get_word(&argument, ':');
@@ -661,11 +682,7 @@ reader_parse_ip(Reader *reader, const char *sysfs_dir, char *argument)
NMIPAddress *address = NULL;
NMIPAddr addr;
if (nm_inet_parse_with_prefix_bin(client_ip_family,
client_ip,
NULL,
&addr,
client_ip_prefix == -1 ? &client_ip_prefix : NULL)) {
if (nm_inet_parse_bin(client_ip_family, client_ip, NULL, &addr)) {
if (client_ip_prefix == -1) {
switch (client_ip_family) {
case AF_INET:
@@ -906,13 +923,24 @@ reader_parse_controller(Reader *reader,
opts = get_word(&argument, ':');
while (opts && *opts) {
gs_free_error GError *error = NULL;
char *opt;
char *tmp;
const char *opt_name;
char *opt;
const char *opt_value;
nm_auto_unref_ptrarray GPtrArray *opt_values = g_ptr_array_new();
gs_free char *opt_normalized = NULL;
opt_name = get_word(&opts, '=');
opt = get_word(&opts, ',');
opt_name = get_word(&opt, '=');
if (!_nm_setting_bond_validate_option(opt_name, opt, &error)) {
/* Normalize: convert ';' to ',' and remove '[]' from IPv6 addresses */
tmp = opt;
while ((opt_value = get_word(&tmp, ';')))
g_ptr_array_add(opt_values, (gpointer) opt_value);
g_ptr_array_add(opt_values, NULL);
opt_normalized = g_strjoinv(",", (char **) opt_values->pdata);
if (!_nm_setting_bond_validate_option(opt_name, opt_normalized, &error)) {
_LOGW(LOGD_CORE,
"Ignoring invalid bond option: %s%s%s = %s%s%s: %s",
NM_PRINT_FMT_QUOTE_STRING(opt_name),
@@ -920,7 +948,7 @@ reader_parse_controller(Reader *reader,
error->message);
continue;
}
nm_setting_bond_add_option(s_bond, opt_name, opt);
nm_setting_bond_add_option(s_bond, opt_name, opt_normalized);
}
mtu = get_word(&argument, ':');

126
src/nm-initrd-generator/tests/test-cmdline-reader.c
View File

@@ -597,7 +597,7 @@ static void
test_if_ip6_manual(void)
{
gs_unref_hashtable GHashTable *connections = NULL;
const char *const *ARGV = NM_MAKE_STRV("ip=[2001:0db8::02]/64::[2001:0db8::01]::"
const char *const *ARGV = NM_MAKE_STRV("ip=[2001:0db8::02]/56::[2001:0db8::01]::"
"hostname0.example.com:eth4::[2001:0db8::53]");
NMConnection *connection;
NMSettingIPConfig *s_ip4;
@@ -633,7 +633,7 @@ test_if_ip6_manual(void)
ip_addr = nm_setting_ip_config_get_address(s_ip6, 0);
g_assert(ip_addr);
g_assert_cmpstr(nm_ip_address_get_address(ip_addr), ==, "2001:db8::2");
g_assert_cmpint(nm_ip_address_get_prefix(ip_addr), ==, 64);
g_assert_cmpint(nm_ip_address_get_prefix(ip_addr), ==, 56);
g_assert_cmpstr(nm_setting_ip_config_get_gateway(s_ip6), ==, "2001:db8::1");
g_assert_cmpstr(nm_setting_ip_config_get_dhcp_hostname(s_ip6), ==, NULL);
}
@@ -975,8 +975,8 @@ static void
test_bond(void)
{
gs_unref_hashtable GHashTable *connections = NULL;
const char *const *ARGV = NM_MAKE_STRV("rd.route=192.0.2.53::bong0",
"bond=bong0:eth0,eth1:mode=balance-rr:9000",
const char *const *ARGV = NM_MAKE_STRV("rd.route=192.0.2.53::bond0",
"bond=bond0:eth0,eth1:mode=balance-rr:9000",
"nameserver=203.0.113.53");
NMConnection *connection;
NMSettingConnection *s_con;
@@ -990,12 +990,12 @@ test_bond(void)
connections = _parse_cons(ARGV);
g_assert_cmpint(g_hash_table_size(connections), ==, 3);
connection = g_hash_table_lookup(connections, "bong0");
connection = g_hash_table_lookup(connections, "bond0");
nmtst_assert_connection_verifies_without_normalization(connection);
g_assert_cmpstr(nm_connection_get_connection_type(connection),
==,
NM_SETTING_BOND_SETTING_NAME);
g_assert_cmpstr(nm_connection_get_id(connection), ==, "bong0");
g_assert_cmpstr(nm_connection_get_id(connection), ==, "bond0");
controller_uuid = nm_connection_get_uuid(connection);
g_assert(controller_uuid);
@@ -1162,6 +1162,118 @@ test_bond_ip(void)
NM_CONNECTION_MULTI_CONNECT_SINGLE);
}
static void
test_bond_ip6_option(void)
{
/* Test that IPv6 addresses within [] are parsed fine in different positions */
gs_unref_hashtable GHashTable *connections = NULL;
const char *const *ARGV =
NM_MAKE_STRV("bond=bond0:eth0,eth1:arp_interval=100,ns_ip6_target=[fc08::1]",
"bond=bond1:eth2,eth3:arp_interval=100,ns_ip6_target=[fc08::1]:9000",
"bond=bond2:eth4,eth5:ns_ip6_target=[fc08::1],arp_interval=100");
NMConnection *connection;
NMSettingBond *s_bond;
connections = _parse_cons(ARGV);
g_assert_cmpint(g_hash_table_size(connections), ==, 9);
connection = g_hash_table_lookup(connections, "bond0");
nmtst_assert_connection_verifies_without_normalization(connection);
s_bond = nm_connection_get_setting_bond(connection);
g_assert(s_bond);
g_assert_cmpint(nm_setting_bond_get_num_options(s_bond), ==, 3);
g_assert_cmpstr(nm_setting_bond_get_option_by_name(s_bond, "ns_ip6_target"), ==, "fc08::1");
connection = g_hash_table_lookup(connections, "bond1");
nmtst_assert_connection_verifies_without_normalization(connection);
s_bond = nm_connection_get_setting_bond(connection);
g_assert(s_bond);
g_assert_cmpint(nm_setting_bond_get_num_options(s_bond), ==, 3);
g_assert_cmpstr(nm_setting_bond_get_option_by_name(s_bond, "ns_ip6_target"), ==, "fc08::1");
connection = g_hash_table_lookup(connections, "bond2");
nmtst_assert_connection_verifies_without_normalization(connection);
s_bond = nm_connection_get_setting_bond(connection);
g_assert(s_bond);
g_assert_cmpint(nm_setting_bond_get_num_options(s_bond), ==, 3);
g_assert_cmpstr(nm_setting_bond_get_option_by_name(s_bond, "ns_ip6_target"), ==, "fc08::1");
}
static void
test_bond_multi_values_option(void)
{
/* Test that semicolon-separated multi-valued options are parsed fine in different positions */
gs_unref_hashtable GHashTable *connections = NULL;
const char *const *ARGV =
NM_MAKE_STRV("bond=bond0:eth0,eth1:arp_interval=100,ns_ip6_target=[fc08::1];[fc08::2]",
"bond=bond1:eth2,eth3:arp_interval=100,ns_ip6_target=[fc08::1];[fc08::2]:9000",
"bond=bond2:eth4,eth5:ns_ip6_target=[fc08::1];[fc08::2],arp_interval=100",
"bond=bond3:eth6,eth7:arp_interval=100,arp_ip_target=10.0.0.1;10.0.0.2",
"bond=bond4:eth8,eth9:arp_interval=100,arp_ip_target=10.0.0.1;10.0.0.2:9000",
"bond=bond5:eth10,eth11:arp_ip_target=10.0.0.1;10.0.0.2,arp_interval=100");
NMConnection *connection;
NMSettingBond *s_bond;
connections = _parse_cons(ARGV);
g_assert_cmpint(g_hash_table_size(connections), ==, 18);
connection = g_hash_table_lookup(connections, "bond0");
nmtst_assert_connection_verifies_without_normalization(connection);
s_bond = nm_connection_get_setting_bond(connection);
g_assert(s_bond);
g_assert_cmpint(nm_setting_bond_get_num_options(s_bond), ==, 3);
g_assert_cmpstr(nm_setting_bond_get_option_by_name(s_bond, "ns_ip6_target"),
==,
"fc08::1,fc08::2");
connection = g_hash_table_lookup(connections, "bond1");
nmtst_assert_connection_verifies_without_normalization(connection);
s_bond = nm_connection_get_setting_bond(connection);
g_assert(s_bond);
g_assert_cmpint(nm_setting_bond_get_num_options(s_bond), ==, 3);
g_assert_cmpstr(nm_setting_bond_get_option_by_name(s_bond, "ns_ip6_target"),
==,
"fc08::1,fc08::2");
connection = g_hash_table_lookup(connections, "bond2");
nmtst_assert_connection_verifies_without_normalization(connection);
s_bond = nm_connection_get_setting_bond(connection);
g_assert(s_bond);
g_assert_cmpint(nm_setting_bond_get_num_options(s_bond), ==, 3);
g_assert_cmpstr(nm_setting_bond_get_option_by_name(s_bond, "ns_ip6_target"),
==,
"fc08::1,fc08::2");
connection = g_hash_table_lookup(connections, "bond3");
nmtst_assert_connection_verifies_without_normalization(connection);
s_bond = nm_connection_get_setting_bond(connection);
g_assert(s_bond);
g_assert_cmpint(nm_setting_bond_get_num_options(s_bond), ==, 3);
g_assert_cmpstr(nm_setting_bond_get_option_by_name(s_bond, "arp_ip_target"),
==,
"10.0.0.1,10.0.0.2");
connection = g_hash_table_lookup(connections, "bond4");
nmtst_assert_connection_verifies_without_normalization(connection);
s_bond = nm_connection_get_setting_bond(connection);
g_assert(s_bond);
g_assert_cmpint(nm_setting_bond_get_num_options(s_bond), ==, 3);
g_assert_cmpstr(nm_setting_bond_get_option_by_name(s_bond, "arp_ip_target"),
==,
"10.0.0.1,10.0.0.2");
connection = g_hash_table_lookup(connections, "bond5");
nmtst_assert_connection_verifies_without_normalization(connection);
s_bond = nm_connection_get_setting_bond(connection);
g_assert(s_bond);
g_assert_cmpint(nm_setting_bond_get_num_options(s_bond), ==, 3);
g_assert_cmpstr(nm_setting_bond_get_option_by_name(s_bond, "arp_ip_target"),
==,
"10.0.0.1,10.0.0.2");
}
static void
test_bond_default(void)
{
@@ -2701,6 +2813,8 @@ main(int argc, char **argv)
g_test_add_func("/initrd/cmdline/bootdev", test_bootdev);
g_test_add_func("/initrd/cmdline/bond", test_bond);
g_test_add_func("/initrd/cmdline/bond/ip", test_bond_ip);
g_test_add_func("/initrd/cmdline/bond/ip6-option", test_bond_ip6_option);
g_test_add_func("/initrd/cmdline/bond/multi-values-option", test_bond_multi_values_option);
g_test_add_func("/initrd/cmdline/bond/default", test_bond_default);
g_test_add_func("/initrd/cmdline/team", test_team);
g_test_add_func("/initrd/cmdline/vlan", test_vlan);