fragment: properly handle quotes in assignments in EnvironmentFile= files

diff --git a/TODO b/TODO
index c580bbb3d1c3d4e5142da731871a0bf7d4f76b18..5bca513d275f5bad21b8a7668c7e8c3273937676 100644 (file)
--- a/TODO
+++ b/TODO
@@ -13,9 +13,6 @@
 * make failing dm detaching in systemd-shutdown less noisy
   https://bugzilla.redhat.com/show_bug.cgi?id=657497
 
-* handle quotes in files read by EnvironmentFile= properly
-  https://bugzilla.redhat.com/show_bug.cgi?id=661291
-
 * load EnvironmentFile= when starting services, not when reloading configuration
   https://bugzilla.redhat.com/show_bug.cgi?id=661282
 

diff --git a/src/load-fragment.c b/src/load-fragment.c
index 1b23205a2f7fde8eb66842824678a8219ff05269..281863264e1ec212b6a0bc0eed68d14b27f6ab41 100644 (file)
--- a/src/load-fragment.c
+++ b/src/load-fragment.c
@@ -1360,7 +1360,7 @@ static int config_parse_env_file(
         }
 
         while (!feof(f)) {
-                char l[LINE_MAX], *p;
+                char l[LINE_MAX], *p, *u;
                 char **t;
 
                 if (!fgets(l, sizeof(l), f)) {
@@ -1381,7 +1381,21 @@ static int config_parse_env_file(
                 if (strchr(COMMENTS, *p))
                         continue;
 
-                t = strv_env_set(*env, p);
+                if (!(u = normalize_env_assignment(p))) {
+                        log_error("Out of memory");
+                        r = -ENOMEM;
+                        goto finish;
+                }
+
+                t = strv_env_set(*env, u);
+                free(u);
+
+                if (!t) {
+                        log_error("Out of memory");
+                        r = -ENOMEM;
+                        goto finish;
+                }
+
                 strv_free(*env);
                 *env = t;
         }

diff --git a/src/test-env-replace.c b/src/test-env-replace.c
index e8c9dbf73617136b8e5164fdc582a34316b689c4..37dd7ff590a690da1606be6e209913b686da1b21 100644 (file)
--- a/src/test-env-replace.c
+++ b/src/test-env-replace.c
@@ -47,7 +47,7 @@ int main(int argc, char *argv[]) {
                 NULL
         };
 
-        char **i, **r;
+        char **i, **r, *t;
 
         r = replace_env_argv((char**) line, (char**) env);
 
@@ -56,4 +56,45 @@ int main(int argc, char *argv[]) {
 
         strv_free(r);
 
+        t = normalize_env_assignment("foo=bar");
+        printf("%s\n", t);
+        free(t);
+
+        t = normalize_env_assignment("=bar");
+        printf("%s\n", t);
+        free(t);
+
+        t = normalize_env_assignment("foo=");
+        printf("%s\n", t);
+        free(t);
+
+        t = normalize_env_assignment("=");
+        printf("%s\n", t);
+        free(t);
+
+        t = normalize_env_assignment("");
+        printf("%s\n", t);
+        free(t);
+
+        t = normalize_env_assignment("a=\"waldo\"");
+        printf("%s\n", t);
+        free(t);
+
+        t = normalize_env_assignment("a=\"waldo");
+        printf("%s\n", t);
+        free(t);
+
+        t = normalize_env_assignment("a=waldo\"");
+        printf("%s\n", t);
+        free(t);
+
+        t = normalize_env_assignment("a=\'");
+        printf("%s\n", t);
+        free(t);
+
+        t = normalize_env_assignment("a=\'\'");
+        printf("%s\n", t);
+        free(t);
+
+        return 0;
 }

diff --git a/src/util.c b/src/util.c
index 08bdec223eda8f2bebd6d345050c49aca74b40b3..21afdceb8cc4cf666de6d36318c1ea30be175de7 100644 (file)
--- a/src/util.c
+++ b/src/util.c
@@ -3326,6 +3326,44 @@ char *unquote(const char *s, const char* quotes) {
         return strdup(s);
 }
 
+char *normalize_env_assignment(const char *s) {
+        char *name, *value, *p, *r;
+
+        p = strchr(s, '=');
+
+        if (!p) {
+                if (!(r = strdup(s)))
+                        return NULL;
+
+                return strstrip(r);
+        }
+
+        if (!(name = strndup(s, p - s)))
+                return NULL;
+
+        if (!(p = strdup(p+1))) {
+                free(name);
+                return NULL;
+        }
+
+        value = unquote(strstrip(p), QUOTES);
+        free(p);
+
+        if (!value) {
+                free(p);
+                free(name);
+                return NULL;
+        }
+
+        if (asprintf(&r, "%s=%s", name, value) < 0)
+                r = NULL;
+
+        free(value);
+        free(name);
+
+        return r;
+}
+
 int wait_for_terminate(pid_t pid, siginfo_t *status) {
         assert(pid >= 1);
         assert(status);

diff --git a/src/util.h b/src/util.h
index 1e4eedfbce54ffc269f62fb9283cbeadd2553a94..e9ad881e9cd50c356e019dae532296061dff5b2c 100644 (file)
--- a/src/util.h
+++ b/src/util.h
@@ -355,6 +355,7 @@ char *ellipsize(const char *s, unsigned length, unsigned percent);
 int touch(const char *path);
 
 char *unquote(const char *s, const char *quotes);
+char *normalize_env_assignment(const char *s);
 
 int wait_for_terminate(pid_t pid, siginfo_t *status);
 int wait_for_terminate_and_warn(const char *name, pid_t pid);