X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Ftmpfiles.c;h=a6b8f859aa948946fa025130ee2c1a0ce4381cf3;hp=d7ca062a55a0cb6d804c4e834c66d4c32888f296;hb=ad293f5a94d8124ece7d1cb860952a87b1c8d98f;hpb=eb0ca9ebfff4f708892ee3d4f268b839d92e34a3

diff --git a/src/tmpfiles.c b/src/tmpfiles.c
index d7ca062a5..a6b8f859a 100644
--- a/src/tmpfiles.c
+++ b/src/tmpfiles.c
@@ -47,9 +47,8 @@
 
 /* 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 {
         /* These ones take file names */
@@ -57,6 +56,7 @@ enum {
         TRUNCATE_FILE = 'F',
         CREATE_DIRECTORY = 'd',
         TRUNCATE_DIRECTORY = 'D',
+        CREATE_FIFO = 'p',
 
         /* These ones take globs */
         IGNORE_PATH = 'x',
@@ -80,11 +80,14 @@ typedef struct Item {
 } Item;
 
 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(int t) {
@@ -102,6 +105,80 @@ static struct Item* find_glob(Hashmap *h, const char *match) {
         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;
+                }
+        }
+
+        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,
@@ -212,7 +289,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;
@@ -222,6 +299,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));
@@ -381,6 +466,7 @@ static int create_item(Item *i) {
         case CREATE_DIRECTORY:
 
                 u = umask(0);
+                mkdir_parents(i->path, 0755);
                 r = mkdir(i->path, i->mode);
                 umask(u);
 
@@ -420,9 +506,51 @@ static int create_item(Item *i) {
                         }
 
                 break;
+
+        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);
+                        r = -errno;
+                        goto finish;
+                }
+
+                if (stat(i->path, &st) < 0) {
+                        log_error("stat(%s) failed: %m", i->path);
+                        r = -errno;
+                        goto finish;
+                }
+
+                if (!S_ISFIFO(st.st_mode)) {
+                        log_error("%s is not a fifo.", i->path);
+                        r = -EEXIST;
+                        goto finish;
+                }
+
+                if (i->mode_set)
+                        if (chmod(i->path, i->mode) < 0) {
+                                log_error("chmod(%s) failed: %m", i->path);
+                                r = -errno;
+                                goto finish;
+                        }
+
+                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);
+                                r = -errno;
+                                goto finish;
+                        }
+
+                break;
         }
 
-        if ((r = label_fix(i->path)) < 0)
+        if ((r = label_fix(i->path, false)) < 0)
                 goto finish;
 
         log_debug("%s created successfully.", i->path);
