X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Fcryptsetup%2Fcryptsetup-generator.c;h=75d56ddafa4d6937b0f07fa4f102417d8c86ab7b;hp=ac0ed58dae9068e635f536e4626bd73663266e48;hb=c3834f9b881f2b1a68dc7d797c134f0b66b47b57;hpb=7fd1b19bc9e9f5574f2877936b8ac267c7706947 diff --git a/src/cryptsetup/cryptsetup-generator.c b/src/cryptsetup/cryptsetup-generator.c index ac0ed58da..75d56ddaf 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_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,17 +72,30 @@ static int create_disk( const char *password, const char *options) { - _cleanup_free_ 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; + bool noauto, nofail, tmp, swap; + char *from; + int r; assert(name); assert(device); noauto = has_option(options, "noauto"); nofail = has_option(options, "nofail"); + tmp = has_option(options, "tmp"); + swap = has_option(options, "swap"); + + if (tmp && swap) { + log_error("Device '%s' cannot be both 'tmp' and 'swap'. Ignoring.", name); + return -EINVAL; + } - n = unit_name_from_path_instance("systemd-cryptsetup", name, ".service"); + e = unit_name_escape(name); + if (!e) + return log_oom(); + + n = unit_name_build("systemd-cryptsetup", e, ".service"); if (!n) return log_oom(); @@ -106,11 +121,12 @@ static int create_disk( "# Automatically generated by systemd-cryptsetup-generator\n\n" "[Unit]\n" "Description=Cryptography Setup for %I\n" - "Documentation=man:systemd-cryptsetup@.service(8) man:crypttab(5)\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" + "Conflicts=umount.target\n" "BindsTo=dev-mapper-%i.device\n" + "IgnoreOnIsolate=true\n" "After=systemd-readahead-collect.service systemd-readahead-replay.service\n", f); @@ -119,15 +135,26 @@ static int create_disk( "Before=cryptsetup.target\n"); if (password) { - if (streq(password, "/dev/urandom") || - streq(password, "/dev/random") || - streq(password, "/dev/hw_random")) - fputs("After=systemd-random-seed-load.service\n", f); - else if (!streq(password, "-") && - !streq(password, "none")) - fprintf(f, - "RequiresMountsFor=%s\n", - 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)) @@ -151,25 +178,23 @@ 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)) { log_error("Failed to write file %s: %m", p); return -errno; } - if (asprintf(&from, "../%s", n) < 0) - return log_oom(); + from = strappenda("../", n); if (!noauto) { @@ -179,7 +204,7 @@ static int create_disk( mkdir_parents_label(to, 0755); if (symlink(from, to) < 0) { - log_error("Failed to create symlink '%s' to '%s': %m", from, to); + log_error("Failed to create symlink %s: %m", to); return -errno; } @@ -193,15 +218,11 @@ static int create_disk( mkdir_parents_label(to, 0755); if (symlink(from, to) < 0) { - log_error("Failed to create symlink '%s' to '%s': %m", from, to); + log_error("Failed to create symlink %s: %m", to); return -errno; } } - e = unit_name_escape(name); - if (!e) - return log_oom(); - free(to); to = strjoin(arg_dest, "/dev-mapper-", e, ".device.requires/", n, NULL); if (!to) @@ -209,132 +230,79 @@ static int create_disk( mkdir_parents_label(to, 0755); if (symlink(from, to) < 0) { - log_error("Failed to create symlink '%s' to '%s': %m", from, to); + log_error("Failed to create symlink %s: %m", to); return -errno; } if (!noauto && !nofail) { - int r; + 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) + if (r < 0) { + log_error("Failed to write device drop-in: %s", strerror(-r)); return r; + } } return 0; } -static int parse_proc_cmdline(char ***arg_proc_cmdline_disks, char **arg_proc_cmdline_keyfile) { - _cleanup_free_ char *line = NULL; - char *w = NULL, *state = NULL; +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) { - _cleanup_free_ char *word = NULL; - - word = strndup(w, l); - if (!word) - return log_oom(); - - 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; + if (STR_IN_SET(key, "luks", "rd.luks") && value) { - } 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=")) { + r = parse_boolean(value); + if (r < 0) + log_warning("Failed to parse luks switch %s. Ignoring.", value); + else + arg_enabled = r; - 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; - } + } else if (STR_IN_SET(key, "luks.crypttab", "rd.luks.crypttab") && value) { - } else if (startswith(word, "luks.uuid=")) { - if (strv_extend(arg_proc_cmdline_disks, word + 10) < 0) - return log_oom(); - - } else if (startswith(word, "rd.luks.uuid=")) { + r = parse_boolean(value); + if (r < 0) + log_warning("Failed to parse luks crypttab switch %s. Ignoring.", value); + else + arg_read_crypttab = r; - if (in_initrd()) { - if (strv_extend(arg_proc_cmdline_disks, word + 13) < 0) - return log_oom(); - } + } else if (STR_IN_SET(key, "luks.uuid", "rd.luks.uuid") && value) { - } else if (startswith(word, "luks.key=")) { - *arg_proc_cmdline_keyfile = strdup(word + 9); - if (! arg_proc_cmdline_keyfile) - return log_oom(); + if (strv_extend(&arg_disks, value) < 0) + return log_oom(); - } else if (startswith(word, "rd.luks.key=")) { + } else if (STR_IN_SET(key, "luks.options", "rd.luks.options") && value) { - if (in_initrd()) { - if (*arg_proc_cmdline_keyfile) - free(*arg_proc_cmdline_keyfile); - *arg_proc_cmdline_keyfile = strdup(word + 12); - if (!arg_proc_cmdline_keyfile) - return log_oom(); - } + if (strv_extend(&arg_options, value) < 0) + return log_oom(); - } else if (startswith(word, "luks.") || - (in_initrd() && startswith(word, "rd.luks."))) { + } else if (STR_IN_SET(key, "luks.key", "rd.luks.key") && value) { - log_warning("Unknown kernel switch %s. Ignoring.", word); - } - } + free(arg_keyfile); + arg_keyfile = strdup(key); + if (!arg_keyfile) + return log_oom(); - strv_uniq(*arg_proc_cmdline_disks); + } else if (startswith(key, "luks.") || startswith(key, "rd.luks.")) + log_warning("Unknown kernel switch %s. Ignoring.", key); return 0; } int main(int argc, char *argv[]) { + _cleanup_strv_free_ char **disks_done = NULL; _cleanup_fclose_ FILE *f = NULL; unsigned n = 0; - int r = EXIT_SUCCESS; + int r = EXIT_FAILURE, r2 = EXIT_FAILURE; char **i; - _cleanup_strv_free_ char **arg_proc_cmdline_disks_done = NULL; - _cleanup_strv_free_ char **arg_proc_cmdline_disks = NULL; - _cleanup_free_ char *arg_proc_cmdline_keyfile = NULL; if (argc > 1 && argc != 4) { log_error("This program takes three or no arguments."); @@ -350,23 +318,42 @@ int main(int argc, char *argv[]) { umask(0022); - if (parse_proc_cmdline(&arg_proc_cmdline_disks, &arg_proc_cmdline_keyfile) < 0) - return EXIT_FAILURE; + if (parse_proc_cmdline(parse_proc_cmdline_item) < 0) + goto cleanup; - if (!arg_enabled) - return EXIT_SUCCESS; + if (!arg_enabled) { + r = r2 = EXIT_SUCCESS; + goto cleanup; + } + + strv_uniq(arg_disks); if (arg_read_crypttab) { - f = fopen("/etc/crypttab", "re"); + struct stat st; + f = fopen("/etc/crypttab", "re"); if (!f) { if (errno == ENOENT) r = EXIT_SUCCESS; - else { - r = EXIT_FAILURE; + else log_error("Failed to open /etc/crypttab: %m"); - } - } else for (;;) { + + goto next; + } + + if (fstat(fileno(f), &st) < 0) { + log_error("Failed to stat /etc/crypttab: %m"); + goto next; + } + + /* 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."); + + for (;;) { char line[LINE_MAX], *l; _cleanup_free_ char *name = NULL, *device = NULL, *password = NULL, *options = NULL; int k; @@ -383,16 +370,34 @@ int main(int argc, char *argv[]) { 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; continue; } - if (arg_proc_cmdline_disks) { + /* + 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_proc_cmdline_disks) { + STRV_FOREACH(i, arg_disks) { _cleanup_free_ char *proc_device = NULL, *proc_name = NULL; const char *p = *i; @@ -402,48 +407,102 @@ int main(int argc, char *argv[]) { proc_name = strappend("luks-", p); proc_device = strappend("UUID=", p); - if (!proc_name || !proc_device) - return log_oom(); + 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) - r = EXIT_FAILURE; + goto cleanup; - if (strv_extend(&arg_proc_cmdline_disks_done, p) < 0) - return log_oom(); + if (strv_extend(&disks_done, p) < 0) { + log_oom(); + goto cleanup; + } } } - } else { - if (create_disk(name, device, password, options) < 0) - r = EXIT_FAILURE; - } + } else if (create_disk(name, device, password, options) < 0) + goto cleanup; + } } - STRV_FOREACH(i, arg_proc_cmdline_disks) { + r = EXIT_SUCCESS; + +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; + _cleanup_free_ char *name = NULL, *device = NULL, *options = NULL; const char *p = *i; if (startswith(p, "luks-")) p += 5; - if (strv_contains(arg_proc_cmdline_disks_done, p)) + if (strv_contains(disks_done, p)) continue; name = strappend("luks-", p); device = strappend("UUID=", p); - if (!name || !device) - return log_oom(); + if (!name || !device) { + log_oom(); + goto cleanup; + } - if (create_disk(name, device, arg_proc_cmdline_keyfile, "timeout=0") < 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; + } + } + + if (create_disk(name, device, arg_keyfile, options) < 0) + goto cleanup; } - return r; + r2 = EXIT_SUCCESS; + +cleanup: + strv_free(arg_disks); + strv_free(arg_options); + free(arg_keyfile); + + return r != EXIT_SUCCESS ? r : r2; }