SymbX/systemd
1
0
Fork 0
Code Issues Pull Requests Actions Packages 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:31:45 +02:00
parent d2a514b838
commit ebc05a09ad
5 changed files with 73 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/shared/env-util.c
+7 -1
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);
}
src/shared/env-util.h
+1
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);
src/shared/fileio.c
+14 -20
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;