diff --git a/Cargo.lock b/Cargo.lock index b91b404..452cc3c 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -86,7 +86,7 @@ dependencies = [ "lazycell", "log", "peeking_take_while", - "proc-macro2 1.0.20", + "proc-macro2 1.0.21", "quote 1.0.7", "regex", "rustc-hash", @@ -100,6 +100,18 @@ version = "1.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693" +[[package]] +name = "bstr" +version = "0.2.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "31accafdb70df7871592c058eca3985b71104e15ac32f64706022c58867da931" +dependencies = [ + "lazy_static", + "memchr", + "regex-automata", + "serde", +] + [[package]] name = "byteorder" version = "1.3.4" @@ -118,9 +130,9 @@ dependencies = [ [[package]] name = "cc" -version = "1.0.59" +version = "1.0.60" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "66120af515773fb005778dc07c261bd201ec8ce50bd6e7144c927753fe013381" +checksum = "ef611cc68ff783f18535d77ddd080185275713d852c4f5cbb6122c462a7a825c" [[package]] name = "cexpr" @@ -244,6 +256,19 @@ dependencies = [ "lazy_static", ] +[[package]] +name = "csv" +version = "1.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "00affe7f6ab566df61b4be3ce8cf16bc2576bca0963ceb0955e45d514bf9a279" +dependencies = [ + "bstr", + "csv-core", + "itoa", + "ryu", + "serde", +] + [[package]] name = "csv-core" version = "0.1.10" @@ -255,14 +280,14 @@ dependencies = [ [[package]] name = "ctap_hmac" -version = "0.4.2" +version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c5fec79b66e3a7bc6a7ace0f4c98f0748892b36d3c5c317fadfce0344fd185dc" +checksum = "33ccc28f298181e943187fa63805e652bc4806ad43708beebd22c230fbe0baa3" dependencies = [ "byteorder", "cbor-codec", "crossbeam", - "csv-core", + "csv", "derive_builder", "failure", "failure_derive", @@ -271,6 +296,8 @@ dependencies = [ "rand 0.6.5", "ring", "rust-crypto", + "serde", + "serde_derive", "untrusted", ] @@ -292,10 +319,10 @@ checksum = "f0c960ae2da4de88a91b2d920c2a7233b400bc33cb28453a2987822d8392519b" dependencies = [ "fnv", "ident_case", - "proc-macro2 1.0.20", + "proc-macro2 1.0.21", "quote 1.0.7", "strsim 0.9.3", - "syn 1.0.40", + "syn 1.0.41", ] [[package]] @@ -306,7 +333,7 @@ checksum = "d9b5a2f4ac4969822c62224815d069952656cadc7084fdca9751e6d959189b72" dependencies = [ "darling_core", "quote 1.0.7", - "syn 1.0.40", + "syn 1.0.41", ] [[package]] @@ -317,9 +344,9 @@ checksum = "a2658621297f2cf68762a6f7dc0bb7e1ff2cfd6583daef8ee0fed6f7ec468ec0" dependencies = [ "darling", "derive_builder_core", - "proc-macro2 1.0.20", + "proc-macro2 1.0.21", "quote 1.0.7", - "syn 1.0.40", + "syn 1.0.41", ] [[package]] @@ -329,16 +356,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2791ea3e372c8495c0bc2033991d76b512cd799d07491fbd6890124db9458bef" dependencies = [ "darling", - "proc-macro2 1.0.20", + "proc-macro2 1.0.21", "quote 1.0.7", - "syn 1.0.40", + "syn 1.0.41", ] [[package]] name = "either" -version = "1.6.0" +version = "1.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd56b59865bce947ac5958779cfa508f6c3b9497cc762b7e24a12d11ccde2c4f" +checksum = "e78d4f1cc4ae33bbfc157ed5d5a5ef3bc29227303d595861deb238fcec4e9457" [[package]] name = "env_logger" @@ -369,9 +396,9 @@ version = "0.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "aa4da3c766cd7a0db8242e326e9e4e081edd567072893ed320008189715366a4" dependencies = [ - "proc-macro2 1.0.20", + "proc-macro2 1.0.21", "quote 1.0.7", - "syn 1.0.40", + "syn 1.0.41", "synstructure", ] @@ -432,9 +459,9 @@ dependencies = [ [[package]] name = "hermit-abi" -version = "0.1.15" +version = "0.1.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3deed196b6e7f9e44a2ae8d94225d80302d81208b1bb673fd21fe634645c85a9" +checksum = "4c30f6d0bc6b00693347368a67d41b58f2fb851215ff1da49e90fe2c5c667151" dependencies = [ "libc", ] @@ -480,9 +507,9 @@ checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55" [[package]] name = "libc" -version = "0.2.76" +version = "0.2.77" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "755456fae044e6fa1ebbbd1b3e902ae19e73097ed4ed87bb79934a867c007bc3" +checksum = "f2f96b10ec2560088a8e76961b00d47107b3a625fecb76dedb29ee7ccbf98235" [[package]] name = "libcryptsetup-rs" @@ -544,20 +571,21 @@ checksum = "3728d817d99e5ac407411fa471ff9800a778d88a24685968b36824eaf4bee400" [[package]] name = "memoffset" -version = "0.5.5" +version = "0.5.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c198b026e1bbf08a937e94c6c60f9ec4a2267f5b0d2eec9c1b21b061ce2be55f" +checksum = "043175f069eda7b85febe4a74abbaeff828d9f8b448515d3151a14a3542811aa" dependencies = [ "autocfg 1.0.1", ] [[package]] name = "miniz_oxide" -version = "0.4.1" +version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d7559a8a40d0f97e1edea3220f698f78b1c5ab67532e49f68fde3910323b722" +checksum = "c60c0dfe32c10b43a144bad8fc83538c52f58302c92300ea7ec7bf7b38d5a7b9" dependencies = [ "adler", + "autocfg 1.0.1", ] [[package]] @@ -615,9 +643,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c" dependencies = [ "proc-macro-error-attr", - "proc-macro2 1.0.20", + "proc-macro2 1.0.21", "quote 1.0.7", - "syn 1.0.40", + "syn 1.0.41", "version_check", ] @@ -627,7 +655,7 @@ version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869" dependencies = [ - "proc-macro2 1.0.20", + "proc-macro2 1.0.21", "quote 1.0.7", "version_check", ] @@ -643,9 +671,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.20" +version = "1.0.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "175c513d55719db99da20232b06cda8bab6b83ec2d04e3283edf0213c37c1a29" +checksum = "36e28516df94f3dd551a587da5357459d9b36d945a7c37c3557928c1c2ff2a2c" dependencies = [ "unicode-xid 0.2.1", ] @@ -671,7 +699,7 @@ version = "1.0.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "aa563d17ecb180e500da1cfd2b028310ac758de548efdd203e18f283af693f37" dependencies = [ - "proc-macro2 1.0.20", + "proc-macro2 1.0.21", ] [[package]] @@ -824,6 +852,15 @@ dependencies = [ "thread_local", ] +[[package]] +name = "regex-automata" +version = "0.1.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ae1ded71d66a4a97f5e961fd0cb25a5f366a42a41570d16a763a69c092c26ae4" +dependencies = [ + "byteorder", +] + [[package]] name = "regex-syntax" version = "0.6.18" @@ -912,19 +949,19 @@ checksum = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3" [[package]] name = "serde" -version = "1.0.115" +version = "1.0.116" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e54c9a88f2da7238af84b5101443f0c0d0a3bbdc455e34a5c9497b1903ed55d5" +checksum = "96fe57af81d28386a513cbc6858332abc6117cfdb5999647c6444b8f43a370a5" [[package]] name = "serde_derive" -version = "1.0.115" +version = "1.0.116" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "609feed1d0a73cc36a0182a840a9b37b4a82f0b1150369f0536a9e3f2a31dc48" +checksum = "f630a6370fd8e457873b4bd2ffdae75408bc291ba72be773772a4c2a065d9ae8" dependencies = [ - "proc-macro2 1.0.20", + "proc-macro2 1.0.21", "quote 1.0.7", - "syn 1.0.40", + "syn 1.0.41", ] [[package]] @@ -958,9 +995,9 @@ checksum = "6446ced80d6c486436db5c078dde11a9f73d42b57fb273121e160b84f63d894c" [[package]] name = "structopt" -version = "0.3.17" +version = "0.3.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6cc388d94ffabf39b5ed5fadddc40147cb21e605f53db6f8f36a625d27489ac5" +checksum = "a33f6461027d7f08a13715659b2948e1602c31a3756aeae9378bfe7518c72e82" dependencies = [ "clap", "lazy_static", @@ -969,15 +1006,15 @@ dependencies = [ [[package]] name = "structopt-derive" -version = "0.4.10" +version = "0.4.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e2513111825077552a6751dfad9e11ce0fba07d7276a3943a037d7e93e64c5f" +checksum = "c92e775028122a4b3dd55d58f14fc5120289c69bee99df1d117ae30f84b225c9" dependencies = [ "heck", "proc-macro-error", - "proc-macro2 1.0.20", + "proc-macro2 1.0.21", "quote 1.0.7", - "syn 1.0.40", + "syn 1.0.41", ] [[package]] @@ -993,11 +1030,11 @@ dependencies = [ [[package]] name = "syn" -version = "1.0.40" +version = "1.0.41" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "963f7d3cc59b59b9325165add223142bbf1df27655d07789f109896d353d8350" +checksum = "6690e3e9f692504b941dc6c3b188fd28df054f7fb8469ab40680df52fdcc842b" dependencies = [ - "proc-macro2 1.0.20", + "proc-macro2 1.0.21", "quote 1.0.7", "unicode-xid 0.2.1", ] @@ -1008,9 +1045,9 @@ version = "0.12.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b834f2d66f734cb897113e34aaff2f1ab4719ca946f9a7358dba8f8064148701" dependencies = [ - "proc-macro2 1.0.20", + "proc-macro2 1.0.21", "quote 1.0.7", - "syn 1.0.40", + "syn 1.0.41", "unicode-xid 0.2.1", ] diff --git a/src/cli_args/config.rs b/src/cli_args/config.rs index d2ef46c..cde093f 100644 --- a/src/cli_args/config.rs +++ b/src/cli_args/config.rs @@ -198,7 +198,7 @@ mod test { fn input_salt_obtain() { assert_eq!( SecretInput::String("abc".into()) - .obtain(&PasswordHelper::Stdin) + .obtain_sha256(&PasswordHelper::Stdin) .unwrap(), [ 186, 120, 22, 191, 143, 1, 207, 234, 65, 65, 64, 222, 93, 174, 34, 35, 176, 3, 97, diff --git a/src/cli_args/mod.rs b/src/cli_args/mod.rs index b02799f..3ff252a 100644 --- a/src/cli_args/mod.rs +++ b/src/cli_args/mod.rs @@ -5,6 +5,8 @@ use structopt::clap::AppSettings; use structopt::StructOpt; mod config; +#[cfg(any(feature = "setup", test))] +mod setup; pub use config::*; diff --git a/src/cli_args/setup.rs b/src/cli_args/setup.rs new file mode 100644 index 0000000..821932a --- /dev/null +++ b/src/cli_args/setup.rs @@ -0,0 +1,94 @@ +use crate::cli_args::SecretInput; +use crate::error::Fido2LuksResult; +use crate::luks::LuksDevice; +use std::io::{stdin, BufRead, BufReader}; +use std::path::{Path, PathBuf}; + +enum Setup { + Welcome, + Disks { + disks: Vec, + }, + Unlocked { + disks: Vec, + current_secrets: Vec>, + }, + Salt { + disks: Vec, + current_secrets: Vec>, + salt: SecretInput, + }, + Config { + salt: SecretInput, + }, +} + +impl Setup { + fn description(&self) -> String { + match self { + Self::Welcome => { + "Please enter the device path for all disks you want to protect".into() + } + _ => "".into(), + } + } + + fn next(self) -> Fido2LuksResult { + println!("{}", self.description()); + Ok(match self { + Self::Welcome => { + let mut disks = Vec::new(); + for path in BufReader::new(stdin()).lines() { + let path_string = path?; + let path = match path_string.as_str() { + "" => break, + path => Path::new(path), + }; + if path.exists() { + disks.push(path.to_path_buf()); + } else { + eprintln!( + "{} does not exist, try again or hit enter to finish", + path.display() + ); + } + } + Self::Disks { disks } + } + Self::Disks { disks } => { + let mut luks_devs = Vec::new(); + let add_dev = |path: &Path| -> Fido2LuksResult> { + match LuksDevice::load(path) { + Ok(luks) => return Ok(Some(luks)), + Err(dev) => { + let mut ans = String::new(); + loop { + eprint!("Failed to open {}\nIs it an LUKS device or could it be the mounted block device? Skip/Replace (s,r): "); + stdin().read_line(&mut ans)?; + match ans.as_str() { + "s" => return Ok(None), + "r" => { + print!("Enter an new device path: "); + stdin().read_line(&mut ans)?; + let path = PathBuf::from(&ans); + return add_dev(path.as_path()); + } + _ => (), + } + } + } + } + Ok(None) + }; + for dev in disks.iter() { + let path = PathBuf::from(&dev); + if let Some(luks) = add_dev(path.as_path()) { + luks_devs.push(luks); + } + } + unreachable!() + } + _ => unreachable!(), + }) + } +}