fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-05-04 16:28:01 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

dhcp: handle escaped spaces in 'domain search' option (bgo #575145)

Browse source
This commit is contained in:
Dan Williams 2009-04-08 21:02:18 -04:00
parent 0b7517ffa0
commit 9885de6bdb
2 changed files with 102 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

51
src/dhcp-manager/nm-dhcp-manager.c
View file

@ -801,6 +801,45 @@ out:
g_strfreev (searches);
}
static void
process_domain_search (NMIP4Config *ip4_config, const char *str)
{
char **searches, **s;
char *unescaped, *p;
int i;
g_return_if_fail (str != NULL);
g_return_if_fail (ip4_config != NULL);
p = unescaped = g_strdup (str);
do {
p = strstr (p, "\\032");
if (!p)
break;
/* Clear the escaped space with real spaces */
for (i = 0; i < 4; i++)
*p++ = ' ';
} while (*p++);
if (strchr (unescaped, '\\')) {
nm_info (" invalid domain search: '%s'", unescaped);
goto out;
}
searches = g_strsplit (unescaped, " ", 0);
for (s = searches; *s; s++) {
if (strlen (*s)) {
nm_info (" domain search '%s'", *s);
nm_ip4_config_add_search (ip4_config, *s);
}
}
g_strfreev (searches);
out:
g_free (unescaped);
}
/* Given a table of DHCP options from the client, convert into an IP4Config */
NMIP4Config *
nm_dhcp_manager_options_to_ip4_config (const char *iface, GHashTable *options)
@ -912,16 +951,8 @@ nm_dhcp_manager_options_to_ip4_config (const char *iface, GHashTable *options)
}
str = g_hash_table_lookup (options, "new_domain_search");
if (str) {
char **searches = g_strsplit (str, " ", 0);
char **s;
for (s = searches; *s; s++) {
nm_info (" domain search '%s'", *s);
nm_ip4_config_add_search (ip4_config, *s);
}
g_strfreev (searches);
}
if (str)
process_domain_search (ip4_config, str);
str = g_hash_table_lookup (options, "new_netbios_name_servers");
if (str) {

61
src/tests/test-dhcp-options.c
View file

@ -520,6 +520,65 @@ test_gateway_in_classless_routes (void)
g_hash_table_destroy (options);
}
static Option escaped_searches_options[] = {
{ "new_domain_search", "host1\\032host2\\032host3" },
{ NULL, NULL }
};
static void
test_escaped_domain_searches (void)
{
GHashTable *options;
NMIP4Config *ip4_config;
const char *expected_search0 = "host1";
const char *expected_search1 = "host2";
const char *expected_search2 = "host3";
options = fill_table (generic_options, NULL);
options = fill_table (escaped_searches_options, options);
ip4_config = nm_dhcp_manager_options_to_ip4_config ("eth0", options);
ASSERT (ip4_config != NULL,
"dhcp-escaped-domain-searches", "failed to parse DHCP4 options");
/* domain searches */
ASSERT (nm_ip4_config_get_num_searches (ip4_config) == 3,
"dhcp-escaped-domain-searches", "unexpected number of searches");
ASSERT (!strcmp (nm_ip4_config_get_search (ip4_config, 0), expected_search0),
"dhcp-escaped-domain-searches", "unexpected domain search #1");
ASSERT (!strcmp (nm_ip4_config_get_search (ip4_config, 1), expected_search1),
"dhcp-escaped-domain-searches", "unexpected domain search #1");
ASSERT (!strcmp (nm_ip4_config_get_search (ip4_config, 2), expected_search2),
"dhcp-escaped-domain-searches", "unexpected domain search #1");
g_hash_table_destroy (options);
}
static Option invalid_escaped_searches_options[] = {
{ "new_domain_search", "host1\\aahost2\\032host3" },
{ NULL, NULL }
};
static void
test_invalid_escaped_domain_searches (void)
{
GHashTable *options;
NMIP4Config *ip4_config;
options = fill_table (generic_options, NULL);
options = fill_table (invalid_escaped_searches_options, options);
ip4_config = nm_dhcp_manager_options_to_ip4_config ("eth0", options);
ASSERT (ip4_config != NULL,
"dhcp-invalid-escaped-domain-searches", "failed to parse DHCP4 options");
/* domain searches */
ASSERT (nm_ip4_config_get_num_searches (ip4_config) == 0,
"dhcp-invalid-escaped-domain-searches", "unexpected domain searches");
g_hash_table_destroy (options);
}
int main (int argc, char **argv)
{
GError *error = NULL;
@ -540,6 +599,8 @@ int main (int argc, char **argv)
test_invalid_classless_routes2 ();
test_invalid_classless_routes3 ();
test_gateway_in_classless_routes ();
test_escaped_domain_searches ();
test_invalid_escaped_domain_searches ();
basename = g_path_get_basename (argv[0]);
fprintf (stdout, "%s: SUCCESS\n", basename);