SymbX/systemd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

tree-wide: make specifier expansion --root= aware

Browse Source 
This fixes repart's, systemctl's, sysusers' and tmpfiles' specifier
expansion to honour the root dir specified with --root=. This is
relevant for specifiers such as %m, %o, … which are directly sourced
from files on disk.

This doesn't try to be overly smart: specifiers referring to runtime
concepts (i.e. boot ID, architecture, hostname) rather than files on the
medium are left as is. There's certainly a point to be made that they
should fail in case --root= is specified, but I am not entirely convinced
about that, and it's certainly something we can look into later if
there's reason to.

I wondered for a while how to hook this up best, but given that quite a
large number of specifiers resolve to data from files on disks, and most
of our tools needs this, I ultimately decided to make the root dir a
first class parameter to specifier_printf().

Replaces: #16187
Fixes: #16183
This commit is contained in:
Lennart Poettering
2021-06-24 22:30:14 +02:00
committed by Zbigniew Jędrzejewski-Szmek
parent 0c651d32d4
commit de61a04b18
16 changed files with 181 additions and 136 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/shared/specifier.c
+57 -40
View File
@@ -10,9 +10,11 @@
#include "alloc-util.h"
#include "architecture.h"
#include "fd-util.h"
#include "format-util.h"
#include "fs-util.h"
#include "hostname-util.h"
#include "id128-util.h"
#include "macro.h"
#include "os-util.h"
#include "specifier.h"
@@ -29,7 +31,7 @@
* and "%" used for escaping. */
#define POSSIBLE_SPECIFIERS ALPHANUMERICAL "%"
int specifier_printf(const char *text, size_t max_length, const Specifier table[], const void *userdata, char **ret) {
int specifier_printf(const char *text, size_t max_length, const Specifier table[], const char *root, const void *userdata, char **ret) {
_cleanup_free_ char *result = NULL;
bool percent = false;
const char *f;
@@ -60,7 +62,7 @@ int specifier_printf(const char *text, size_t max_length, const Specifier table[
_cleanup_free_ char *w = NULL;
size_t k, j;
r = i->lookup(i->specifier, i->data, userdata, &w);
r = i->lookup(i->specifier, i->data, root, userdata, &w);
if (r < 0)
return r;
@@ -104,7 +106,7 @@ int specifier_printf(const char *text, size_t max_length, const Specifier table[
/* Generic handler for simple string replacements */
int specifier_string(char specifier, const void *data, const void *userdata, char **ret) {
int specifier_string(char specifier, const void *data, const char *root, const void *userdata, char **ret) {
char *n;
n = strdup(strempty(data));
@@ -115,12 +117,21 @@ int specifier_string(char specifier, const void *data, const void *userdata, cha
return 0;
}
int specifier_machine_id(char specifier, const void *data, const void *userdata, char **ret) {
int specifier_machine_id(char specifier, const void *data, const char *root, const void *userdata, char **ret) {
sd_id128_t id;
char *n;
int r;
r = sd_id128_get_machine(&id);
if (root) {
_cleanup_close_ int fd = -1;
fd = chase_symlinks_and_open("/etc/machine-id", root, CHASE_PREFIX_ROOT, O_RDONLY|O_CLOEXEC|O_NOCTTY, NULL);
if (fd < 0)
return fd;
r = id128_read_fd(fd, ID128_PLAIN, &id);
} else
r = sd_id128_get_machine(&id);
if (r < 0)
return r;
@@ -132,7 +143,7 @@ int specifier_machine_id(char specifier, const void *data, const void *userdata,
return 0;
}
int specifier_boot_id(char specifier, const void *data, const void *userdata, char **ret) {
int specifier_boot_id(char specifier, const void *data, const char *root, const void *userdata, char **ret) {
sd_id128_t id;
char *n;
int r;
@@ -149,7 +160,7 @@ int specifier_boot_id(char specifier, const void *data, const void *userdata, ch
return 0;
}
int specifier_host_name(char specifier, const void *data, const void *userdata, char **ret) {
int specifier_host_name(char specifier, const void *data, const char *root, const void *userdata, char **ret) {
char *n;
n = gethostname_malloc();
@@ -160,7 +171,7 @@ int specifier_host_name(char specifier, const void *data, const void *userdata,
return 0;
}
int specifier_short_host_name(char specifier, const void *data, const void *userdata, char **ret) {
int specifier_short_host_name(char specifier, const void *data, const char *root, const void *userdata, char **ret) {
char *n;
n = gethostname_short_malloc();
@@ -171,7 +182,7 @@ int specifier_short_host_name(char specifier, const void *data, const void *user
return 0;
}
int specifier_kernel_release(char specifier, const void *data, const void *userdata, char **ret) {
int specifier_kernel_release(char specifier, const void *data, const char *root, const void *userdata, char **ret) {
struct utsname uts;
char *n;
int r;
@@ -188,7 +199,7 @@ int specifier_kernel_release(char specifier, const void *data, const void *userd
return 0;
}
int specifier_architecture(char specifier, const void *data, const void *userdata, char **ret) {
int specifier_architecture(char specifier, const void *data, const char *root, const void *userdata, char **ret) {
char *t;
t = strdup(architecture_to_string(uname_architecture()));
@@ -199,11 +210,11 @@ int specifier_architecture(char specifier, const void *data, const void *userdat
return 0;
}
static int specifier_os_release_common(const char *field, char **ret) {
static int specifier_os_release_common(const char *field, const char *root, char **ret) {
char *t = NULL;
int r;
r = parse_os_release(NULL, field, &t);
r = parse_os_release(root, field, &t);
if (r < 0)
return r;
if (!t) {
@@ -218,31 +229,31 @@ static int specifier_os_release_common(const char *field, char **ret) {
return 0;
}
int specifier_os_id(char specifier, const void *data, const void *userdata, char **ret) {
return specifier_os_release_common("ID", ret);
int specifier_os_id(char specifier, const void *data, const char *root, const void *userdata, char **ret) {
return specifier_os_release_common("ID", root, ret);
}
int specifier_os_version_id(char specifier, const void *data, const void *userdata, char **ret) {
return specifier_os_release_common("VERSION_ID", ret);
int specifier_os_version_id(char specifier, const void *data, const char *root, const void *userdata, char **ret) {
return specifier_os_release_common("VERSION_ID", root, ret);
}
int specifier_os_build_id(char specifier, const void *data, const void *userdata, char **ret) {
return specifier_os_release_common("BUILD_ID", ret);
int specifier_os_build_id(char specifier, const void *data, const char *root, const void *userdata, char **ret) {
return specifier_os_release_common("BUILD_ID", root, ret);
}
int specifier_os_variant_id(char specifier, const void *data, const void *userdata, char **ret) {
return specifier_os_release_common("VARIANT_ID", ret);
int specifier_os_variant_id(char specifier, const void *data, const char *root, const void *userdata, char **ret) {
return specifier_os_release_common("VARIANT_ID", root, ret);
}
int specifier_os_image_id(char specifier, const void *data, const void *userdata, char **ret) {
return specifier_os_release_common("IMAGE_ID", ret);
int specifier_os_image_id(char specifier, const void *data, const char *root, const void *userdata, char **ret) {
return specifier_os_release_common("IMAGE_ID", root, ret);
}
int specifier_os_image_version(char specifier, const void *data, const void *userdata, char **ret) {
return specifier_os_release_common("IMAGE_VERSION", ret);
int specifier_os_image_version(char specifier, const void *data, const char *root, const void *userdata, char **ret) {
return specifier_os_release_common("IMAGE_VERSION", root, ret);
}
int specifier_group_name(char specifier, const void *data, const void *userdata, char **ret) {
int specifier_group_name(char specifier, const void *data, const char *root, const void *userdata, char **ret) {
char *t;
t = gid_to_name(getgid());
@@ -253,14 +264,14 @@ int specifier_group_name(char specifier, const void *data, const void *userdata,
return 0;
}
int specifier_group_id(char specifier, const void *data, const void *userdata, char **ret) {
int specifier_group_id(char specifier, const void *data, const char *root, const void *userdata, char **ret) {
if (asprintf(ret, UID_FMT, getgid()) < 0)
return -ENOMEM;
return 0;
}
int specifier_user_name(char specifier, const void *data, const void *userdata, char **ret) {
int specifier_user_name(char specifier, const void *data, const char *root, const void *userdata, char **ret) {
char *t;
/* If we are UID 0 (root), this will not result in NSS, otherwise it might. This is good, as we want to be able
@@ -278,7 +289,7 @@ int specifier_user_name(char specifier, const void *data, const void *userdata,
return 0;
}
int specifier_user_id(char specifier, const void *data, const void *userdata, char **ret) {
int specifier_user_id(char specifier, const void *data, const char *root, const void *userdata, char **ret) {
if (asprintf(ret, UID_FMT, getuid()) < 0)
return -ENOMEM;
@@ -286,7 +297,7 @@ int specifier_user_id(char specifier, const void *data, const void *userdata, ch
return 0;
}
int specifier_user_home(char specifier, const void *data, const void *userdata, char **ret) {
int specifier_user_home(char specifier, const void *data, const char *root, const void *userdata, char **ret) {
/* On PID 1 (which runs as root) this will not result in NSS,
* which is good. See above */
@@ -294,7 +305,7 @@ int specifier_user_home(char specifier, const void *data, const void *userdata,
return get_home_dir(ret);
}
int specifier_user_shell(char specifier, const void *data, const void *userdata, char **ret) {
int specifier_user_shell(char specifier, const void *data, const char *root, const void *userdata, char **ret) {
/* On PID 1 (which runs as root) this will not result in NSS,
* which is good. See above */
@@ -302,15 +313,18 @@ int specifier_user_shell(char specifier, const void *data, const void *userdata,
return get_shell(ret);
}
int specifier_tmp_dir(char specifier, const void *data, const void *userdata, char **ret) {
int specifier_tmp_dir(char specifier, const void *data, const char *root, const void *userdata, char **ret) {
const char *p;
char *copy;
int r;
r = tmp_dir(&p);
if (r < 0)
return r;
if (root) /* If root dir is set, don't honour $TMP or similar */
p = "/tmp";
else {
r = tmp_dir(&p);
if (r < 0)
return r;
}
copy = strdup(p);
if (!copy)
return -ENOMEM;
@@ -319,15 +333,18 @@ int specifier_tmp_dir(char specifier, const void *data, const void *userdata, ch
return 0;
}
int specifier_var_tmp_dir(char specifier, const void *data, const void *userdata, char **ret) {
int specifier_var_tmp_dir(char specifier, const void *data, const char *root, const void *userdata, char **ret) {
const char *p;
char *copy;
int r;
r = var_tmp_dir(&p);
if (r < 0)
return r;
if (root)
p = "/var/tmp";
else {
r = var_tmp_dir(&p);
if (r < 0)
return r;
}
copy = strdup(p);
if (!copy)
return -ENOMEM;