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=3a866f36fcc3272c7c2cb2e0d57472ce39a2c5b3;hp=8792e6b1f53650db7c9141159a95eb91673363c9;hb=baade8cc237c37bd8905d86ec6e9c7872d4abe03;hpb=a0f708053ba42c8289caed1107f498bbf332e204
diff --git a/src/cryptsetup/cryptsetup-generator.c b/src/cryptsetup/cryptsetup-generator.c
index 8792e6b1f..3a866f36f 100644
--- a/src/cryptsetup/cryptsetup-generator.c
+++ b/src/cryptsetup/cryptsetup-generator.c
@@ -19,21 +19,36 @@
along with systemd; If not, see .
***/
-#include
#include
+#include
#include
+#include "dropin.h"
+#include "fileio.h"
+#include "generator.h"
+#include "hashmap.h"
#include "log.h"
-#include "util.h"
-#include "unit-name.h"
#include "mkdir.h"
-#include "virt.h"
+#include "path-util.h"
#include "strv.h"
-#include "fileio.h"
+#include "unit-name.h"
+#include "util.h"
+
+typedef struct crypto_device {
+ char *uuid;
+ char *keyfile;
+ char *name;
+ char *options;
+ bool create;
+} crypto_device;
static const char *arg_dest = "/tmp";
static bool arg_enabled = true;
static bool arg_read_crypttab = true;
+static bool arg_whitelist = false;
+static Hashmap *arg_disks = NULL;
+static char *arg_default_options = NULL;
+static char *arg_default_keyfile = NULL;
static bool has_option(const char *haystack, const char *needle) {
const char *f = haystack;
@@ -70,9 +85,12 @@ 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,
+ *filtered = NULL;
_cleanup_fclose_ FILE *f = NULL;
bool noauto, nofail, tmp, swap;
+ char *from;
+ int r;
assert(name);
assert(device);
@@ -87,7 +105,11 @@ static int create_disk(
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();
@@ -104,21 +126,20 @@ static int create_disk(
return log_oom();
f = fopen(p, "wxe");
- if (!f) {
- log_error("Failed to create unit file %s: %m", p);
- return -errno;
- }
+ if (!f)
+ return log_error_errno(errno, "Failed to create unit file %s: %m", p);
fputs(
"# 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"
- "After=systemd-readahead-collect.service systemd-readahead-replay.service\n",
+ "IgnoreOnIsolate=true\n"
+ "After=cryptsetup-pre.target\n",
f);
if (!nofail)
@@ -126,15 +147,29 @@ static int create_disk(
"Before=cryptsetup.target\n");
if (password) {
- if (streq(password, "/dev/urandom") ||
- streq(password, "/dev/random") ||
- streq(password, "/dev/hw_random"))
+ 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"))
- fprintf(f,
- "RequiresMountsFor=%s\n",
- password);
+ else if (!streq(password, "-") && !streq(password, "none")) {
+ _cleanup_free_ char *uu;
+
+ uu = fstab_node_to_udev_node(password);
+ if (!uu)
+ return log_oom();
+
+ if (!path_equal(uu, "/dev/null")) {
+
+ 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))
@@ -148,6 +183,10 @@ static int create_disk(
"RequiresMountsFor=%s\n",
u);
+ r = generator_write_timeouts(arg_dest, device, name, options, &filtered);
+ if (r < 0)
+ return r;
+
fprintf(f,
"\n[Service]\n"
"Type=oneshot\n"
@@ -155,7 +194,7 @@ static int create_disk(
"TimeoutSec=0\n" /* the binary handles timeouts anyway */
"ExecStart=" SYSTEMD_CRYPTSETUP_PATH " attach '%s' '%s' '%s' '%s'\n"
"ExecStop=" SYSTEMD_CRYPTSETUP_PATH " detach '%s'\n",
- name, u, strempty(password), strempty(options),
+ name, u, strempty(password), strempty(filtered),
name);
if (tmp)
@@ -169,14 +208,10 @@ static int create_disk(
name);
fflush(f);
+ if (ferror(f))
+ return log_error_errno(errno, "Failed to write file %s: %m", p);
- 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) {
@@ -185,10 +220,8 @@ static int create_disk(
return log_oom();
mkdir_parents_label(to, 0755);
- if (symlink(from, to) < 0) {
- log_error("Failed to create symlink %s: %m", to);
- return -errno;
- }
+ if (symlink(from, to) < 0)
+ return log_error_errno(errno, "Failed to create symlink %s: %m", to);
free(to);
if (!nofail)
@@ -199,348 +232,312 @@ static int create_disk(
return log_oom();
mkdir_parents_label(to, 0755);
- if (symlink(from, to) < 0) {
- log_error("Failed to create symlink %s: %m", to);
- return -errno;
- }
+ if (symlink(from, to) < 0)
+ return log_error_errno(errno, "Failed to create symlink %s: %m", to);
}
- 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)
return log_oom();
mkdir_parents_label(to, 0755);
- if (symlink(from, to) < 0) {
- log_error("Failed to create symlink %s: %m", to);
- return -errno;
- }
+ if (symlink(from, to) < 0)
+ return log_error_errno(errno, "Failed to create symlink %s: %m", to);
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)
+ _cleanup_free_ char *dmname;
+ dmname = strjoin("dev-mapper-", e, ".device", NULL);
+ if (!dmname)
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)
- return r;
+ r = write_drop_in(arg_dest, dmname, 90, "device-timeout",
+ "# Automatically generated by systemd-cryptsetup-generator \n\n"
+ "[Unit]\nJobTimeoutSec=0");
+ if (r < 0)
+ return log_error_errno(r, "Failed to write device drop-in: %m");
}
return 0;
}
-static int parse_proc_cmdline(char ***arg_proc_cmdline_disks, char ***arg_proc_cmdline_options, char **arg_proc_cmdline_keyfile) {
- _cleanup_free_ char *line = NULL;
- char *w = NULL, *state = NULL;
+static void free_arg_disks(void) {
+ crypto_device *d;
+
+ while ((d = hashmap_steal_first(arg_disks))) {
+ free(d->uuid);
+ free(d->keyfile);
+ free(d->name);
+ free(d->options);
+ free(d);
+ }
+
+ hashmap_free(arg_disks);
+}
+
+static crypto_device *get_crypto_device(const char *uuid) {
int r;
- size_t l;
+ crypto_device *d;
- if (detect_container(NULL) > 0)
- return 0;
+ assert(uuid);
- r = read_one_line_file("/proc/cmdline", &line);
- if (r < 0) {
- log_warning("Failed to read /proc/cmdline, ignoring: %s", strerror(-r));
- return 0;
+ d = hashmap_get(arg_disks, uuid);
+ if (!d) {
+ d = new0(struct crypto_device, 1);
+ if (!d)
+ return NULL;
+
+ d->create = false;
+ d->keyfile = d->options = d->name = NULL;
+
+ d->uuid = strdup(uuid);
+ if (!d->uuid) {
+ free(d);
+ return NULL;
+ }
+
+ r = hashmap_put(arg_disks, d->uuid, d);
+ if (r < 0) {
+ free(d->uuid);
+ free(d);
+ return NULL;
+ }
}
- FOREACH_WORD_QUOTED(w, l, line, state) {
- _cleanup_free_ char *word = NULL;
+ return d;
+}
+
+static int parse_proc_cmdline_item(const char *key, const char *value) {
+ int r;
+ crypto_device *d;
+ _cleanup_free_ char *uuid = NULL, *uuid_value = NULL;
+
+ if (STR_IN_SET(key, "luks", "rd.luks") && value) {
- word = strndup(w, l);
- if (!word)
+ r = parse_boolean(value);
+ if (r < 0)
+ log_warning("Failed to parse luks switch %s. Ignoring.", value);
+ else
+ arg_enabled = r;
+
+ } else if (STR_IN_SET(key, "luks.crypttab", "rd.luks.crypttab") && value) {
+
+ 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 (STR_IN_SET(key, "luks.uuid", "rd.luks.uuid") && value) {
+
+ d = get_crypto_device(startswith(value, "luks-") ? value+5 : value);
+ if (!d)
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;
-
- } 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;
- }
+ d->create = arg_whitelist = true;
- } 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 (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.options", "rd.luks.options") && value) {
- } else if (startswith(word, "luks.uuid=")) {
- if (strv_extend(arg_proc_cmdline_disks, word + 10) < 0)
+ r = sscanf(value, "%m[0-9a-fA-F-]=%ms", &uuid, &uuid_value);
+ if (r == 2) {
+ d = get_crypto_device(uuid);
+ if (!d)
return log_oom();
- } else if (startswith(word, "rd.luks.uuid=")) {
+ free(d->options);
+ d->options = uuid_value;
+ uuid_value = NULL;
+ } else if (free_and_strdup(&arg_default_options, value) < 0)
+ return log_oom();
- if (in_initrd()) {
- if (strv_extend(arg_proc_cmdline_disks, word + 13) < 0)
- return log_oom();
- }
+ } else if (STR_IN_SET(key, "luks.key", "rd.luks.key") && value) {
- } else if (startswith(word, "luks.options=")) {
- if (strv_extend(arg_proc_cmdline_options, word + 13) < 0)
+ r = sscanf(value, "%m[0-9a-fA-F-]=%ms", &uuid, &uuid_value);
+ if (r == 2) {
+ d = get_crypto_device(uuid);
+ if (!d)
return log_oom();
- } else if (startswith(word, "rd.luks.options=")) {
+ free(d->keyfile);
+ d->keyfile = uuid_value;
+ uuid_value = NULL;
+ } else if (free_and_strdup(&arg_default_keyfile, value))
+ return log_oom();
- if (in_initrd()) {
- if (strv_extend(arg_proc_cmdline_options, word + 16) < 0)
- return log_oom();
- }
+ } else if (STR_IN_SET(key, "luks.name", "rd.luks.name") && value) {
- } else if (startswith(word, "luks.key=")) {
- if (*arg_proc_cmdline_keyfile)
- free(*arg_proc_cmdline_keyfile);
- *arg_proc_cmdline_keyfile = strdup(word + 9);
- if (!*arg_proc_cmdline_keyfile)
+ r = sscanf(value, "%m[0-9a-fA-F-]=%ms", &uuid, &uuid_value);
+ if (r == 2) {
+ d = get_crypto_device(uuid);
+ if (!d)
return log_oom();
- } else if (startswith(word, "rd.luks.key=")) {
+ d->create = arg_whitelist = true;
- 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();
- }
-
- } else if (startswith(word, "luks.") ||
- (in_initrd() && startswith(word, "rd.luks."))) {
+ free(d->name);
+ d->name = uuid_value;
+ uuid_value = NULL;
+ } else
+ log_warning("Failed to parse luks name switch %s. Ignoring.", value);
- log_warning("Unknown kernel switch %s. Ignoring.", word);
- }
}
- strv_uniq(*arg_proc_cmdline_disks);
-
return 0;
}
-int main(int argc, char *argv[]) {
- _cleanup_strv_free_ char **arg_proc_cmdline_disks_done = NULL;
- _cleanup_strv_free_ char **arg_proc_cmdline_disks = NULL;
- _cleanup_strv_free_ char **arg_proc_cmdline_options = NULL;
- _cleanup_free_ char *arg_proc_cmdline_keyfile = NULL;
+static int add_crypttab_devices(void) {
+ struct stat st;
+ unsigned crypttab_line = 0;
_cleanup_fclose_ FILE *f = NULL;
- unsigned n = 0;
- int r = EXIT_SUCCESS;
- char **i;
- if (argc > 1 && argc != 4) {
- log_error("This program takes three or no arguments.");
- return EXIT_FAILURE;
- }
+ if (!arg_read_crypttab)
+ return 0;
- if (argc > 1)
- arg_dest = argv[1];
+ f = fopen("/etc/crypttab", "re");
+ if (!f) {
+ if (errno != ENOENT)
+ log_error_errno(errno, "Failed to open /etc/crypttab: %m");
+ return 0;
+ }
- log_set_target(LOG_TARGET_SAFE);
- log_parse_environment();
- log_open();
+ if (fstat(fileno(f), &st) < 0) {
+ log_error_errno(errno, "Failed to stat /etc/crypttab: %m");
+ return 0;
+ }
- umask(0022);
+ /* If we readd support for specifying passphrases
+ * directly in crypttab 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 (parse_proc_cmdline(&arg_proc_cmdline_disks, &arg_proc_cmdline_options, &arg_proc_cmdline_keyfile) < 0)
- return EXIT_FAILURE;
+ for (;;) {
+ int r, k;
+ char line[LINE_MAX], *l, *uuid;
+ crypto_device *d = NULL;
+ _cleanup_free_ char *name = NULL, *device = NULL, *keyfile = NULL, *options = NULL;
- if (!arg_enabled)
- return EXIT_SUCCESS;
+ if (!fgets(line, sizeof(line), f))
+ break;
- if (arg_read_crypttab) {
- struct stat st;
+ crypttab_line++;
- f = fopen("/etc/crypttab", "re");
- if (!f) {
- if (errno == ENOENT)
- r = EXIT_SUCCESS;
- else {
- r = EXIT_FAILURE;
- log_error("Failed to open /etc/crypttab: %m");
- }
+ l = strstrip(line);
+ if (*l == '#' || *l == 0)
+ continue;
- goto next;
+ k = sscanf(l, "%ms %ms %ms %ms", &name, &device, &keyfile, &options);
+ if (k < 2 || k > 4) {
+ log_error("Failed to parse /etc/crypttab:%u, ignoring.", crypttab_line);
+ continue;
}
- if (fstat(fileno(f), &st) < 0) {
- log_error("Failed to stat /etc/crypttab: %m");
- r = EXIT_FAILURE;
- goto next;
+ uuid = startswith(device, "UUID=");
+ if (!uuid)
+ uuid = path_startswith(device, "/dev/disk/by-uuid/");
+ if (!uuid)
+ uuid = startswith(name, "luks-");
+ if (uuid)
+ d = hashmap_get(arg_disks, uuid);
+
+ if (arg_whitelist && !d) {
+ log_info("Not creating device '%s' because it was not specified on the kernel command line.", name);
+ continue;
}
- /* 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.");
+ r = create_disk(name, device, keyfile, (d && d->options) ? d->options : options);
+ if (r < 0)
+ return r;
- for (;;) {
- char line[LINE_MAX], *l;
- _cleanup_free_ char *name = NULL, *device = NULL, *password = NULL, *options = NULL;
- int k;
+ if (d)
+ d->create = false;
+ }
- if (!fgets(line, sizeof(line), f))
- break;
+ return 0;
+}
- n++;
+static int add_proc_cmdline_devices(void) {
+ int r;
+ Iterator i;
+ crypto_device *d;
- l = strstrip(line);
- if (*l == '#' || *l == 0)
- continue;
+ HASHMAP_FOREACH(d, arg_disks, i) {
+ const char *options;
+ _cleanup_free_ char *device = NULL;
- 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 (!d->create)
+ continue;
- if (arg_proc_cmdline_options) {
- /*
- If options are specified on the kernel commandline, let them override
- the ones from crypttab.
- */
- STRV_FOREACH(i, arg_proc_cmdline_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)) {
- if (options)
- free(options);
- options = strdup(p);
- if (!proc_options)
- return log_oom();
- }
- }
- }
+ if (!d->name) {
+ d->name = strappend("luks-", d->uuid);
+ if (!d->name)
+ return log_oom();
+ }
- if (arg_proc_cmdline_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) {
- _cleanup_free_ char *proc_device = NULL, *proc_name = NULL;
- const char *p = *i;
+ device = strappend("UUID=", d->uuid);
+ if (!device)
+ return log_oom();
- if (startswith(p, "luks-"))
- p += 5;
+ if (d->options)
+ options = d->options;
+ else if (arg_default_options)
+ options = arg_default_options;
+ else
+ options = "timeout=0";
- proc_name = strappend("luks-", p);
- proc_device = strappend("UUID=", p);
+ r = create_disk(d->name, device, d->keyfile ?: arg_default_keyfile, options);
+ if (r < 0)
+ return r;
+ }
- if (!proc_name || !proc_device)
- return log_oom();
+ return 0;
+}
- if (streq(proc_device, device) || streq(proc_name, name)) {
- if (create_disk(name, device, password, options) < 0)
- r = EXIT_FAILURE;
-
- if (strv_extend(&arg_proc_cmdline_disks_done, p) < 0)
- return log_oom();
- }
- }
- } else {
- if (create_disk(name, device, password, options) < 0)
- r = EXIT_FAILURE;
- }
- }
+int main(int argc, char *argv[]) {
+ int r = EXIT_FAILURE;
+
+ if (argc > 1 && argc != 4) {
+ log_error("This program takes three or no arguments.");
+ return EXIT_FAILURE;
}
-next:
- STRV_FOREACH(i, arg_proc_cmdline_disks) {
- /*
- Generate units for those UUIDs, which were specified
- on the kernel command line and not yet written.
- */
+ if (argc > 1)
+ arg_dest = argv[1];
+
+ log_set_target(LOG_TARGET_SAFE);
+ log_parse_environment();
+ log_open();
- _cleanup_free_ char *name = NULL, *device = NULL, *options = NULL;
- const char *p = *i;
+ umask(0022);
- if (startswith(p, "luks-"))
- p += 5;
+ arg_disks = hashmap_new(&string_hash_ops);
+ if (!arg_disks)
+ goto cleanup;
- if (strv_contains(arg_proc_cmdline_disks_done, p))
- continue;
+ r = parse_proc_cmdline(parse_proc_cmdline_item);
+ if (r < 0) {
+ log_warning_errno(r, "Failed to parse kernel command line, ignoring: %m");
+ r = EXIT_FAILURE;
+ }
- name = strappend("luks-", p);
- device = strappend("UUID=", p);
+ if (!arg_enabled) {
+ r = EXIT_SUCCESS;
+ goto cleanup;
+ }
- if (!name || !device)
- return log_oom();
+ if (add_crypttab_devices() < 0)
+ goto cleanup;
- if (arg_proc_cmdline_options) {
- /*
- If options are specified on the kernel commandline, use them.
- */
- char **j;
-
- STRV_FOREACH(j, arg_proc_cmdline_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)) {
- if (options)
- free(options);
- options = strdup(proc_options);
- if (!options)
- return log_oom();
- }
- } else if (!options) {
- /*
- Fall back to options without a specified UUID
- */
- options = strdup(s);
- if (!options)
- return log_oom();
- }
- }
- }
+ if (add_proc_cmdline_devices() < 0)
+ goto cleanup;
- if (!options) {
- options = strdup("timeout=0");
- if (!options)
- return log_oom();
- }
+ r = EXIT_SUCCESS;
- if (create_disk(name, device, arg_proc_cmdline_keyfile, options) < 0)
- r = EXIT_FAILURE;
- }
+cleanup:
+ free_arg_disks();
+ free(arg_default_options);
+ free(arg_default_keyfile);
return r;
}