X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Ftmpfiles%2Ftmpfiles.c;h=c6121bccf3641fb25a43dc9fd79b4194fe00bcd5;hb=1910cd0e05f7661986680e0a4472f4e857f90787;hp=02351e18f70b588d2d1f43768a82f3961a008135;hpb=9f6445e34a57c270f013c9416c123e56261553dd;p=elogind.git diff --git a/src/tmpfiles/tmpfiles.c b/src/tmpfiles/tmpfiles.c index 02351e18f..c6121bccf 100644 --- a/src/tmpfiles/tmpfiles.c +++ b/src/tmpfiles/tmpfiles.c @@ -53,6 +53,7 @@ #include "capability.h" #include "specifier.h" #include "build.h" +#include "copy.h" /* This reads all files listed in /etc/tmpfiles.d/?*.conf and creates * them in the file system. This is intended to be used to create @@ -63,22 +64,23 @@ typedef enum ItemType { /* These ones take file names */ CREATE_FILE = 'f', TRUNCATE_FILE = 'F', - WRITE_FILE = 'w', CREATE_DIRECTORY = 'd', TRUNCATE_DIRECTORY = 'D', CREATE_FIFO = 'p', CREATE_SYMLINK = 'L', CREATE_CHAR_DEVICE = 'c', CREATE_BLOCK_DEVICE = 'b', - ADJUST_MODE = 'm', + COPY_FILES = 'C', /* These ones take globs */ + WRITE_FILE = 'w', IGNORE_PATH = 'x', IGNORE_DIRECTORY_PATH = 'X', REMOVE_PATH = 'r', RECURSIVE_REMOVE_PATH = 'R', + ADJUST_MODE = 'm', /* legacy, 'z' is identical to this */ RELABEL_PATH = 'z', - RECURSIVE_RELABEL_PATH = 'Z' + RECURSIVE_RELABEL_PATH = 'Z', } ItemType; typedef struct Item { @@ -99,17 +101,18 @@ typedef struct Item { bool age_set:1; bool keep_first_level:1; -} Item; -static Hashmap *items = NULL, *globs = NULL; -static Set *unix_sockets = NULL; + bool done:1; +} Item; static bool arg_create = false; static bool arg_clean = false; static bool arg_remove = false; +static bool arg_boot = false; -static char **include_prefixes = NULL; -static char **exclude_prefixes = NULL; +static char **arg_include_prefixes = NULL; +static char **arg_exclude_prefixes = NULL; +static char *arg_root = NULL; static const char conf_file_dirs[] = "/etc/tmpfiles.d\0" @@ -123,8 +126,19 @@ static const char conf_file_dirs[] = #define MAX_DEPTH 256 +static Hashmap *items = NULL, *globs = NULL; +static Set *unix_sockets = NULL; + static bool needs_glob(ItemType t) { - return t == IGNORE_PATH || t == IGNORE_DIRECTORY_PATH || t == REMOVE_PATH || t == RECURSIVE_REMOVE_PATH || t == RELABEL_PATH || t == RECURSIVE_RELABEL_PATH; + return IN_SET(t, + WRITE_FILE, + IGNORE_PATH, + IGNORE_DIRECTORY_PATH, + REMOVE_PATH, + RECURSIVE_REMOVE_PATH, + ADJUST_MODE, + RELABEL_PATH, + RECURSIVE_RELABEL_PATH); } static struct Item* find_glob(Hashmap *h, const char *match) { @@ -215,19 +229,20 @@ static bool unix_socket_alive(const char *fn) { } static int dir_is_mount_point(DIR *d, const char *subdir) { - struct file_handle *h; + + union file_handle_union h = { + .handle.handle_bytes = MAX_HANDLE_SZ + }; + int mount_id_parent, mount_id; int r_p, r; - h = alloca(MAX_HANDLE_SZ); - - h->handle_bytes = MAX_HANDLE_SZ; - r_p = name_to_handle_at(dirfd(d), ".", h, &mount_id_parent, 0); + r_p = name_to_handle_at(dirfd(d), ".", &h.handle, &mount_id_parent, 0); if (r_p < 0) r_p = -errno; - h->handle_bytes = MAX_HANDLE_SZ; - r = name_to_handle_at(dirfd(d), subdir, h, &mount_id, 0); + h.handle.handle_bytes = MAX_HANDLE_SZ; + r = name_to_handle_at(dirfd(d), subdir, &h.handle, &mount_id, 0); if (r < 0) r = -errno; @@ -302,7 +317,8 @@ static int dir_cleanup( if (s.st_uid == 0 && !(s.st_mode & S_IWUSR)) continue; - if (asprintf(&sub_path, "%s/%s", p, dent->d_name) < 0) { + sub_path = strjoin(p, "/", dent->d_name, NULL); + if (!sub_path) { r = log_oom(); goto finish; } @@ -328,7 +344,7 @@ static int dir_cleanup( int q; sub_dir = xopendirat(dirfd(d), dent->d_name, O_NOFOLLOW|O_NOATIME); - if (sub_dir == NULL) { + if (!sub_dir) { if (errno != ENOENT) { log_error("opendir(%s/%s) failed: %m", p, dent->d_name); r = -errno; @@ -338,7 +354,6 @@ static int dir_cleanup( } q = dir_cleanup(i, sub_path, sub_dir, &s, cutoff, rootdev, false, maxdepth-1, false); - if (q < 0) r = q; } @@ -435,7 +450,8 @@ finish: } static int item_set_perms_full(Item *i, const char *path, bool ignore_enoent) { - int r; + assert(i); + assert(path); /* not using i->path directly because it may be a glob */ if (i->mode_set) @@ -457,8 +473,7 @@ static int item_set_perms_full(Item *i, const char *path, bool ignore_enoent) { } } - r = label_fix(path, false, false); - return r == -ENOENT && ignore_enoent ? 0 : r; + return label_fix(path, ignore_enoent, false); } static int item_set_perms(Item *i, const char *path) { @@ -466,20 +481,21 @@ static int item_set_perms(Item *i, const char *path) { } static int write_one_file(Item *i, const char *path) { - int e, flags; + int flags; int fd = -1; struct stat st; int r = 0; + assert(i); + assert(path); + flags = i->type == CREATE_FILE ? O_CREAT|O_APPEND : i->type == TRUNCATE_FILE ? O_CREAT|O_TRUNC : 0; RUN_WITH_UMASK(0) { label_context_set(path, S_IFREG); fd = open(path, flags|O_NDELAY|O_CLOEXEC|O_WRONLY|O_NOCTTY|O_NOFOLLOW, i->mode); - e = errno; label_context_clear(); - errno = e; } if (fd < 0) { @@ -491,13 +507,13 @@ static int write_one_file(Item *i, const char *path) { } if (i->argument) { + _cleanup_free_ char *unescaped; ssize_t n; size_t l; - _cleanup_free_ char *unescaped; unescaped = cunescape(i->argument); if (unescaped == NULL) { - close_nointr_nofail(fd); + safe_close(fd); return log_oom(); } @@ -506,12 +522,12 @@ static int write_one_file(Item *i, const char *path) { if (n < 0 || (size_t) n < l) { log_error("Failed to write file %s: %s", path, n < 0 ? strerror(-n) : "Short write"); - close_nointr_nofail(fd); + safe_close(fd); return n < 0 ? n : -EIO; } } - close_nointr_nofail(fd); + safe_close(fd); if (stat(path, &st) < 0) { log_error("stat(%s) failed: %m", path); @@ -530,110 +546,90 @@ static int write_one_file(Item *i, const char *path) { return 0; } -static int recursive_relabel_children(Item *i, const char *path) { +static int item_set_perms_children(Item *i, const char *path) { _cleanup_closedir_ DIR *d; - int ret = 0; + int r = 0; + + assert(i); + assert(path); /* This returns the first error we run into, but nevertheless * tries to go on */ d = opendir(path); if (!d) - return errno == ENOENT ? 0 : -errno; + return errno == ENOENT || errno == ENOTDIR ? 0 : -errno; for (;;) { + _cleanup_free_ char *p = NULL; struct dirent *de; - bool is_dir; - int r; - _cleanup_free_ char *entry_path = NULL; + int q; errno = 0; de = readdir(d); - if (!de && errno != 0) { - if (ret == 0) - ret = -errno; - break; - } + if (!de) { + if (errno != 0 && r == 0) + r = -errno; - if (!de) break; + } if (streq(de->d_name, ".") || streq(de->d_name, "..")) continue; - if (asprintf(&entry_path, "%s/%s", path, de->d_name) < 0) { - if (ret == 0) - ret = -ENOMEM; - continue; - } - - if (de->d_type == DT_UNKNOWN) { - struct stat st; - - if (lstat(entry_path, &st) < 0) { - if (ret == 0 && errno != ENOENT) - ret = -errno; - continue; - } - - is_dir = S_ISDIR(st.st_mode); - - } else - is_dir = de->d_type == DT_DIR; + p = strjoin(path, "/", de->d_name, NULL); + if (!p) + return -ENOMEM; - r = item_set_perms(i, entry_path); - if (r < 0) { - if (ret == 0 && r != -ENOENT) - ret = r; - continue; - } + q = item_set_perms(i, p); + if (q < 0 && q != -ENOENT && r == 0) + r = q; - if (is_dir) { - r = recursive_relabel_children(i, entry_path); - if (r < 0 && ret == 0) - ret = r; + if (IN_SET(de->d_type, DT_UNKNOWN, DT_DIR)) { + q = item_set_perms_children(i, p); + if (q < 0 && r == 0) + r = q; } } - return ret; + return r; } -static int recursive_relabel(Item *i, const char *path) { - int r; - struct stat st; +static int item_set_perms_recursive(Item *i, const char *path) { + int r, q; + + assert(i); + assert(path); r = item_set_perms(i, path); if (r < 0) return r; - if (lstat(path, &st) < 0) - return -errno; - - if (S_ISDIR(st.st_mode)) - r = recursive_relabel_children(i, path); + q = item_set_perms_children(i, path); + if (q < 0 && r == 0) + r = q; return r; } static int glob_item(Item *i, int (*action)(Item *, const char *)) { - int r = 0, k; _cleanup_globfree_ glob_t g = {}; + int r = 0, k; char **fn; errno = 0; k = glob(i->path, GLOB_NOSORT|GLOB_BRACE, NULL, &g); - if (k != 0) - if (k != GLOB_NOMATCH) { - if (errno > 0) - errno = EIO; + if (k != 0 && k != GLOB_NOMATCH) { + if (errno == 0) + errno = EIO; - log_error("glob(%s) failed: %m", i->path); - return -errno; - } + log_error("glob(%s) failed: %m", i->path); + return -errno; + } STRV_FOREACH(fn, g.gl_pathv) { k = action(i, *fn); - if (k < 0) + if (k < 0 && r == 0) r = k; } @@ -641,7 +637,6 @@ static int glob_item(Item *i, int (*action)(Item *, const char *)) { } static int create_item(Item *i) { - int e; struct stat st; int r = 0; @@ -662,15 +657,21 @@ static int create_item(Item *i) { return r; break; - case WRITE_FILE: - r = glob_item(i, write_one_file); + case COPY_FILES: + r = copy_tree(i->argument, i->path); + if (r < 0) { + log_error("Failed to copy files: %s", strerror(-r)); + return r; + } + + r = item_set_perms(i, i->path); if (r < 0) return r; break; - case ADJUST_MODE: - r = item_set_perms_full(i, i->path, true); + case WRITE_FILE: + r = glob_item(i, write_one_file); if (r < 0) return r; @@ -733,13 +734,11 @@ static int create_item(Item *i) { break; case CREATE_SYMLINK: { - char *x; + _cleanup_free_ char *x = NULL; label_context_set(i->path, S_IFLNK); r = symlink(i->argument, i->path); - e = errno; label_context_clear(); - errno = e; if (r < 0 && errno != EEXIST) { log_error("symlink(%s, %s) failed: %m", i->argument, i->path); @@ -753,12 +752,10 @@ static int create_item(Item *i) { } if (!streq(i->argument, x)) { - free(x); - log_error("%s is not the right symlinks.", i->path); + log_error("%s is not the right symlink.", i->path); return -EEXIST; } - free(x); break; } @@ -781,9 +778,7 @@ static int create_item(Item *i) { RUN_WITH_UMASK(0000) { label_context_set(i->path, file_type); r = mknod(i->path, i->mode | file_type, i->major_minor); - e = errno; label_context_clear(); - errno = e; } if (r < 0 && errno != EEXIST) { @@ -808,6 +803,7 @@ static int create_item(Item *i) { break; } + case ADJUST_MODE: case RELABEL_PATH: r = glob_item(i, item_set_perms); @@ -817,9 +813,11 @@ static int create_item(Item *i) { case RECURSIVE_RELABEL_PATH: - r = glob_item(i, recursive_relabel); + r = glob_item(i, item_set_perms_recursive); if (r < 0) return r; + + break; } log_debug("%s created successfully.", i->path); @@ -843,10 +841,11 @@ static int remove_item_instance(Item *i, const char *instance) { case CREATE_CHAR_DEVICE: case IGNORE_PATH: case IGNORE_DIRECTORY_PATH: + case ADJUST_MODE: case RELABEL_PATH: case RECURSIVE_RELABEL_PATH: case WRITE_FILE: - case ADJUST_MODE: + case COPY_FILES: break; case REMOVE_PATH: @@ -889,10 +888,11 @@ static int remove_item(Item *i) { case CREATE_BLOCK_DEVICE: case IGNORE_PATH: case IGNORE_DIRECTORY_PATH: + case ADJUST_MODE: case RELABEL_PATH: case RECURSIVE_RELABEL_PATH: case WRITE_FILE: - case ADJUST_MODE: + case COPY_FILES: break; case REMOVE_PATH: @@ -964,6 +964,7 @@ static int clean_item(Item *i) { case CREATE_DIRECTORY: case TRUNCATE_DIRECTORY: case IGNORE_PATH: + case COPY_FILES: clean_item_instance(i, i->path); break; case IGNORE_DIRECTORY_PATH: @@ -978,9 +979,23 @@ static int clean_item(Item *i) { static int process_item(Item *i) { int r, q, p; + char prefix[PATH_MAX]; assert(i); + if (i->done) + return 0; + + i->done = true; + + PATH_FOREACH_PREFIX(prefix, i->path) { + Item *j; + + j = hashmap_get(items, prefix); + if (j) + process_item(j); + } + r = arg_create ? create_item(i) : 0; q = arg_remove ? remove_item(i) : 0; p = arg_clean ? clean_item(i) : 0; @@ -1003,7 +1018,6 @@ static void item_free(Item *i) { } DEFINE_TRIVIAL_CLEANUP_FUNC(Item*, item_free); -#define _cleanup_item_free_ _cleanup_(item_freep) static bool item_equal(Item *a, Item *b) { assert(a); @@ -1034,7 +1048,8 @@ static bool item_equal(Item *a, Item *b) { if ((a->type == CREATE_FILE || a->type == TRUNCATE_FILE || a->type == WRITE_FILE || - a->type == CREATE_SYMLINK) && + a->type == CREATE_SYMLINK || + a->type == COPY_FILES) && !streq_ptr(a->argument, b->argument)) return false; @@ -1049,19 +1064,19 @@ static bool item_equal(Item *a, Item *b) { static bool should_include_path(const char *path) { char **prefix; - STRV_FOREACH(prefix, exclude_prefixes) { + STRV_FOREACH(prefix, arg_exclude_prefixes) { if (path_startswith(path, *prefix)) return false; } - STRV_FOREACH(prefix, include_prefixes) { + STRV_FOREACH(prefix, arg_include_prefixes) { if (path_startswith(path, *prefix)) return true; } /* no matches, so we should include this path only if we * have no whitelist at all */ - return strv_length(include_prefixes) == 0; + return strv_length(arg_include_prefixes) == 0; } static int parse_line(const char *fname, unsigned line, const char *buffer) { @@ -1074,10 +1089,9 @@ static int parse_line(const char *fname, unsigned line, const char *buffer) { {} }; - _cleanup_item_free_ Item *i = NULL; + _cleanup_free_ char *action = NULL, *mode = NULL, *user = NULL, *group = NULL, *age = NULL, *path = NULL; + _cleanup_(item_freep) Item *i = NULL; Item *existing; - _cleanup_free_ char - *mode = NULL, *user = NULL, *group = NULL, *age = NULL, *path = NULL; char type; Hashmap *h; int r, n = -1; @@ -1087,8 +1101,8 @@ static int parse_line(const char *fname, unsigned line, const char *buffer) { assert(buffer); r = sscanf(buffer, - "%c %ms %ms %ms %ms %ms %n", - &type, + "%ms %ms %ms %ms %ms %ms %n", + &action, &path, &mode, &user, @@ -1100,6 +1114,14 @@ static int parse_line(const char *fname, unsigned line, const char *buffer) { return -EIO; } + if (strlen(action) > 2 || (strlen(action) > 1 && action[1] != '!')) { + log_error("[%s:%u] Unknown modifier '%s'", fname, line, action); + return -EINVAL; + } else if (strlen(action) > 1 && !arg_boot) + return 0; + + type = action[0]; + i = new0(Item, 1); if (!i) return log_oom(); @@ -1130,9 +1152,9 @@ static int parse_line(const char *fname, unsigned line, const char *buffer) { case IGNORE_DIRECTORY_PATH: case REMOVE_PATH: case RECURSIVE_REMOVE_PATH: + case ADJUST_MODE: case RELABEL_PATH: case RECURSIVE_RELABEL_PATH: - case ADJUST_MODE: break; case CREATE_SYMLINK: @@ -1140,6 +1162,7 @@ static int parse_line(const char *fname, unsigned line, const char *buffer) { log_error("[%s:%u] Symlink file requires argument.", fname, line); return -EBADMSG; } + break; case WRITE_FILE: @@ -1149,6 +1172,20 @@ static int parse_line(const char *fname, unsigned line, const char *buffer) { } break; + case COPY_FILES: + if (!i->argument) { + log_error("[%s:%u] Copy files requires argument.", fname, line); + return -EBADMSG; + } + + if (!path_is_absolute(i->argument)) { + log_error("[%s:%u] Source path is not absolute.", fname, line); + return -EBADMSG; + } + + path_kill_slashes(i->argument); + break; + case CREATE_CHAR_DEVICE: case CREATE_BLOCK_DEVICE: { unsigned major, minor; @@ -1184,6 +1221,17 @@ static int parse_line(const char *fname, unsigned line, const char *buffer) { if (!should_include_path(i->path)) return 0; + if (arg_root) { + char *p; + + p = strappend(arg_root, i->path); + if (!p) + return log_oom(); + + free(i->path); + i->path = p; + } + if (user && !streq(user, "-")) { const char *u = user; @@ -1271,8 +1319,10 @@ static int help(void) { " --create Create marked files/directories\n" " --clean Clean up marked directories\n" " --remove Remove marked files/directories\n" + " --boot Execute actions only safe at boot\n" " --prefix=PATH Only apply rules that apply to paths with the specified prefix\n" - " --exclude-prefix=PATH Ignore rules that apply to paths with the specified prefix\n", + " --exclude-prefix=PATH Ignore rules that apply to paths with the specified prefix\n" + " --root=PATH Operate on an alternate filesystem root\n", program_invocation_short_name); return 0; @@ -1285,8 +1335,10 @@ static int parse_argv(int argc, char *argv[]) { ARG_CREATE, ARG_CLEAN, ARG_REMOVE, + ARG_BOOT, ARG_PREFIX, ARG_EXCLUDE_PREFIX, + ARG_ROOT, }; static const struct option options[] = { @@ -1295,8 +1347,10 @@ static int parse_argv(int argc, char *argv[]) { { "create", no_argument, NULL, ARG_CREATE }, { "clean", no_argument, NULL, ARG_CLEAN }, { "remove", no_argument, NULL, ARG_REMOVE }, + { "boot", no_argument, NULL, ARG_BOOT }, { "prefix", required_argument, NULL, ARG_PREFIX }, { "exclude-prefix", required_argument, NULL, ARG_EXCLUDE_PREFIX }, + { "root", required_argument, NULL, ARG_ROOT }, {} }; @@ -1329,14 +1383,25 @@ static int parse_argv(int argc, char *argv[]) { arg_remove = true; break; + case ARG_BOOT: + arg_boot = true; + break; + case ARG_PREFIX: - if (strv_extend(&include_prefixes, optarg) < 0) + if (strv_push(&arg_include_prefixes, optarg) < 0) return log_oom(); break; case ARG_EXCLUDE_PREFIX: - if (strv_extend(&exclude_prefixes, optarg) < 0) + if (strv_push(&arg_exclude_prefixes, optarg) < 0) + return log_oom(); + break; + + case ARG_ROOT: + arg_root = path_make_absolute_cwd(optarg); + if (!arg_root) return log_oom(); + path_kill_slashes(arg_root); break; case '?': @@ -1365,7 +1430,7 @@ static int read_config_file(const char *fn, bool ignore_enoent) { assert(fn); - r = search_and_fopen_nulstr(fn, "re", conf_file_dirs, &f); + r = search_and_fopen_nulstr(fn, "re", arg_root, conf_file_dirs, &f); if (r < 0) { if (ignore_enoent && r == -ENOENT) return 0; @@ -1466,7 +1531,7 @@ int main(int argc, char *argv[]) { _cleanup_strv_free_ char **files = NULL; char **f; - r = conf_files_list_nulstr(&files, ".conf", NULL, conf_file_dirs); + r = conf_files_list_nulstr(&files, ".conf", arg_root, conf_file_dirs); if (r < 0) { log_error("Failed to enumerate tmpfiles.d files: %s", strerror(-r)); goto finish; @@ -1495,7 +1560,9 @@ finish: hashmap_free(items); hashmap_free(globs); - strv_free(include_prefixes); + free(arg_include_prefixes); + free(arg_exclude_prefixes); + free(arg_root); set_free_free(unix_sockets);