shaba/systemd-stable
1
1
Fork 0
mirror of https://github.com/systemd/systemd-stable.git synced 2025-03-08 20:58:20 +03:00
Code

env-util: refactor parsing helper for SYSTEMD_SYSEXT_HIERARCHIES out of sysext

Browse Source
This commit is contained in:
Luca Boccassi 2021-01-19 17:11:55 +00:00
parent d335f4c583
commit 93547f2812
3 changed files with 52 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
src/basic/env-util.c
View File

@ -12,6 +12,7 @@
#include "extract-word.h"
#include "macro.h"
#include "parse-util.h"
#include "path-util.h"
#include "process-util.h"
#include "stdio-util.h"
#include "string-util.h"
@ -787,3 +788,44 @@ int setenv_systemd_exec_pid(bool update_only) {
return 1;
}
int getenv_path_list(const char *name, char ***ret_paths) {
_cleanup_strv_free_ char **l = NULL;
const char *e;
char **p;
int r;
assert(name);
assert(ret_paths);
*ret_paths = NULL;
e = secure_getenv(name);
if (!e)
return 0;
r = strv_split_full(&l, e, ":", EXTRACT_DONT_COALESCE_SEPARATORS);
if (r < 0)
return log_debug_errno(r, "Failed to parse $%s: %m", name);
STRV_FOREACH(p, l) {
if (!path_is_absolute(*p))
return log_debug_errno(SYNTHETIC_ERRNO(EINVAL),
"Path '%s' is not absolute, refusing.", *p);
if (!path_is_normalized(*p))
return log_debug_errno(SYNTHETIC_ERRNO(EINVAL),
"Path '%s' is not normalized, refusing.", *p);
if (path_equal(*p, "/"))
return log_debug_errno(SYNTHETIC_ERRNO(EINVAL),
"Path '%s' is the root fs, refusing.", *p);
}
if (strv_isempty(l))
return log_debug_errno(SYNTHETIC_ERRNO(EINVAL),
"No paths specified, refusing.");
*ret_paths = TAKE_PTR(l);
return 0;
}

4
src/basic/env-util.h
View File

@ -59,3 +59,7 @@ int getenv_bool_secure(const char *p);
int set_unset_env(const char *name, const char *value, bool overwrite);
int setenv_systemd_exec_pid(bool update_only);
/* Parses and does sanity checks on an environment variable containing
* PATH-like colon-separated absolute paths */
int getenv_path_list(const char *name, char ***ret_paths);

48
src/sysext/sysext.c
View File

@ -8,6 +8,7 @@
#include "capability-util.h"
#include "discover-image.h"
#include "dissect-image.h"
#include "env-util.h"
#include "escape.h"
#include "fd-util.h"
#include "fileio.h"
@ -954,46 +955,6 @@ static int parse_argv(int argc, char *argv[]) {
return 1;
}
static int parse_env(void) {
_cleanup_strv_free_ char **l = NULL;
const char *e;
char **p;
int r;
e = secure_getenv("SYSTEMD_SYSEXT_HIERARCHIES");
if (!e)
return 0;
/* For debugging purposes it might make sense to do this for other hierarchies than /usr/ and
* /opt/, but let's make that a hacker/debugging feature, i.e. env var instead of cmdline
* switch. */
r = strv_split_full(&l, e, ":", EXTRACT_DONT_COALESCE_SEPARATORS);
if (r < 0)
return log_error_errno(r, "Failed to parse $SYSTEMD_SYSEXT_HIERARCHIES: %m");
STRV_FOREACH(p, l) {
if (!path_is_absolute(*p))
return log_error_errno(SYNTHETIC_ERRNO(EINVAL),
"Hierarchy path '%s' is not absolute, refusing.", *p);
if (!path_is_normalized(*p))
return log_error_errno(SYNTHETIC_ERRNO(EINVAL),
"Hierarchy path '%s' is not normalized, refusing.", *p);
if (path_equal(*p, "/"))
return log_error_errno(SYNTHETIC_ERRNO(EINVAL),
"Hierarchy path '%s' is the root fs, refusing.", *p);
}
if (strv_isempty(l))
return log_error_errno(SYNTHETIC_ERRNO(EINVAL),
"No hierarchies specified, refusing.");
strv_free_and_replace(arg_hierarchies, l);
return 0;
}
static int sysext_main(int argc, char *argv[]) {
static const Verb verbs[] = {
@ -1018,9 +979,12 @@ static int run(int argc, char *argv[]) {
if (r <= 0)
return r;
r = parse_env();
/* For debugging purposes it might make sense to do this for other hierarchies than /usr/ and
* /opt/, but let's make that a hacker/debugging feature, i.e. env var instead of cmdline
* switch. */
r = getenv_path_list("SYSTEMD_SYSEXT_HIERARCHIES", &arg_hierarchies);
if (r < 0)
return r;
return log_error_errno(r, "Failed to parse $SYSTEMD_SYSEXT_HIERARCHIES environment variable: %m");
if (!arg_hierarchies) {
arg_hierarchies = strv_new("/usr", "/opt");