shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2024-11-01 00:51:24 +03:00
Code

sd-dhcp-client: validate hostnames stricter (#7308)

Browse Source 
Technically DNS allows any ASCII character to be used in the
domain name. Also the DHCP specification for the FQDN option
(RFC 4702) does not put restriction on labels.

However, hostnames do have stricter requirements and typically
should only use characters from a-z (case insensitve), 0-9 and
minus.

Currently we require hostname/FQDN to be either a hostname or
a valid DNS name. Since dns_name_is_valid() allows any ASCII
characters this allows to specify hostnames which are typically
not valid.

Check hostname/FQDN more strictly and require them to pass both
tests. Specifically this requires the entire FQDN to be below 63.
This commit is contained in:
Stefan Agner 2017-11-16 10:05:44 +01:00 committed by Lennart Poettering
parent 0c08bc7f09
commit 9740eae694
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/libsystemd-network/sd-dhcp-client.c
View File

@ -415,9 +415,9 @@ int sd_dhcp_client_set_hostname(
assert_return(client, -EINVAL);
/* Refuse hostnames that neither qualify as DNS nor as Linux hosntames */
/* Make sure hostnames qualify as DNS and as Linux hostnames */
if (hostname &&
!(hostname_is_valid(hostname, false) || dns_name_is_valid(hostname) > 0))
!(hostname_is_valid(hostname, false) && dns_name_is_valid(hostname) > 0))
return -EINVAL;
return free_and_strdup(&client->hostname, hostname);

6
src/libsystemd-network/test-dhcp-client.c
View File

@ -75,6 +75,12 @@ static void test_request_basic(sd_event *e) {
assert_se(sd_dhcp_client_set_ifindex(client, 0) == -EINVAL);
assert_se(sd_dhcp_client_set_ifindex(client, 1) == 0);
assert_se(sd_dhcp_client_set_hostname(client, "host") == 1);
assert_se(sd_dhcp_client_set_hostname(client, "host.domain") == 1);
assert_se(sd_dhcp_client_set_hostname(client, NULL) == 1);
assert_se(sd_dhcp_client_set_hostname(client, "~host") == -EINVAL);
assert_se(sd_dhcp_client_set_hostname(client, "~host.domain") == -EINVAL);
assert_se(sd_dhcp_client_set_request_option(client,
SD_DHCP_OPTION_SUBNET_MASK) == -EEXIST);
assert_se(sd_dhcp_client_set_request_option(client,