From 15dbdbd90db21bea19e48194a485bbaaa9501b9b Mon Sep 17 00:00:00 2001

From: Lennart Poettering <lennart@poettering.net>

Date: Mon, 7 Jul 2014 12:04:55 +0200

Subject: [PATCH] util: don't consider tabs special in string_has_cc() anymore

Instead, take a list of exceptions to our usual CC check

(cherry picked from commit 6294aa76d818e831de4592b41a37e225fd0871f9)

---

 src/hostname/hostnamed.c |  3 +--

 src/shared/env-util.c    |  4 +++-

 src/shared/fileio.c      |  2 +-

 src/shared/util.c        | 19 ++++++++++---------

 src/shared/util.h        |  2 +-

 5 files changed, 16 insertions(+), 14 deletions(-)

diff --git a/src/hostname/hostnamed.c b/src/hostname/hostnamed.c

index 8127b688c4..eaae1139fa 100644

--- a/src/hostname/hostnamed.c

+++ b/src/hostname/hostnamed.c

@@ -551,8 +551,7 @@ static int set_machine_info(Context *c, sd_bus *bus, sd_bus_message *m, int prop

                 if (prop == PROP_ICON_NAME && !filename_is_safe(name))

                         return sd_bus_error_setf(error, SD_BUS_ERROR_INVALID_ARGS, "Invalid icon name '%s'", name);

-                if (prop == PROP_PRETTY_HOSTNAME &&

-                    (string_has_cc(name) || chars_intersect(name, "\t")))

+                if (prop == PROP_PRETTY_HOSTNAME && string_has_cc(name, NULL))

                         return sd_bus_error_setf(error, SD_BUS_ERROR_INVALID_ARGS, "Invalid pretty host name '%s'", name);

                 if (prop == PROP_CHASSIS && !valid_chassis(name))

                         return sd_bus_error_setf(error, SD_BUS_ERROR_INVALID_ARGS, "Invalid chassis '%s'", name);

diff --git a/src/shared/env-util.c b/src/shared/env-util.c

index b2e45531ab..20b208f63c 100644

--- a/src/shared/env-util.c

+++ b/src/shared/env-util.c

@@ -78,7 +78,9 @@ bool env_value_is_valid(const char *e) {

         if (!utf8_is_valid(e))

                 return false;

-        if (string_has_cc(e))

+        /* bash allows tabs in environment variables, and so should

+         * we */

+        if (string_has_cc(e, "\t"))

                 return false;

         /* POSIX says the overall size of the environment block cannot

diff --git a/src/shared/fileio.c b/src/shared/fileio.c

index fb1c1bcf9f..b1de5908c5 100644

--- a/src/shared/fileio.c

+++ b/src/shared/fileio.c

@@ -738,7 +738,7 @@ static void write_env_var(FILE *f, const char *v) {

         p++;

         fwrite(v, 1, p-v, f);

-        if (string_has_cc(p) || chars_intersect(p, WHITESPACE "\'\"\\`$")) {

+        if (string_has_cc(p, NULL) || chars_intersect(p, WHITESPACE "\'\"\\`$")) {

                 fputc('\"', f);

                 for (; *p; p++) {

diff --git a/src/shared/util.c b/src/shared/util.c

index d25ee6652f..d223ecf711 100644

--- a/src/shared/util.c

+++ b/src/shared/util.c

@@ -5350,16 +5350,14 @@ bool filename_is_safe(const char *p) {

 bool string_is_safe(const char *p) {

         const char *t;

-        assert(p);

+        if (!p)

+                return false;

         for (t = p; *t; t++) {

                 if (*t > 0 && *t < ' ')

                         return false;

-                if (*t == 127)

-                        return false;

-

-                if (strchr("\\\"\'", *t))

+                if (strchr("\\\"\'\0x7f", *t))

                         return false;

         }

@@ -5367,16 +5365,19 @@ bool string_is_safe(const char *p) {

 }

 /**

- * Check if a string contains control characters.

- * Spaces and tabs are not considered control characters.

+ * Check if a string contains control characters. If 'ok' is non-NULL

+ * it may be a string containing additional CCs to be considered OK.

  */

-bool string_has_cc(const char *p) {

+bool string_has_cc(const char *p, const char *ok) {

         const char *t;

         assert(p);

         for (t = p; *t; t++) {

-                if (*t > 0 && *t < ' ' && *t != '\t')

+                if (ok && strchr(ok, *t))

+                        return false;

+

+                if (*t > 0 && *t < ' ')

                         return true;

                 if (*t == 127)

diff --git a/src/shared/util.h b/src/shared/util.h

index e23069c016..7124e51d90 100644

--- a/src/shared/util.h

+++ b/src/shared/util.h

@@ -692,7 +692,7 @@ _alloc_(2, 3) static inline void *memdup_multiply(const void *p, size_t a, size_

 bool filename_is_safe(const char *p) _pure_;

 bool path_is_safe(const char *p) _pure_;

 bool string_is_safe(const char *p) _pure_;

-bool string_has_cc(const char *p) _pure_;

+bool string_has_cc(const char *p, const char *ok) _pure_;

 /**

  * Check if a string contains any glob patterns.