@@ -444,6 +572,7 @@ static int remove_item(Item *i, const char *instance) {
         case CREATE_FILE:
         case TRUNCATE_FILE:
         case CREATE_DIRECTORY:
+        case CREATE_FIFO:
         case IGNORE_PATH:
                 break;
 
@@ -457,7 +586,7 @@ static int remove_item(Item *i, const char *instance) {
 
         case TRUNCATE_DIRECTORY:
         case RECURSIVE_REMOVE_PATH:
-                if ((r = rm_rf(instance, 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", instance, strerror(-r));
                         return r;
@@ -477,6 +606,7 @@ static int remove_item_glob(Item *i) {
         case CREATE_FILE:
         case TRUNCATE_FILE:
         case CREATE_DIRECTORY:
+        case CREATE_FIFO:
         case IGNORE_PATH:
                 break;
 
@@ -538,9 +668,39 @@ 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;
+        Hashmap *h;
         int r;
 
         assert(fname);
@@ -574,6 +734,7 @@ static int parse_line(const char *fname, unsigned line, const char *buffer, cons
             i->type != TRUNCATE_FILE &&
             i->type != CREATE_DIRECTORY &&
             i->type != TRUNCATE_DIRECTORY &&
+            i->type != CREATE_FIFO &&
             i->type != IGNORE_PATH &&
             i->type != REMOVE_PATH &&
             i->type != RECURSIVE_REMOVE_PATH) {
@@ -590,24 +751,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;
                 }
 
@@ -615,18 +769,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;
                 }
 
@@ -657,13 +804,19 @@ static int parse_line(const char *fname, unsigned line, const char *buffer, cons
                 i->age_set = true;
         }
 
-        if ((r = hashmap_put(needs_glob(i->type) ? globs : 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;
         }
@@ -683,27 +836,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;
@@ -714,7 +855,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[] = {
@@ -722,6 +864,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             }
         };
 
@@ -750,6 +893,10 @@ static int parse_argv(int argc, char *argv[]) {
                         arg_remove = true;
                         break;
 
+                case ARG_PREFIX:
+                        arg_prefix = optarg;
+                        break;
+
                 case '?':
                         return -EINVAL;
 
@@ -760,32 +907,73 @@ 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;
 }
 
+static int read_config_file(const char *fn, bool ignore_enoent) {
+        FILE *f;
+        unsigned v = 0;
+        int r = 0;
+
+        assert(fn);
+
+        if (!(f = fopen(fn, "re"))) {
+
+                if (ignore_enoent && errno == ENOENT)
+                        return 0;
+
+                log_error("Failed to open %s: %m", fn);
+                return -errno;
+        }
+
+        log_debug("apply: %s\n", fn);
+        for (;;) {
+                char line[LINE_MAX], *l;
+                int k;
+
+                if (!(fgets(line, sizeof(line), f)))
+                        break;
+
+                v++;
+
+                l = strstrip(line);
+                if (*l == '#' || *l == 0)
+                        continue;
+
+                if ((k = parse_line(fn, v, l)) < 0)
+                        if (r == 0)
+                                r = k;
+        }
+
+        if (ferror(f)) {
+                log_error("Failed to read from file %s: %m", fn);
+                if (r == 0)
+                        r = -EIO;
+        }
+
+        fclose(f);
+
+        return r;
+}
+
 int main(int argc, char *argv[]) {
-        struct dirent **de = NULL;
-        int r, n, j;
-        const char *prefix = NULL;
+        int r;
         Item *i;
         Iterator iterator;
 
         if ((r = parse_argv(argc, argv)) <= 0)
                 return r < 0 ? EXIT_FAILURE : EXIT_SUCCESS;
 
-        if (optind < argc)
-                prefix = argv[optind];
-        else
-                prefix = "/";
-
         log_set_target(LOG_TARGET_AUTO);
         log_parse_environment();
         log_open();
 
+        umask(0022);
+
         label_init();
 
         items = hashmap_new(string_hash_func, string_compare_func);
@@ -797,90 +985,56 @@ int main(int argc, char *argv[]) {
                 goto finish;
         }
 
-        if ((n = scandir("/etc/tmpfiles.d/", &de, scandir_filter, alphasort)) < 0) {
-
-                if (errno == ENOENT)
-                        r = EXIT_SUCCESS;
-                else {
-                        log_error("Failed to enumerate /etc/tmpfiles.d/ files: %m");
-                        r = EXIT_FAILURE;
-                }
-
-                goto finish;
-        }
-
         r = EXIT_SUCCESS;
 
-        for (j = 0; j < n; j++) {
-                int k;
-                char *fn;
-                FILE *f;
-                unsigned v;
-
-                k = asprintf(&fn, "/etc/tmpfiles.d/%s", de[j]->d_name);
-                free(de[j]);
-
-                if (k < 0) {
-                        log_error("Failed to allocate file name.");
-                        r = EXIT_FAILURE;
-                        continue;
-                }
+        if (optind < argc) {
+                int j;
 
-                if (!(f = fopen(fn, "re"))) {
-
-                        if (errno != ENOENT) {
-                                log_error("Failed to open %s: %m", fn);
+                for (j = optind; j < argc; j++)
+                        if (read_config_file(argv[j], false) < 0)
                                 r = EXIT_FAILURE;
-                        }
-
-                        free(fn);
-                        continue;
-                }
-
-                v = 0;
-                for (;;) {
-                        char line[LINE_MAX], *l;
-
-                        if (!(fgets(line, sizeof(line), f)))
-                                break;
 
-                        v++;
-
-                        l = strstrip(line);
-                        if (*l == '#' || *l == 0)
-                                continue;
-
-                        if (parse_line(fn, v, l, prefix) < 0)
-                                r = EXIT_FAILURE;
-                }
+        } else {
+                char **files, **f;
 
-                if (ferror(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)
-                if (process_item(i) < 0)
-                        r = EXIT_FAILURE;
+                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();
 
         return r;