summaryrefslogtreecommitdiff
path: root/src/basic
diff options
context:
space:
mode:
authorZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2015-07-27 22:15:26 -0400
committerZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2015-08-05 20:49:20 -0400
commit8fb494435889dcb9e1c09b8c7220e47bab717bf9 (patch)
tree68685a2da5e072996a37e491c1fab61aacf0ccce /src/basic
parentbaee30afce50b611724e6c6a4ca61a4469b11d9d (diff)
hostname-util: add relax parameter to hostname_is_valid
Tests are modified to check behaviour with relax and without relax. New tests are added for hostname_cleanup(). Tests are moved a new file (test-hostname-util) because there's now a bunch of them. New parameter is not used anywhere, except in tests, so there should be no observable change.
Diffstat (limited to 'src/basic')
-rw-r--r--src/basic/hostname-util.c15
-rw-r--r--src/basic/hostname-util.h2
-rw-r--r--src/basic/util.c2
-rw-r--r--src/basic/util.h5
4 files changed, 19 insertions, 5 deletions
diff --git a/src/basic/hostname-util.c b/src/basic/hostname-util.c
index e336f269fa..21fae89fd0 100644
--- a/src/basic/hostname-util.c
+++ b/src/basic/hostname-util.c
@@ -61,14 +61,22 @@ static bool hostname_valid_char(char c) {
c == '.';
}
-bool hostname_is_valid(const char *s) {
+/**
+ * Check if s looks like a valid host name or fqdn. This does not do
+ * full DNS validation, but only checks if the name is composed of
+ * allowed characters and the length is not above the maximum allowed
+ * by Linux (c.f. dns_name_is_valid()). Trailing dot is allowed if
+ * relax is true and at least two components are present in the name.
+ */
+bool hostname_is_valid(const char *s, bool relax) {
const char *p;
bool dot;
+ unsigned dots = 0;
if (isempty(s))
return false;
- /* Doesn't accept empty hostnames, hostnames with trailing or
+ /* Doesn't accept empty hostnames, hostnames with
* leading dots, and hostnames with multiple dots in a
* sequence. Also ensures that the length stays below
* HOST_NAME_MAX. */
@@ -79,6 +87,7 @@ bool hostname_is_valid(const char *s) {
return false;
dot = true;
+ dots ++;
} else {
if (!hostname_valid_char(*p))
return false;
@@ -87,7 +96,7 @@ bool hostname_is_valid(const char *s) {
}
}
- if (dot)
+ if (dot && (dots < 2 || !relax))
return false;
if (p-s > HOST_NAME_MAX)
diff --git a/src/basic/hostname-util.h b/src/basic/hostname-util.h
index 0c4763cf5a..ecae3a267c 100644
--- a/src/basic/hostname-util.h
+++ b/src/basic/hostname-util.h
@@ -29,7 +29,7 @@ bool hostname_is_set(void);
char* gethostname_malloc(void);
-bool hostname_is_valid(const char *s) _pure_;
+bool hostname_is_valid(const char *s, bool relax) _pure_;
char* hostname_cleanup(char *s, bool lowercase);
bool is_localhost(const char *hostname);
diff --git a/src/basic/util.c b/src/basic/util.c
index 7896be8788..f81bf4e31e 100644
--- a/src/basic/util.c
+++ b/src/basic/util.c
@@ -2997,7 +2997,7 @@ char* strshorten(char *s, size_t l) {
bool machine_name_is_valid(const char *s) {
- if (!hostname_is_valid(s))
+ if (!hostname_is_valid(s, false))
return false;
/* Machine names should be useful hostnames, but also be
diff --git a/src/basic/util.h b/src/basic/util.h
index c2e5cc610b..5c0130d265 100644
--- a/src/basic/util.h
+++ b/src/basic/util.h
@@ -858,6 +858,11 @@ int unquote_first_word(const char **p, char **ret, UnquoteFlags flags);
int unquote_first_word_and_warn(const char **p, char **ret, UnquoteFlags flags, const char *unit, const char *filename, unsigned line, const char *rvalue);
int unquote_many_words(const char **p, UnquoteFlags flags, ...) _sentinel_;
+static inline void free_and_replace(char **s, char *v) {
+ free(*s);
+ *s = v;
+}
+
int free_and_strdup(char **p, const char *s);
#define INOTIFY_EVENT_MAX (sizeof(struct inotify_event) + NAME_MAX + 1)