diff options
| -rw-r--r-- | src/shared/util.c | 20 | ||||
| -rw-r--r-- | src/test/test-util.c | 14 |
2 files changed, 31 insertions, 3 deletions
diff --git a/src/shared/util.c b/src/shared/util.c index 020b75d0f2..bc6e035c60 100644 --- a/src/shared/util.c +++ b/src/shared/util.c @@ -3773,13 +3773,27 @@ static bool hostname_valid_char(char c) { bool hostname_is_valid(const char *s) { const char *p; + bool dot; if (isempty(s)) return false; - for (p = s; *p; p++) - if (!hostname_valid_char(*p)) - return false; + for (p = s, dot = true; *p; p++) { + if (*p == '.') { + if (dot) + return false; + + dot = true; + } else { + if (!hostname_valid_char(*p)) + return false; + + dot = false; + } + } + + if (dot) + return false; if (p-s > HOST_NAME_MAX) return false; diff --git a/src/test/test-util.c b/src/test/test-util.c index cd017ef6fc..08310c83ca 100644 --- a/src/test/test-util.c +++ b/src/test/test-util.c @@ -325,6 +325,19 @@ static void test_bus_path_escape(void) { test_bus_path_escape_one(":1", "_3a1"); } +static void test_hostname_is_valid(void) { + assert(hostname_is_valid("foobar")); + assert(hostname_is_valid("foobar.com")); + assert(!hostname_is_valid("fööbar")); + assert(!hostname_is_valid("")); + assert(!hostname_is_valid(".")); + assert(!hostname_is_valid("..")); + assert(!hostname_is_valid("foobar.")); + assert(!hostname_is_valid(".foobar")); + assert(!hostname_is_valid("foo..bar")); + assert(!hostname_is_valid("xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx")); +} + int main(int argc, char *argv[]) { test_streq_ptr(); test_first_word(); @@ -349,6 +362,7 @@ int main(int argc, char *argv[]) { test_default_term_for_tty(); test_memdup_multiply(); test_bus_path_escape(); + test_hostname_is_valid(); return 0; } |