X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Fcryptsetup%2Fcryptsetup-generator.c;h=f4eeb2ad93072ea1a8da96cd514dddfeb74faba8;hp=4056d1ddd205bf23e88b0335e305f21b32ca453c;hb=66aaf85e178492c27f699d9c94c84a98466a1435;hpb=d0d6944cdc17295b17875054ac05e667fe496fed diff --git a/src/cryptsetup/cryptsetup-generator.c b/src/cryptsetup/cryptsetup-generator.c index 4056d1ddd..f4eeb2ad9 100644 --- a/src/cryptsetup/cryptsetup-generator.c +++ b/src/cryptsetup/cryptsetup-generator.c @@ -27,13 +27,15 @@ #include "util.h" #include "unit-name.h" #include "mkdir.h" -#include "virt.h" #include "strv.h" +#include "fileio.h" static const char *arg_dest = "/tmp"; static bool arg_enabled = true; static bool arg_read_crypttab = true; -static char **arg_proc_cmdline_disks = NULL; +static char **arg_disks = NULL; +static char **arg_options = NULL; +static char *arg_keyfile = NULL; static bool has_option(const char *haystack, const char *needle) { const char *f = haystack; @@ -70,75 +72,101 @@ static int create_disk( const char *password, const char *options) { - char *p = NULL, *n = NULL, *d = NULL, *u = NULL, *from = NULL, *to = NULL, *e = NULL; + _cleanup_free_ char *p = NULL, *n = NULL, *d = NULL, *u = NULL, *to = NULL, *e = NULL; + _cleanup_fclose_ FILE *f = NULL; + bool noauto, nofail, tmp, swap; + char *from; int r; - FILE *f = NULL; - bool noauto, nofail; assert(name); assert(device); noauto = has_option(options, "noauto"); nofail = has_option(options, "nofail"); + tmp = has_option(options, "tmp"); + swap = has_option(options, "swap"); - n = unit_name_from_path_instance("systemd-cryptsetup", name, ".service"); - if (!n) { - r = -ENOMEM; - log_error("Failed to allocate unit name."); - goto fail; + if (tmp && swap) { + log_error("Device '%s' cannot be both 'tmp' and 'swap'. Ignoring.", name); + return -EINVAL; } - p = join(arg_dest, "/", n, NULL); - if (!p) { - r = -ENOMEM; - log_error("Failed to allocate unit file name."); - goto fail; - } + e = unit_name_escape(name); + if (!e) + return log_oom(); + + n = unit_name_build("systemd-cryptsetup", e, ".service"); + if (!n) + return log_oom(); + + p = strjoin(arg_dest, "/", n, NULL); + if (!p) + return log_oom(); u = fstab_node_to_udev_node(device); - if (!u) { - r = -ENOMEM; - log_error("Failed to allocate device node."); - goto fail; - } + if (!u) + return log_oom(); d = unit_name_from_path(u, ".device"); - if (!d) { - r = -ENOMEM; - log_error("Failed to allocate device name."); - goto fail; - } + if (!d) + return log_oom(); f = fopen(p, "wxe"); if (!f) { - r = -errno; - log_error("Failed to create unit file: %m"); - goto fail; + log_error("Failed to create unit file %s: %m", p); + return -errno; } - fprintf(f, + fputs( "# Automatically generated by systemd-cryptsetup-generator\n\n" "[Unit]\n" - "Description=Cryptography Setup for %%I\n" - "Documentation=man:systemd-cryptsetup@.service(8)\n" + "Description=Cryptography Setup for %I\n" + "Documentation=man:crypttab(5) man:systemd-cryptsetup-generator(8) man:systemd-cryptsetup@.service(8)\n" "SourcePath=/etc/crypttab\n" - "Conflicts=umount.target\n" "DefaultDependencies=no\n" - "BindTo=%s dev-mapper-%%i.device\n" - "After=systemd-readahead-collect.service systemd-readahead-replay.service %s\n" - "Before=umount.target\n", - d, d); + "Conflicts=umount.target\n" + "BindsTo=dev-mapper-%i.device\n" + "IgnoreOnIsolate=true\n" + "After=systemd-readahead-collect.service systemd-readahead-replay.service\n", + f); if (!nofail) fprintf(f, "Before=cryptsetup.target\n"); - if (password && (streq(password, "/dev/urandom") || - streq(password, "/dev/random") || - streq(password, "/dev/hw_random"))) - fputs("After=systemd-random-seed-load.service\n", f); + if (password) { + if (STR_IN_SET(password, "/dev/urandom", "/dev/random", "/dev/hw_random")) + fputs("After=systemd-random-seed.service\n", f); + else if (!streq(password, "-") && !streq(password, "none")) { + _cleanup_free_ char *uu; + + uu = fstab_node_to_udev_node(password); + if (!uu) + return log_oom(); + + if (is_device_path(uu)) { + _cleanup_free_ char *dd; + + dd = unit_name_from_path(uu, ".device"); + if (!dd) + return log_oom(); + + fprintf(f, "After=%1$s\nRequires=%1$s\n", dd); + } else + fprintf(f, "RequiresMountsFor=%s\n", password); + } + } + + if (is_device_path(u)) + fprintf(f, + "BindsTo=%s\n" + "After=%s\n" + "Before=umount.target\n", + d, d); else - fputs("Before=local-fs.target\n", f); + fprintf(f, + "RequiresMountsFor=%s\n", + u); fprintf(f, "\n[Service]\n" @@ -150,201 +178,130 @@ static int create_disk( name, u, strempty(password), strempty(options), name); - if (has_option(options, "tmp")) + if (tmp) fprintf(f, "ExecStartPost=/sbin/mke2fs '/dev/mapper/%s'\n", name); - if (has_option(options, "swap")) + if (swap) fprintf(f, "ExecStartPost=/sbin/mkswap '/dev/mapper/%s'\n", name); fflush(f); - if (ferror(f)) { - r = -errno; - log_error("Failed to write file: %m"); - goto fail; + log_error("Failed to write file %s: %m", p); + return -errno; } - if (asprintf(&from, "../%s", n) < 0) { - r = -ENOMEM; - goto fail; - } + from = strappenda("../", n); if (!noauto) { - to = join(arg_dest, "/", d, ".wants/", n, NULL); - if (!to) { - r = -ENOMEM; - goto fail; - } + to = strjoin(arg_dest, "/", d, ".wants/", n, NULL); + if (!to) + return log_oom(); mkdir_parents_label(to, 0755); if (symlink(from, to) < 0) { - log_error("Failed to create symlink '%s' to '%s': %m", from, to); - r = -errno; - goto fail; + log_error("Failed to create symlink %s: %m", to); + return -errno; } free(to); - if (!nofail) - to = join(arg_dest, "/cryptsetup.target.requires/", n, NULL); + to = strjoin(arg_dest, "/cryptsetup.target.requires/", n, NULL); else - to = join(arg_dest, "/cryptsetup.target.wants/", n, NULL); - if (!to) { - r = -ENOMEM; - goto fail; - } + to = strjoin(arg_dest, "/cryptsetup.target.wants/", n, NULL); + if (!to) + return log_oom(); mkdir_parents_label(to, 0755); if (symlink(from, to) < 0) { - log_error("Failed to create symlink '%s' to '%s': %m", from, to); - r = -errno; - goto fail; + log_error("Failed to create symlink %s: %m", to); + return -errno; } - - free(to); - to = NULL; } - e = unit_name_escape(name); - to = join(arg_dest, "/dev-mapper-", e, ".device.requires/", n, NULL); - if (!to) { - r = -ENOMEM; - goto fail; - } + free(to); + to = strjoin(arg_dest, "/dev-mapper-", e, ".device.requires/", n, NULL); + if (!to) + return log_oom(); mkdir_parents_label(to, 0755); if (symlink(from, to) < 0) { - log_error("Failed to create symlink '%s' to '%s': %m", from, to); - r = -errno; - goto fail; + log_error("Failed to create symlink %s: %m", to); + return -errno; } - r = 0; - -fail: - free(p); - free(n); - free(d); - free(e); - - free(from); - free(to); - - if (f) - fclose(f); + if (!noauto && !nofail) { + + free(p); + p = strjoin(arg_dest, "/dev-mapper-", e, ".device.d/50-job-timeout-sec-0.conf", NULL); + if (!p) + return log_oom(); + + mkdir_parents_label(p, 0755); + r = write_string_file(p, + "# Automatically generated by systemd-cryptsetup-generator\n\n" + "[Unit]\n" + "JobTimeoutSec=0\n"); /* the binary handles timeouts anyway */ + if (r < 0) { + log_error("Failed to write device drop-in: %s", strerror(-r)); + return r; + } + } - return r; + return 0; } -static int parse_proc_cmdline(void) { - char *line, *w, *state; +static int parse_proc_cmdline_item(const char *key, const char *value) { int r; - size_t l; - - if (detect_container(NULL) > 0) - return 0; - - r = read_one_line_file("/proc/cmdline", &line); - if (r < 0) { - log_warning("Failed to read /proc/cmdline, ignoring: %s", strerror(-r)); - return 0; - } - - FOREACH_WORD_QUOTED(w, l, line, state) { - char *word; - - word = strndup(w, l); - if (!word) { - r = -ENOMEM; - goto finish; - } - - if (startswith(word, "luks=")) { - r = parse_boolean(word + 5); - if (r < 0) - log_warning("Failed to parse luks switch %s. Ignoring.", word + 5); - else - arg_enabled = r; - - } else if (startswith(word, "rd.luks=")) { - - if (in_initrd()) { - r = parse_boolean(word + 8); - if (r < 0) - log_warning("Failed to parse luks switch %s. Ignoring.", word + 8); - else - arg_enabled = r; - } - - } else if (startswith(word, "luks.crypttab=")) { - r = parse_boolean(word + 14); - if (r < 0) - log_warning("Failed to parse luks crypttab switch %s. Ignoring.", word + 14); - else - arg_read_crypttab = r; - } else if (startswith(word, "rd.luks.crypttab=")) { + if (STR_IN_SET(key, "luks", "rd.luks") && value) { - if (in_initrd()) { - r = parse_boolean(word + 17); - if (r < 0) - log_warning("Failed to parse luks crypttab switch %s. Ignoring.", word + 17); - else - arg_read_crypttab = r; - } + r = parse_boolean(value); + if (r < 0) + log_warning("Failed to parse luks switch %s. Ignoring.", value); + else + arg_enabled = r; - } else if (startswith(word, "luks.uuid=")) { - char **t; + } else if (STR_IN_SET(key, "luks.crypttab", "rd.luks.crypttab") && value) { - t = strv_append(arg_proc_cmdline_disks, word + 10); - if (!t) { - log_error("Out of memory"); - r = -ENOMEM; - goto finish; - } - strv_free(arg_proc_cmdline_disks); - arg_proc_cmdline_disks = t; + r = parse_boolean(value); + if (r < 0) + log_warning("Failed to parse luks crypttab switch %s. Ignoring.", value); + else + arg_read_crypttab = r; - } else if (startswith(word, "rd.luks.uuid=")) { + } else if (STR_IN_SET(key, "luks.uuid", "rd.luks.uuid") && value) { - if (in_initrd()) { - char **t; + if (strv_extend(&arg_disks, value) < 0) + return log_oom(); - t = strv_append(arg_proc_cmdline_disks, word + 13); - if (!t) { - log_error("Out of memory"); - r = -ENOMEM; - goto finish; - } - strv_free(arg_proc_cmdline_disks); - arg_proc_cmdline_disks = t; - } + } else if (STR_IN_SET(key, "luks.options", "rd.luks.options") && value) { - } else if (startswith(word, "luks.") || - (in_initrd() && startswith(word, "rd.luks."))) { + if (strv_extend(&arg_options, value) < 0) + return log_oom(); - log_warning("Unknown kernel switch %s. Ignoring.", word); - } + } else if (STR_IN_SET(key, "luks.key", "rd.luks.key") && value) { - free(word); - } + free(arg_keyfile); + arg_keyfile = strdup(value); + if (!arg_keyfile) + return log_oom(); - r = 0; + } else if (startswith(key, "luks.") || startswith(key, "rd.luks.")) + log_warning("Unknown kernel switch %s. Ignoring.", key); -finish: - free(line); - return r; + return 0; } int main(int argc, char *argv[]) { - FILE *f = NULL; - int r = EXIT_SUCCESS; + _cleanup_strv_free_ char **disks_done = NULL; + _cleanup_fclose_ FILE *f = NULL; unsigned n = 0; + int r = EXIT_FAILURE, r2 = EXIT_FAILURE; char **i; if (argc > 1 && argc != 4) { @@ -361,91 +318,191 @@ int main(int argc, char *argv[]) { umask(0022); - if (parse_proc_cmdline() < 0) - return EXIT_FAILURE; + if (parse_proc_cmdline(parse_proc_cmdline_item) < 0) + goto cleanup; if (!arg_enabled) { - r = EXIT_SUCCESS; - goto finish; + r = r2 = EXIT_SUCCESS; + goto cleanup; } - STRV_FOREACH(i, arg_proc_cmdline_disks) { - char *name, *device; - const char *p = *i; + strv_uniq(arg_disks); - if (startswith(p, "luks-")) - p += 5; + if (arg_read_crypttab) { + struct stat st; - name = strappend("luks-", *i); - device = strappend("UUID=", *i); + f = fopen("/etc/crypttab", "re"); + if (!f) { + if (errno == ENOENT) + r = EXIT_SUCCESS; + else + log_error("Failed to open /etc/crypttab: %m"); - if (!name || !device) { - log_error("Out of memory"); - r = EXIT_FAILURE; - free(name); - free(device); - goto finish; + goto next; } - if (create_disk(name, device, NULL, NULL) < 0) - r = EXIT_FAILURE; + if (fstat(fileno(f), &st) < 0) { + log_error("Failed to stat /etc/crypttab: %m"); + goto next; + } - free(name); - free(device); - } + /* If we readd support for specifying passphrases + * directly in crypttabe we should upgrade the warning + * below, though possibly only if a passphrase is + * specified directly. */ + if (st.st_mode & 0005) + log_debug("/etc/crypttab is world-readable. This is usually not a good idea."); - if (!arg_read_crypttab) - return r; + for (;;) { + char line[LINE_MAX], *l; + _cleanup_free_ char *name = NULL, *device = NULL, *password = NULL, *options = NULL; + int k; - f = fopen("/etc/crypttab", "re"); - if (!f) { + if (!fgets(line, sizeof(line), f)) + break; - if (errno == ENOENT) - r = EXIT_SUCCESS; - else { - r = EXIT_FAILURE; - log_error("Failed to open /etc/crypttab: %m"); - } + n++; - goto finish; + l = strstrip(line); + if (*l == '#' || *l == 0) + continue; + + k = sscanf(l, "%ms %ms %ms %ms", &name, &device, &password, &options); + if (k < 2 || k > 4) { + log_error("Failed to parse /etc/crypttab:%u, ignoring.", n); + continue; + } + + /* + If options are specified on the kernel commandline, let them override + the ones from crypttab. + */ + STRV_FOREACH(i, arg_options) { + _cleanup_free_ char *proc_uuid = NULL, *proc_options = NULL; + const char *p = *i; + + k = sscanf(p, "%m[0-9a-fA-F-]=%ms", &proc_uuid, &proc_options); + if (k == 2 && streq(proc_uuid, device + 5)) { + free(options); + options = strdup(p); + if (!proc_options) { + log_oom(); + goto cleanup; + } + } + } + + if (arg_disks) { + /* + If luks UUIDs are specified on the kernel command line, use them as a filter + for /etc/crypttab and only generate units for those. + */ + STRV_FOREACH(i, arg_disks) { + _cleanup_free_ char *proc_device = NULL, *proc_name = NULL; + const char *p = *i; + + if (startswith(p, "luks-")) + p += 5; + + proc_name = strappend("luks-", p); + proc_device = strappend("UUID=", p); + + if (!proc_name || !proc_device) { + log_oom(); + goto cleanup; + } + + if (streq(proc_device, device) || streq(proc_name, name)) { + if (create_disk(name, device, password, options) < 0) + goto cleanup; + + if (strv_extend(&disks_done, p) < 0) { + log_oom(); + goto cleanup; + } + } + } + } else if (create_disk(name, device, password, options) < 0) + goto cleanup; + + } } - for (;;) { - char line[LINE_MAX], *l; - char *name = NULL, *device = NULL, *password = NULL, *options = NULL; - int k; + r = EXIT_SUCCESS; - if (!fgets(line, sizeof(line), f)) - break; +next: + STRV_FOREACH(i, arg_disks) { + /* + Generate units for those UUIDs, which were specified + on the kernel command line and not yet written. + */ + + _cleanup_free_ char *name = NULL, *device = NULL, *options = NULL; + const char *p = *i; - n++; + if (startswith(p, "luks-")) + p += 5; - l = strstrip(line); - if (*l == '#' || *l == 0) + if (strv_contains(disks_done, p)) continue; - k = sscanf(l, "%ms %ms %ms %ms", &name, &device, &password, &options); - if (k < 2 || k > 4) { - log_error("Failed to parse /etc/crypttab:%u, ignoring.", n); - r = EXIT_FAILURE; - goto next; + name = strappend("luks-", p); + device = strappend("UUID=", p); + + if (!name || !device) { + log_oom(); + goto cleanup; } - if (create_disk(name, device, password, options) < 0) - r = EXIT_FAILURE; + if (arg_options) { + /* + If options are specified on the kernel commandline, use them. + */ + char **j; + + STRV_FOREACH(j, arg_options) { + _cleanup_free_ char *proc_uuid = NULL, *proc_options = NULL; + const char *s = *j; + int k; + + k = sscanf(s, "%m[0-9a-fA-F-]=%ms", &proc_uuid, &proc_options); + if (k == 2) { + if (streq(proc_uuid, device + 5)) { + free(options); + options = proc_options; + proc_options = NULL; + } + } else if (!options) { + /* + Fall back to options without a specified UUID + */ + options = strdup(s); + if (!options) { + log_oom(); + goto cleanup; + }; + } + } + } + + if (!options) { + options = strdup("timeout=0"); + if (!options) { + log_oom(); + goto cleanup; + } + } - next: - free(name); - free(device); - free(password); - free(options); + if (create_disk(name, device, arg_keyfile, options) < 0) + goto cleanup; } -finish: - if (f) - fclose(f); + r2 = EXIT_SUCCESS; - strv_free(arg_proc_cmdline_disks); +cleanup: + strv_free(arg_disks); + strv_free(arg_options); + free(arg_keyfile); - return r; + return r != EXIT_SUCCESS ? r : r2; }