X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Ftmpfiles.c;h=18067c4b1f72ef59c9f8c6984324fad6df3344cc;hp=d242dac7dc0652f25e21d7778e3901915ed38180;hb=a8d8878329893d19106053e5008f0075f149aa16;hpb=bd40a2d830265cdd36eb19576bdbe8e41dd527ee diff --git a/src/tmpfiles.c b/src/tmpfiles.c index d242dac7d..18067c4b1 100644 --- a/src/tmpfiles.c +++ b/src/tmpfiles.c @@ -36,6 +36,8 @@ #include #include #include +#include +#include #include "log.h" #include "util.h" @@ -45,22 +47,26 @@ /* 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 - * properly owned directories beneath /tmp, /var/tmp, /var/run and - * /var/lock which are volatile and hence need to be recreated on - * bootup. */ + * properly owned directories beneath /tmp, /var/tmp, /run, which are + * volatile and hence need to be recreated on bootup. */ -enum { +typedef enum ItemType { + /* These ones take file names */ CREATE_FILE = 'f', TRUNCATE_FILE = 'F', CREATE_DIRECTORY = 'd', TRUNCATE_DIRECTORY = 'D', + CREATE_FIFO = 'p', + + /* These ones take globs */ IGNORE_PATH = 'x', REMOVE_PATH = 'r', - RECURSIVE_REMOVE_PATH = 'R' -}; + RECURSIVE_REMOVE_PATH = 'R', + RECURSIVE_RELABEL_PATH = 'Z' +} ItemType; typedef struct Item { - char type; + ItemType type; char *path; uid_t uid; @@ -74,14 +80,107 @@ typedef struct Item { bool age_set:1; } Item; -static Hashmap *items = NULL; +static Hashmap *items = NULL, *globs = NULL; +static Set *unix_sockets = NULL; static bool arg_create = false; static bool arg_clean = false; static bool arg_remove = false; +static const char *arg_prefix = NULL; + #define MAX_DEPTH 256 +static bool needs_glob(ItemType t) { + return t == IGNORE_PATH || t == REMOVE_PATH || t == RECURSIVE_REMOVE_PATH || t == RECURSIVE_RELABEL_PATH; +} + +static struct Item* find_glob(Hashmap *h, const char *match) { + Item *j; + Iterator i; + + HASHMAP_FOREACH(j, h, i) + if (fnmatch(j->path, match, FNM_PATHNAME|FNM_PERIOD) == 0) + return j; + + return NULL; +} + +static void load_unix_sockets(void) { + FILE *f = NULL; + char line[LINE_MAX]; + + if (unix_sockets) + return; + + /* We maintain a cache of the sockets we found in + * /proc/net/unix to speed things up a little. */ + + if (!(unix_sockets = set_new(string_hash_func, string_compare_func))) + return; + + if (!(f = fopen("/proc/net/unix", "re"))) + return; + + if (!(fgets(line, sizeof(line), f))) + goto fail; + + for (;;) { + char *p, *s; + int k; + + if (!(fgets(line, sizeof(line), f))) + break; + + truncate_nl(line); + + if (strlen(line) < 53) + continue; + + p = line + 53; + p += strspn(p, WHITESPACE); + p += strcspn(p, WHITESPACE); + p += strspn(p, WHITESPACE); + + if (*p != '/') + continue; + + if (!(s = strdup(p))) + goto fail; + + path_kill_slashes(s); + + if ((k = set_put(unix_sockets, s)) < 0) { + free(s); + + if (k != -EEXIST) + goto fail; + } + } + + fclose(f); + return; + +fail: + set_free_free(unix_sockets); + unix_sockets = NULL; + + if (f) + fclose(f); +} + +static bool unix_socket_alive(const char *fn) { + assert(fn); + + load_unix_sockets(); + + if (unix_sockets) + return !!set_get(unix_sockets, (char*) fn); + + /* We don't know, so assume yes */ + return true; +} + static int dir_cleanup( const char *p, DIR *d, @@ -136,6 +235,9 @@ static int dir_cleanup( if (hashmap_get(items, sub_path)) continue; + if (find_glob(globs, sub_path)) + continue; + if (S_ISDIR(s.st_mode)) { if (mountpoint && @@ -189,7 +291,7 @@ static int dir_cleanup( if (s.st_mode & S_ISVTX) continue; - if (mountpoint) { + if (mountpoint && S_ISREG(s.st_mode)) { if (streq(dent->d_name, ".journal") && s.st_uid == 0) continue; @@ -199,6 +301,14 @@ static int dir_cleanup( continue; } + /* Ignore sockets that are listed in /proc/net/unix */ + if (S_ISSOCK(s.st_mode) && unix_socket_alive(sub_path)) + continue; + + /* Ignore device nodes */ + if (S_ISCHR(s.st_mode) || S_ISBLK(s.st_mode)) + continue; + age = MAX3(timespec_load(&s.st_mtim), timespec_load(&s.st_atim), timespec_load(&s.st_ctim)); @@ -296,8 +406,144 @@ finish: return r; } +static int recursive_relabel_children(const char *path) { + DIR *d; + int ret = 0; + + /* This returns the first error we run into, but nevertheless + * tries to go on */ + + d = opendir(path); + if (!d) + return errno == ENOENT ? 0 : -errno; + + for (;;) { + struct dirent buf, *de; + bool is_dir; + int r; + char *entry_path; + + r = readdir_r(d, &buf, &de); + if (r != 0) { + if (ret == 0) + ret = -r; + break; + } + + 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; + free(entry_path); + continue; + } + + is_dir = S_ISDIR(st.st_mode); + + } else + is_dir = de->d_type == DT_DIR; + + r = label_fix(entry_path, false); + if (r < 0) { + if (ret == 0 && r != -ENOENT) + ret = r; + free(entry_path); + continue; + } + + if (is_dir) { + r = recursive_relabel_children(entry_path); + if (r < 0 && ret == 0) + ret = r; + } + + free(entry_path); + } + + closedir(d); + + return ret; +} + +static int recursive_relabel(Item *i, const char *path) { + int r; + struct stat st; + + r = label_fix(path, false); + if (r < 0) + return r; + + if (lstat(path, &st) < 0) + return -errno; + + if (S_ISDIR(st.st_mode)) + r = recursive_relabel_children(path); + + return r; +} + +static int glob_item(Item *i, int (*action)(Item *, const char *)) { + int r = 0, k; + glob_t g; + char **fn; + + zero(g); + + errno = 0; + if ((k = glob(i->path, GLOB_NOSORT|GLOB_BRACE, NULL, &g)) != 0) { + + if (k != GLOB_NOMATCH) { + if (errno != 0) + errno = EIO; + + log_error("glob(%s) failed: %m", i->path); + return -errno; + } + } + + STRV_FOREACH(fn, g.gl_pathv) + if ((k = action(i, *fn)) < 0) + r = k; + + globfree(&g); + return r; +} + +static int item_set_perms(Item *i) { + if (i->mode_set) + if (chmod(i->path, i->mode) < 0) { + log_error("chmod(%s) failed: %m", i->path); + return -errno; + } + + if (i->uid_set || i->gid_set) + if (chown(i->path, + i->uid_set ? i->uid : (uid_t) -1, + i->gid_set ? i->gid : (gid_t) -1) < 0) { + + log_error("chown(%s) failed: %m", i->path); + return -errno; + } + + return label_fix(i->path, false); +} + static int create_item(Item *i) { - int fd = -1, r; + int r; mode_t u; struct stat st; @@ -311,7 +557,8 @@ static int create_item(Item *i) { return 0; case CREATE_FILE: - case TRUNCATE_FILE: + case TRUNCATE_FILE: { + int fd; u = umask(0); fd = open(i->path, O_CREAT|O_NDELAY|O_CLOEXEC|O_WRONLY|O_NOCTTY|O_NOFOLLOW| @@ -320,98 +567,97 @@ static int create_item(Item *i) { if (fd < 0) { log_error("Failed to create file %s: %m", i->path); - r = -errno; - goto finish; + return -errno; } - if (fstat(fd, &st) < 0) { + close_nointr_nofail(fd); + + if (stat(i->path, &st) < 0) { log_error("stat(%s) failed: %m", i->path); - r = -errno; - goto finish; + return -errno; } if (!S_ISREG(st.st_mode)) { log_error("%s is not a file.", i->path); - r = -EEXIST; - goto finish; + return -EEXIST; } - if (i->mode_set) - if (fchmod(fd, i->mode) < 0) { - log_error("chmod(%s) failed: %m", i->path); - r = -errno; - goto finish; - } - - if (i->uid_set || i->gid_set) - if (fchown(fd, - i->uid_set ? i->uid : (uid_t) -1, - i->gid_set ? i->gid : (gid_t) -1) < 0) { - log_error("chown(%s) failed: %m", i->path); - r = -errno; - goto finish; - } + r = item_set_perms(i); + if (r < 0) + return r; break; + } case TRUNCATE_DIRECTORY: case CREATE_DIRECTORY: u = umask(0); + mkdir_parents(i->path, 0755); r = mkdir(i->path, i->mode); umask(u); if (r < 0 && errno != EEXIST) { log_error("Failed to create directory %s: %m", i->path); - r = -errno; - goto finish; + return -errno; } if (stat(i->path, &st) < 0) { log_error("stat(%s) failed: %m", i->path); - r = -errno; - goto finish; + return -errno; } if (!S_ISDIR(st.st_mode)) { log_error("%s is not a directory.", i->path); - r = -EEXIST; - goto finish; + return -EEXIST; } - if (i->mode_set) - if (chmod(i->path, i->mode) < 0) { - log_error("chmod(%s) failed: %m", i->path); - r = -errno; - goto finish; - } + r = item_set_perms(i); + if (r < 0) + return r; - if (i->uid_set || i->gid_set) - if (chown(i->path, - i->uid_set ? i->uid : (uid_t) -1, - i->gid_set ? i->gid : (gid_t) -1) < 0) { + break; - log_error("chown(%s) failed: %m", i->path); - r = -errno; - goto finish; - } + case CREATE_FIFO: + + u = umask(0); + r = mkfifo(i->path, i->mode); + umask(u); + + if (r < 0 && errno != EEXIST) { + log_error("Failed to create fifo %s: %m", i->path); + return -errno; + } + + if (stat(i->path, &st) < 0) { + log_error("stat(%s) failed: %m", i->path); + return -errno; + } + + if (!S_ISFIFO(st.st_mode)) { + log_error("%s is not a fifo.", i->path); + return -EEXIST; + } + + r = item_set_perms(i); + if (r < 0) + return r; break; - } - if ((r = label_fix(i->path)) < 0) - goto finish; + case RECURSIVE_RELABEL_PATH: - log_debug("%s created successfully.", i->path); + r = glob_item(i, recursive_relabel); + if (r < 0) + return r; + } -finish: - if (fd >= 0) - close_nointr_nofail(fd); + log_debug("%s created successfully.", i->path); - return r; + return 0; } -static int remove_item(Item *i) { +static int remove_item_instance(Item *i, const char *instance) { int r; assert(i); @@ -421,12 +667,14 @@ static int remove_item(Item *i) { case CREATE_FILE: case TRUNCATE_FILE: case CREATE_DIRECTORY: + case CREATE_FIFO: case IGNORE_PATH: + case RECURSIVE_RELABEL_PATH: break; case REMOVE_PATH: - if (remove(i->path) < 0 && errno != ENOENT) { - log_error("remove(%s): %m", i->path); + if (remove(instance) < 0 && errno != ENOENT) { + log_error("remove(%s): %m", instance); return -errno; } @@ -434,9 +682,9 @@ static int remove_item(Item *i) { case TRUNCATE_DIRECTORY: case RECURSIVE_REMOVE_PATH: - if ((r = rm_rf(i->path, false, i->type == RECURSIVE_REMOVE_PATH)) < 0 && + if ((r = rm_rf(instance, false, i->type == RECURSIVE_REMOVE_PATH, false)) < 0 && r != -ENOENT) { - log_error("rm_rf(%s): %s", i->path, strerror(-r)); + log_error("rm_rf(%s): %s", instance, strerror(-r)); return r; } @@ -446,6 +694,31 @@ static int remove_item(Item *i) { return 0; } +static int remove_item(Item *i) { + int r = 0; + + assert(i); + + switch (i->type) { + + case CREATE_FILE: + case TRUNCATE_FILE: + case CREATE_DIRECTORY: + case CREATE_FIFO: + case IGNORE_PATH: + case RECURSIVE_RELABEL_PATH: + break; + + case REMOVE_PATH: + case TRUNCATE_DIRECTORY: + case RECURSIVE_REMOVE_PATH: + r = glob_item(i, remove_item_instance); + break; + } + + return r; +} + static int process_item(Item *i) { int r, q, p; @@ -471,9 +744,40 @@ static void item_free(Item *i) { free(i); } -static int parse_line(const char *fname, unsigned line, const char *buffer, const char *prefix) { - Item *i; +static bool item_equal(Item *a, Item *b) { + assert(a); + assert(b); + + if (!streq_ptr(a->path, b->path)) + return false; + + if (a->type != b->type) + return false; + + if (a->uid_set != b->uid_set || + (a->uid_set && a->uid != b->uid)) + return false; + + if (a->gid_set != b->gid_set || + (a->gid_set && a->gid != b->gid)) + return false; + + if (a->mode_set != b->mode_set || + (a->mode_set && a->mode != b->mode)) + return false; + + if (a->age_set != b->age_set || + (a->age_set && a->age != b->age)) + return false; + + return true; +} + +static int parse_line(const char *fname, unsigned line, const char *buffer) { + Item *i, *existing; char *mode = NULL, *user = NULL, *group = NULL, *age = NULL; + char type; + Hashmap *h; int r; assert(fname); @@ -492,7 +796,7 @@ static int parse_line(const char *fname, unsigned line, const char *buffer, cons "%ms " "%ms " "%ms", - &i->type, + &type, &i->path, &mode, &user, @@ -503,17 +807,20 @@ static int parse_line(const char *fname, unsigned line, const char *buffer, cons goto finish; } - if (i->type != CREATE_FILE && - i->type != TRUNCATE_FILE && - i->type != CREATE_DIRECTORY && - i->type != TRUNCATE_DIRECTORY && - i->type != IGNORE_PATH && - i->type != REMOVE_PATH && - i->type != RECURSIVE_REMOVE_PATH) { - log_error("[%s:%u] Unknown file type '%c'.", fname, line, i->type); + if (type != CREATE_FILE && + type != TRUNCATE_FILE && + type != CREATE_DIRECTORY && + type != TRUNCATE_DIRECTORY && + type != CREATE_FIFO && + type != IGNORE_PATH && + type != REMOVE_PATH && + type != RECURSIVE_REMOVE_PATH && + type != RECURSIVE_RELABEL_PATH) { + log_error("[%s:%u] Unknown file type '%c'.", fname, line, type); r = -EBADMSG; goto finish; } + i->type = type; if (!path_is_absolute(i->path)) { log_error("[%s:%u] Path '%s' not absolute.", fname, line, i->path); @@ -523,24 +830,17 @@ static int parse_line(const char *fname, unsigned line, const char *buffer, cons path_kill_slashes(i->path); - if (prefix && !path_startswith(i->path, prefix)) { + if (arg_prefix && !path_startswith(i->path, arg_prefix)) { r = 0; goto finish; } if (user && !streq(user, "-")) { - unsigned long lu; - struct passwd *p; - - if (streq(user, "root") || streq(user, "0")) - i->uid = 0; - else if (safe_atolu(user, &lu) >= 0) - i->uid = (uid_t) lu; - else if ((p = getpwnam(user))) - i->uid = p->pw_uid; - else { + const char *u = user; + + r = get_user_creds(&u, &i->uid, NULL, NULL); + if (r < 0) { log_error("[%s:%u] Unknown user '%s'.", fname, line, user); - r = -ENOENT; goto finish; } @@ -548,18 +848,11 @@ static int parse_line(const char *fname, unsigned line, const char *buffer, cons } if (group && !streq(group, "-")) { - unsigned long lu; - struct group *g; - - if (streq(group, "root") || streq(group, "0")) - i->gid = 0; - else if (safe_atolu(group, &lu) >= 0) - i->gid = (gid_t) lu; - else if ((g = getgrnam(group))) - i->gid = g->gr_gid; - else { + const char *g = group; + + r = get_group_creds(&g, &i->gid); + if (r < 0) { log_error("[%s:%u] Unknown group '%s'.", fname, line, group); - r = -ENOENT; goto finish; } @@ -590,13 +883,19 @@ static int parse_line(const char *fname, unsigned line, const char *buffer, cons i->age_set = true; } - if ((r = hashmap_put(items, i->path, i)) < 0) { - if (r == -EEXIST) { + h = needs_glob(i->type) ? globs : items; + + if ((existing = hashmap_get(h, i->path))) { + + /* Two identical items are fine */ + if (!item_equal(existing, i)) log_warning("Two or more conflicting lines for %s configured, ignoring.", i->path); - r = 0; - goto finish; - } + r = 0; + goto finish; + } + + if ((r = hashmap_put(h, i->path, i)) < 0) { log_error("Failed to insert item %s: %s", i->path, strerror(-r)); goto finish; } @@ -616,27 +915,15 @@ finish: return r; } -static int scandir_filter(const struct dirent *d) { - assert(d); - - if (ignore_file(d->d_name)) - return 0; - - if (d->d_type != DT_REG && - d->d_type != DT_LNK) - return 0; - - return endswith(d->d_name, ".conf"); -} - static int help(void) { - printf("%s [OPTIONS...]\n\n" - "Create and clean up temporary directories.\n\n" + printf("%s [OPTIONS...] [CONFIGURATION FILE...]\n\n" + "Creates, deletes and cleans up volatile and temporary files and directories.\n\n" " -h --help Show this help\n" " --create Create marked files/directories\n" " --clean Clean up marked directories\n" - " --remove Remove marked files/directories\n", + " --remove Remove marked files/directories\n" + " --prefix=PATH Only apply rules that apply to paths with the specified prefix\n", program_invocation_short_name); return 0; @@ -647,7 +934,8 @@ static int parse_argv(int argc, char *argv[]) { enum { ARG_CREATE, ARG_CLEAN, - ARG_REMOVE + ARG_REMOVE, + ARG_PREFIX }; static const struct option options[] = { @@ -655,6 +943,7 @@ 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 }, + { "prefix", required_argument, NULL, ARG_PREFIX }, { NULL, 0, NULL, 0 } }; @@ -683,6 +972,10 @@ static int parse_argv(int argc, char *argv[]) { arg_remove = true; break; + case ARG_PREFIX: + arg_prefix = optarg; + break; + case '?': return -EINVAL; @@ -693,118 +986,133 @@ static int parse_argv(int argc, char *argv[]) { } if (!arg_clean && !arg_create && !arg_remove) { - help(); + log_error("You need to specify at least one of --clean, --create or --remove."); return -EINVAL; } return 1; } -int main(int argc, char *argv[]) { - struct dirent **de = NULL; - int r, n, j; - const char *prefix = NULL; - Item *i; - Iterator iterator; - - if ((r = parse_argv(argc, argv)) <= 0) - return r < 0 ? EXIT_FAILURE : EXIT_SUCCESS; +static int read_config_file(const char *fn, bool ignore_enoent) { + FILE *f; + unsigned v = 0; + int r = 0; - if (optind < argc) - prefix = argv[optind]; - else - prefix = "/"; + assert(fn); - log_set_target(LOG_TARGET_SYSLOG_OR_KMSG); - log_parse_environment(); - log_open(); + if (!(f = fopen(fn, "re"))) { - label_init(); + if (ignore_enoent && errno == ENOENT) + return 0; - if (!(items = hashmap_new(string_hash_func, string_compare_func))) { - log_error("Out of memory"); - r = EXIT_FAILURE; - goto finish; + log_error("Failed to open %s: %m", fn); + return -errno; } - if ((n = scandir("/etc/tmpfiles.d/", &de, scandir_filter, alphasort)) < 0) { + log_debug("apply: %s\n", fn); + for (;;) { + char line[LINE_MAX], *l; + int k; - if (errno == ENOENT) - r = EXIT_SUCCESS; - else { - log_error("Failed to enumerate /etc/tmpfiles.d/ files: %m"); - r = EXIT_FAILURE; - } + if (!(fgets(line, sizeof(line), f))) + break; - goto finish; + v++; + + l = strstrip(line); + if (*l == '#' || *l == 0) + continue; + + if ((k = parse_line(fn, v, l)) < 0) + if (r == 0) + r = k; } - r = EXIT_SUCCESS; + if (ferror(f)) { + log_error("Failed to read from file %s: %m", fn); + if (r == 0) + r = -EIO; + } - for (j = 0; j < n; j++) { - int k; - char *fn; - FILE *f; - unsigned v; + fclose(f); - k = asprintf(&fn, "/etc/tmpfiles.d/%s", de[j]->d_name); - free(de[j]); + return r; +} - if (k < 0) { - log_error("Failed to allocate file name."); - r = EXIT_FAILURE; - continue; - } +int main(int argc, char *argv[]) { + int r; + Item *i; + Iterator iterator; - if (!(f = fopen(fn, "re"))) { + if ((r = parse_argv(argc, argv)) <= 0) + return r < 0 ? EXIT_FAILURE : EXIT_SUCCESS; - if (errno != ENOENT) { - log_error("Failed to open %s: %m", fn); - r = EXIT_FAILURE; - } + log_set_target(LOG_TARGET_AUTO); + log_parse_environment(); + log_open(); - free(fn); - continue; - } + umask(0022); - v = 0; - for (;;) { - char line[LINE_MAX], *l; + label_init(); - if (!(fgets(line, sizeof(line), f))) - break; + items = hashmap_new(string_hash_func, string_compare_func); + globs = hashmap_new(string_hash_func, string_compare_func); - v++; + if (!items || !globs) { + log_error("Out of memory"); + r = EXIT_FAILURE; + goto finish; + } - l = strstrip(line); - if (*l == '#' || *l == 0) - continue; + r = EXIT_SUCCESS; + + if (optind < argc) { + int j; - if (parse_line(fn, v, l, prefix) < 0) + for (j = optind; j < argc; j++) + if (read_config_file(argv[j], false) < 0) r = EXIT_FAILURE; - } - if (ferror(f)) { + } else { + char **files, **f; + + r = conf_files_list(&files, ".conf", + "/run/tmpfiles.d", + "/etc/tmpfiles.d", + "/usr/local/lib/tmpfiles.d", + "/usr/lib/tmpfiles.d", + NULL); + if (r < 0) { r = EXIT_FAILURE; - log_error("Failed to read from file %s: %m", fn); + log_error("Failed to enumerate tmpfiles.d files: %s", strerror(-r)); + goto finish; } - free(fn); + STRV_FOREACH(f, files) { + if (read_config_file(*f, true) < 0) + r = EXIT_FAILURE; + } - fclose(f); + strv_free(files); } - free(de); + HASHMAP_FOREACH(i, globs, iterator) + process_item(i); HASHMAP_FOREACH(i, items, iterator) - if (process_item(i) < 0) - r = EXIT_FAILURE; + process_item(i); finish: while ((i = hashmap_steal_first(items))) item_free(i); + while ((i = hashmap_steal_first(globs))) + item_free(i); + hashmap_free(items); + hashmap_free(globs); + + set_free_free(unix_sockets); label_finish();