X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fcryptsetup%2Fcryptsetup.c;h=994a0e0f809460d442b6c40757376d69782c5f81;hb=e7d90b71272f921b2d5a8f73a26fdd19f546ad07;hp=9d4e77364d072550493a1e1b2a707720c3587468;hpb=669241a076108e0483d7d8475beaa506106d077e;p=elogind.git diff --git a/src/cryptsetup/cryptsetup.c b/src/cryptsetup/cryptsetup.c index 9d4e77364..994a0e0f8 100644 --- a/src/cryptsetup/cryptsetup.c +++ b/src/cryptsetup/cryptsetup.c @@ -37,13 +37,14 @@ static const char *opt_type = NULL; /* LUKS1 or PLAIN */ static char *opt_cipher = NULL; static unsigned opt_key_size = 0; +static unsigned opt_keyfile_size = 0; static unsigned opt_keyfile_offset = 0; static char *opt_hash = NULL; static unsigned opt_tries = 0; static bool opt_readonly = false; static bool opt_verify = false; static bool opt_discards = false; -static usec_t opt_timeout = DEFAULT_TIMEOUT_USEC; +static usec_t opt_timeout = 0; /* Options Debian's crypttab knows we don't: @@ -61,13 +62,14 @@ static int parse_one_option(const char *option) { assert(option); /* Handled outside of this tool */ - if (streq(option, "noauto")) + if (streq(option, "noauto") || streq(option, "nofail")) return 0; if (startswith(option, "cipher=")) { char *t; - if (!(t = strdup(option+7))) + t = strdup(option+7); + if (!t) return -ENOMEM; free(opt_cipher); @@ -80,6 +82,13 @@ static int parse_one_option(const char *option) { return 0; } + } else if (startswith(option, "keyfile-size=")) { + + if (safe_atou(option+13, &opt_keyfile_size) < 0) { + log_error("keyfile-size= parse failure, ignoring."); + return 0; + } + } else if (startswith(option, "keyfile-offset=")) { if (safe_atou(option+15, &opt_keyfile_offset) < 0) { @@ -90,7 +99,8 @@ static int parse_one_option(const char *option) { } else if (startswith(option, "hash=")) { char *t; - if (!(t = strdup(option+5))) + t = strdup(option+5); + if (!t) return -ENOMEM; free(opt_hash); @@ -103,7 +113,7 @@ static int parse_one_option(const char *option) { return 0; } - } else if (streq(option, "readonly")) + } else if (streq(option, "readonly") || streq(option, "read-only")) opt_readonly = true; else if (streq(option, "verify")) opt_verify = true; @@ -117,7 +127,7 @@ static int parse_one_option(const char *option) { opt_type = CRYPT_PLAIN; else if (startswith(option, "timeout=")) { - if (parse_usec(option+8, &opt_timeout) < 0) { + if (parse_sec(option+8, &opt_timeout) < 0) { log_error("timeout= parse failure, ignoring."); return 0; } @@ -129,22 +139,19 @@ static int parse_one_option(const char *option) { } static int parse_options(const char *options) { - char *state; - char *w; + char *state, *w; size_t l; + int r; assert(options); FOREACH_WORD_SEPARATOR(w, l, options, ",", state) { - char *o; - int r; + _cleanup_free_ char *o; - if (!(o = strndup(w, l))) + o = strndup(w, l); + if (!o) return -ENOMEM; - r = parse_one_option(o); - free(o); - if (r < 0) return r; } @@ -157,11 +164,19 @@ static void log_glue(int level, const char *msg, void *usrptr) { } static char *disk_description(const char *path) { + + static const char name_fields[] = { + "ID_PART_ENTRY_NAME\0" + "DM_NAME\0" + "ID_MODEL_FROM_DATABASE\0" + "ID_MODEL\0" + }; + struct udev *udev = NULL; struct udev_device *device = NULL; struct stat st; char *description = NULL; - const char *model; + const char *i; assert(path); @@ -171,16 +186,23 @@ static char *disk_description(const char *path) { if (!S_ISBLK(st.st_mode)) return NULL; - if (!(udev = udev_new())) + udev = udev_new(); + if (!udev) return NULL; - if (!(device = udev_device_new_from_devnum(udev, 'b', st.st_rdev))) + device = udev_device_new_from_devnum(udev, 'b', st.st_rdev); + if (!device) goto finish; - if ((model = udev_device_get_property_value(device, "ID_MODEL_FROM_DATABASE")) || - (model = udev_device_get_property_value(device, "ID_MODEL")) || - (model = udev_device_get_property_value(device, "DM_NAME"))) - description = strdup(model); + NULSTR_FOREACH(i, name_fields) { + const char *name; + + name = udev_device_get_property_value(device, i); + if (!isempty(name)) { + description = strdup(name); + break; + } + } finish: if (device) @@ -193,7 +215,8 @@ finish: } static char *disk_mount_point(const char *label) { - char *mp = NULL, *device = NULL; + char *mp = NULL; + _cleanup_free_ char *device = NULL; FILE *f = NULL; struct mntent *m; @@ -216,11 +239,68 @@ finish: if (f) endmntent(f); - free(device); - return mp; } +static int get_password(const char *name, usec_t until, bool accept_cached, char ***passwords) { + int r; + char **p; + _cleanup_free_ char *text = NULL; + + assert(name); + assert(passwords); + + if (asprintf(&text, "Please enter passphrase for disk %s!", name) < 0) + return log_oom(); + + r = ask_password_auto(text, "drive-harddisk", until, accept_cached, passwords); + if (r < 0) { + log_error("Failed to query password: %s", strerror(-r)); + return r; + } + + if (opt_verify) { + _cleanup_strv_free_ char **passwords2 = NULL; + + assert(strv_length(*passwords) == 1); + + if (asprintf(&text, "Please enter passphrase for disk %s! (verification)", name) < 0) + return log_oom(); + + r = ask_password_auto(text, "drive-harddisk", until, false, &passwords2); + if (r < 0) { + log_error("Failed to query verification password: %s", strerror(-r)); + return r; + } + + assert(strv_length(passwords2) == 1); + + if (!streq(*passwords[0], passwords2[0])) { + log_warning("Passwords did not match, retrying."); + return -EAGAIN; + } + } + + strv_uniq(*passwords); + + STRV_FOREACH(p, *passwords) { + char *c; + + if (strlen(*p)+1 >= opt_key_size) + continue; + + /* Pad password if necessary */ + if (!(c = new(char, opt_key_size))) + return log_oom(); + + strncpy(c, *p, opt_key_size); + free(*p); + *p = c; + } + + return 0; +} + static int help(void) { printf("%s attach VOLUME SOURCEDEVICE [PASSWORD] [OPTIONS]\n" @@ -235,10 +315,6 @@ static int help(void) { int main(int argc, char *argv[]) { int r = EXIT_FAILURE; struct crypt_device *cd = NULL; - char **passwords = NULL, *truncated_cipher = NULL; - const char *cipher = NULL, *cipher_mode = NULL, *hash = NULL, *name = NULL; - char *description = NULL, *name_buffer = NULL, *mount_point = NULL; - unsigned keyfile_size = 0; if (argc <= 1) { help(); @@ -260,9 +336,12 @@ int main(int argc, char *argv[]) { uint32_t flags = 0; int k; unsigned try; - const char *key_file = NULL; usec_t until; crypt_status_info status; + const char *key_file = NULL, *cipher = NULL, *cipher_mode = NULL, + *hash = NULL, *name = NULL; + _cleanup_free_ char *description = NULL, *name_buffer = NULL, + *mount_point = NULL, *truncated_cipher = NULL; /* Arguments: systemd-cryptsetup attach VOLUME SOURCE-DEVICE [PASSWORD] [OPTIONS] */ @@ -282,8 +361,10 @@ int main(int argc, char *argv[]) { key_file = argv[4]; } - if (argc >= 6 && argv[5][0] && !streq(argv[5], "-")) - parse_options(argv[5]); + if (argc >= 6 && argv[5][0] && !streq(argv[5], "-")) { + if (parse_options(argv[5]) < 0) + goto finish; + } /* A delicious drop of snake oil */ mlockall(MCL_FUTURE); @@ -308,7 +389,8 @@ int main(int argc, char *argv[]) { name = name_buffer ? name_buffer : argv[2]; - if ((k = crypt_init(&cd, argv[3]))) { + k = crypt_init(&cd, argv[3]); + if (k) { log_error("crypt_init() failed: %s", strerror(-k)); goto finish; } @@ -335,15 +417,21 @@ int main(int argc, char *argv[]) { opt_tries = opt_tries > 0 ? opt_tries : 3; opt_key_size = (opt_key_size > 0 ? opt_key_size : 256); - hash = opt_hash ? opt_hash : "ripemd160"; + if (opt_hash) { + /* plain isn't a real hash type. it just means "use no hash" */ + if (!streq(opt_hash, "plain")) + hash = opt_hash; + } else + hash = "ripemd160"; if (opt_cipher) { size_t l; l = strcspn(opt_cipher, "-"); + truncated_cipher = strndup(opt_cipher, l); - if (!(truncated_cipher = strndup(opt_cipher, l))) { - log_error("Out of memory."); + if (!truncated_cipher) { + log_oom(); goto finish; } @@ -356,74 +444,14 @@ int main(int argc, char *argv[]) { for (try = 0; try < opt_tries; try++) { bool pass_volume_key = false; - - strv_free(passwords); - passwords = NULL; + _cleanup_strv_free_ char **passwords = NULL; if (!key_file) { - char *text; - char **p; - - if (asprintf(&text, "Please enter passphrase for disk %s!", name) < 0) { - log_error("Out of memory."); - goto finish; - } - - k = ask_password_auto(text, "drive-harddisk", until, try == 0 && !opt_verify, &passwords); - free(text); - - if (k < 0) { - log_error("Failed to query password: %s", strerror(-k)); + k = get_password(name, until, try == 0 && !opt_verify, &passwords); + if (k == -EAGAIN) + continue; + else if (k < 0) goto finish; - } - - if (opt_verify) { - char **passwords2 = NULL; - - assert(strv_length(passwords) == 1); - - if (asprintf(&text, "Please enter passphrase for disk %s! (verification)", name) < 0) { - log_error("Out of memory."); - goto finish; - } - - k = ask_password_auto(text, "drive-harddisk", until, false, &passwords2); - free(text); - - if (k < 0) { - log_error("Failed to query verification password: %s", strerror(-k)); - goto finish; - } - - assert(strv_length(passwords2) == 1); - - if (!streq(passwords[0], passwords2[0])) { - log_warning("Passwords did not match, retrying."); - strv_free(passwords2); - continue; - } - - strv_free(passwords2); - } - - strv_uniq(passwords); - - STRV_FOREACH(p, passwords) { - char *c; - - if (strlen(*p)+1 >= opt_key_size) - continue; - - /* Pad password if necessary */ - if (!(c = new(char, opt_key_size))) { - log_error("Out of memory."); - goto finish; - } - - strncpy(c, *p, opt_key_size); - free(*p); - *p = c; - } } k = 0; @@ -432,10 +460,12 @@ int main(int argc, char *argv[]) { k = crypt_load(cd, CRYPT_LUKS1, NULL); if ((!opt_type && k < 0) || streq_ptr(opt_type, CRYPT_PLAIN)) { - struct crypt_params_plain params; + struct crypt_params_plain params = { .hash = hash }; - zero(params); - params.hash = hash; + /* for CRYPT_PLAIN limit reads + * from keyfile to key length, and + * ignore keyfile-size */ + opt_keyfile_size = opt_key_size / 8; /* In contrast to what the name * crypt_setup() might suggest this @@ -448,14 +478,11 @@ int main(int argc, char *argv[]) { cipher_mode, NULL, NULL, - opt_key_size / 8, + opt_keyfile_size, ¶ms); - pass_volume_key = streq(hash, "plain"); - - /* for CRYPT_PLAIN limit reads - * from keyfile to key length */ - keyfile_size = opt_key_size / 8; + /* hash == NULL implies the user passed "plain" */ + pass_volume_key = (hash == NULL); } if (k < 0) { @@ -469,10 +496,25 @@ int main(int argc, char *argv[]) { crypt_get_volume_key_size(cd)*8, argv[3]); - if (key_file) - k = crypt_activate_by_keyfile_offset(cd, argv[2], CRYPT_ANY_SLOT, key_file, keyfile_size, - opt_keyfile_offset, flags); - else { + if (key_file) { + struct stat st; + + /* Ideally we'd do this on the open + * fd, but since this is just a + * warning it's OK to do this in two + * steps */ + if (stat(key_file, &st) >= 0 && (st.st_mode & 0005)) + log_warning("Key file %s is world-readable. That's certainly not a good idea.", key_file); + + k = crypt_activate_by_keyfile_offset( + cd, argv[2], CRYPT_ANY_SLOT, key_file, opt_keyfile_size, + opt_keyfile_offset, flags); + if (k < 0) { + log_error("Failed to activate with key file '%s': %s", key_file, strerror(-k)); + key_file = NULL; + continue; + } + } else { char **p; STRV_FOREACH(p, passwords) { @@ -507,14 +549,16 @@ int main(int argc, char *argv[]) { } else if (streq(argv[1], "detach")) { int k; - if ((k = crypt_init_by_name(&cd, argv[2]))) { + k = crypt_init_by_name(&cd, argv[2]); + if (k) { log_error("crypt_init() failed: %s", strerror(-k)); goto finish; } crypt_set_log_callback(cd, log_glue, NULL); - if ((k = crypt_deactivate(cd, argv[2])) < 0) { + k = crypt_deactivate(cd, argv[2]); + if (k < 0) { log_error("Failed to deactivate: %s", strerror(-k)); goto finish; } @@ -534,13 +578,5 @@ finish: free(opt_cipher); free(opt_hash); - free(truncated_cipher); - - strv_free(passwords); - - free(description); - free(mount_point); - free(name_buffer); - return r; }