shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2025-01-03 05:18:09 +03:00
Code

Merge a7ced3eb45 into ccaa76ac48

Browse Source
This commit is contained in:
Ken Lewis 2024-12-20 23:53:07 +01:00 committed by GitHub
commit 3d881716f7
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/timesync/test-timesync.c
View File

@ -20,9 +20,9 @@ TEST(manager_parse_string) {
assert_se(m->have_fallbacks);
assert_se(manager_parse_fallback_string(m, NTP_SERVERS) == 0);
assert_se(manager_parse_server_string(m, SERVER_SYSTEM, "time1.foobar.com time2.foobar.com axrfav.,avf..ra 12345..123") == 0);
assert_se(manager_parse_server_string(m, SERVER_FALLBACK, "time1.foobar.com time2.foobar.com axrfav.,avf..ra 12345..123") == 0);
assert_se(manager_parse_server_string(m, SERVER_LINK, "time1.foobar.com time2.foobar.com axrfav.,avf..ra 12345..123") == 0);
assert_se(manager_parse_server_string(m, SERVER_SYSTEM, "time1.foobar.com time2.foobar.com axrfav.,avf..ra time2.foobar.com:1234 10.0.0.1 fe80::1 [fe80::1] 10.0.0.1:1234 [fe80::1]:1234 12345..123") == 0);
assert_se(manager_parse_server_string(m, SERVER_FALLBACK, "time1.foobar.com time2.foobar.com axrfav.,avf..ra time2.foobar.com:1234 10.0.0.1 fe80::1 [fe80::1] 10.0.0.1:1234 [fe80::1]:1234 12345..123") == 0);
assert_se(manager_parse_server_string(m, SERVER_LINK, "time1.foobar.com time2.foobar.com axrfav.,avf..ra time2.foobar.com:1234 10.0.0.1 fe80::1 [fe80::1] 10.0.0.1:1234 [fe80::1]:1234 12345..123") == 0);
}
DEFINE_TEST_MAIN(LOG_DEBUG);

13
src/timesync/timesyncd-conf.c
View File

@ -31,6 +31,19 @@ int manager_parse_server_string(Manager *m, ServerType type, const char *string)
if (r == 0)
break;
char *open_sq = strrchr(word, '['), *close_sq = strrchr(word, ']');
char *first_co = strchr(word, ':'), *last_co = strrchr(word, ':');
if (!close_sq && first_co && last_co && strlen(first_co) == strlen(last_co)) { /* if word has exactly one ':' */
log_error("Invalid address specification in %s, systemd-timesyncd does not support port numbers other than IETF RFC standard", word);
continue;
} else if (close_sq && strlen(close_sq) == strlen(last_co)+1) { /* else if ']:' is a substring */
log_error("Invalid [IP::v:6]:port address in %s, systemd-timesyncd does not support port numbers other than IETF RFC standard", word);
continue;
} else if (open_sq && close_sq && strlen(word) == strlen(open_sq) && strlen(close_sq) == 1) { /* else if first char is '[' and last is ']', the underlying GNU inet_pton chokes on it */
log_error("Invalid [IP::v:6] rendering of your server address, ignoring %s", word);
continue;
}
r = dns_name_is_valid_or_address(word);
if (r < 0)
return log_error_errno(r, "Failed to check validity of NTP server name or address '%s': %m", word);