picnoir/Systemd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

core/execute: report invalid environment variables from files

Browse source 
Because "export key=val" is not supported by systemd, an error is logged
where the invalid assignment is coming from.

Introduce strv_env_clean_log() to log invalid environment assignments,
where logging is possible and allowed.

parse_env_file_internal() is modified to allow WHITESPACE in keys, to
report the issues later on.
This commit is contained in:
Harald Hoyer 2013-04-17 15:25:02 +02:00
parent d2a514b838
commit ebc05a09ad
5 changed files with 73 additions and 61 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/core/execute.c
View file

@ -1770,6 +1770,8 @@ int exec_context_load_environment(const ExecContext *c, char ***l) {
strv_free(r);
return k;
}
/* Log invalid environment variables with filename */
p = strv_env_clean_log(p, pglob.gl_pathv[n]);
if (r == NULL)
r = p;

8
src/shared/env-util.c
View file

@ -376,7 +376,7 @@ char *strv_env_get(char **l, const char *name) {
return strv_env_get_n(l, name, strlen(name));
}
char **strv_env_clean(char **e) {
char **strv_env_clean_log(char **e, const char *message) {
char **p, **q;
int k = 0;
@ -385,6 +385,8 @@ char **strv_env_clean(char **e) {
bool duplicate = false;
if (!env_assignment_is_valid(*p)) {
if (message)
log_error("Ignoring invalid environment '%s': %s", *p, message);
free(*p);
continue;
}
@ -407,3 +409,7 @@ char **strv_env_clean(char **e) {
e[k] = NULL;
return e;
}
char **strv_env_clean(char **e) {
return strv_env_clean_log(e, NULL);
}

1
src/shared/env-util.h
View file

@ -30,6 +30,7 @@ bool env_assignment_is_valid(const char *e);
bool strv_env_is_valid(char **e);
char **strv_env_clean(char **l);
char **strv_env_clean_log(char **e, const char *message);
bool strv_env_name_or_assignment_is_valid(char **l);

34
src/shared/fileio.c
View file

@ -184,7 +184,6 @@ static int parse_env_file_internal(
enum {
PRE_KEY,
KEY,
PRE_EQUAL,
PRE_VALUE,
VALUE,
VALUE_ESCAPE,
@ -209,9 +208,7 @@ static int parse_env_file_internal(
switch (state) {
case PRE_KEY:
if (startswith(p, "export "))
p+=6;
else if (strchr(COMMENTS, c))
if (strchr(COMMENTS, c))
state = COMMENT;
else if (!strchr(WHITESPACE, c)) {
state = KEY;
@ -228,9 +225,7 @@ static int parse_env_file_internal(
if (strchr(newline, c)) {
state = PRE_KEY;
n_key = 0;
} else if (strchr(WHITESPACE, c))
state = PRE_EQUAL;
else if (c == '=')
} else if (c == '=')
state = PRE_VALUE;
else {
if (!greedy_realloc((void**) &key, &key_alloc, n_key+2)) {
@ -243,19 +238,6 @@ static int parse_env_file_internal(
break;
case PRE_EQUAL:
if (strchr(newline, c)) {
state = PRE_KEY;
n_key = 0;
} else if (c == '=')
state = PRE_VALUE;
else if (!strchr(WHITESPACE, c)) {
n_key = 0;
state = COMMENT;
}
break;
case PRE_VALUE:
if (strchr(newline, c) || strchr(COMMENTS, c)) {
state = PRE_KEY;
@ -264,6 +246,10 @@ static int parse_env_file_internal(
if (value)
value[n_value] = 0;
/* strip trailing whitespace from key */
while(strchr(WHITESPACE, key[--n_key]))
key[n_key]=0;
r = push(key, value, userdata);
if (r < 0)
goto fail;
@ -302,6 +288,10 @@ static int parse_env_file_internal(
if (last_whitespace != (size_t) -1)
value[last_whitespace] = 0;
/* strip trailing whitespace from key */
while(strchr(WHITESPACE, key[--n_key]))
key[n_key]=0;
r = push(key, value, userdata);
if (r < 0)
goto fail;
@ -426,6 +416,10 @@ static int parse_env_file_internal(
if (value)
value[n_value] = 0;
/* strip trailing whitespace from key */
while(strchr(WHITESPACE, key[--n_key]))
key[n_key]=0;
r = push(key, value, userdata);
if (r < 0)
goto fail;

89
src/test/test-fileio.c
View file

@ -26,12 +26,14 @@
#include "util.h"
#include "fileio.h"
#include "strv.h"
#include "env-util.h"
static void test_parse_env_file(void) {
char t[] = "/tmp/test-parse-env-file-XXXXXX";
int fd, r;
FILE *f;
_cleanup_free_ char *one = NULL, *two = NULL, *three = NULL, *four = NULL, *five = NULL, *six = NULL, *seven = NULL, *eight = NULL, *nine = NULL;
_cleanup_free_ char *one = NULL, *two = NULL, *three = NULL, *four = NULL, *five = NULL,
*six = NULL, *seven = NULL, *eight = NULL, *nine = NULL, *ten = NULL;
_cleanup_strv_free_ char **a = NULL, **b = NULL;
char **i;
unsigned k;
@ -53,48 +55,14 @@ static void test_parse_env_file(void) {
"five = \'55\\\'55\' \"FIVE\" cinco \n"
"six = seis sechs\\\n"
" sis\n"
"export seven=\"sevenval\"#comment\n"
"seven=\"sevenval\"#comment\n"
"eight=#comment\n"
"nine=", f);
"export nine=nineval\n"
"ten=", f);
fflush(f);
fclose(f);
r = parse_env_file(
t, NULL,
"one", &one,
"two", &two,
"three", &three,
"four", &four,
"five", &five,
"six", &six,
"seven", &seven,
"eight", &eight,
"nine", &nine,
NULL);
assert_se(r >= 0);
log_info("one=[%s]", strna(one));
log_info("two=[%s]", strna(two));
log_info("three=[%s]", strna(three));
log_info("four=[%s]", strna(four));
log_info("five=[%s]", strna(five));
log_info("six=[%s]", strna(six));
log_info("seven=[%s]", strna(seven));
log_info("eight=[%s]", strna(eight));
log_info("nine=[%s]", strna(nine));
assert_se(streq(one, "BAR"));
assert_se(streq(two, "bar"));
assert_se(streq(three, "333\nxxxx"));
assert_se(streq(four, "44\"44"));
assert_se(streq(five, "55\'55FIVEcinco"));
assert_se(streq(six, "seis sechs sis"));
assert_se(streq(seven, "sevenval"));
assert_se(eight == NULL);
assert_se(nine == NULL);
r = load_env_file(t, NULL, &a);
assert_se(r >= 0);
@ -109,8 +77,11 @@ static void test_parse_env_file(void) {
assert_se(streq(a[5], "six=seis sechs sis"));
assert_se(streq(a[6], "seven=sevenval"));
assert_se(streq(a[7], "eight="));
assert_se(streq(a[8], "nine="));
assert_se(a[9] == NULL);
assert_se(streq(a[8], "export nine=nineval"));
assert_se(streq(a[9], "ten="));
assert_se(a[10] == NULL);
strv_env_clean_log(a, "/tmp/test-fileio");
r = write_env_file("/tmp/test-fileio", a);
assert_se(r >= 0);
@ -124,6 +95,44 @@ static void test_parse_env_file(void) {
assert_se(streq(*i, a[k++]));
}
r = parse_env_file(
t, NULL,
"one", &one,
"two", &two,
"three", &three,
"four", &four,
"five", &five,
"six", &six,
"seven", &seven,
"eight", &eight,
"export nine", &nine,
"ten", &ten,
NULL);
assert_se(r >= 0);
log_info("one=[%s]", strna(one));
log_info("two=[%s]", strna(two));
log_info("three=[%s]", strna(three));
log_info("four=[%s]", strna(four));
log_info("five=[%s]", strna(five));
log_info("six=[%s]", strna(six));
log_info("seven=[%s]", strna(seven));
log_info("eight=[%s]", strna(eight));
log_info("export nine=[%s]", strna(nine));
log_info("ten=[%s]", strna(nine));
assert_se(streq(one, "BAR"));
assert_se(streq(two, "bar"));
assert_se(streq(three, "333\nxxxx"));
assert_se(streq(four, "44\"44"));
assert_se(streq(five, "55\'55FIVEcinco"));
assert_se(streq(six, "seis sechs sis"));
assert_se(streq(seven, "sevenval"));
assert_se(eight == NULL);
assert_se(streq(nine, "nineval"));
assert_se(ten == NULL);
unlink(t);
unlink("/tmp/test-fileio");
}