diff --git a/Cargo.lock b/Cargo.lock index 667811dd..56b3a53a 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -81,9 +81,9 @@ checksum = "330a5ed07fa54e4702c9d6c4174f74427fc0ef6e214bbd677ae50a5099946470" [[package]] name = "ashpd" -version = "0.14.0" +version = "0.14.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ba377f1fb1e3972907220f1f8e7c0a45164580905c981d872c1fb90d921cbcc" +checksum = "72e703b2bc5ba8e903b7845ae92657c281391116ccb8eef89cf6a0ee68d96d76" dependencies = [ "async-trait", "bitflags", @@ -238,9 +238,9 @@ dependencies = [ [[package]] name = "bumpalo" -version = "3.20.3" +version = "3.20.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72f5acc6cb2ba439de613abc23857ec3d78374d8ed5ac84e9d11336e87da8649" +checksum = "87a0cf66fd1eb2fb7b822cb78370d82303750809bc6ba855f3f58e517d3238db" [[package]] name = "byteorder" @@ -250,9 +250,9 @@ checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" [[package]] name = "bytes" -version = "1.12.1" +version = "1.12.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fc652a48c352aef3ea3aed32080501cf3ef6ed5da78602a020c991775b0aff04" +checksum = "776dfebd015e2d8732c684a2c71003674ccb49457b539b9e82151ba38e96dd7c" [[package]] name = "cargo-credential" @@ -289,9 +289,9 @@ dependencies = [ [[package]] name = "cc" -version = "1.11.0" +version = "1.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "375989decec1a0fa424442bed520fa12ede43a48475ce8c7417d2c69b32b5f6b" +checksum = "33ef9e3e8154a45c7a95cff4c1299702106ad94062d7bb85fdc5d3a5afd91d45" dependencies = [ "find-msvc-tools", "shlex", @@ -317,9 +317,9 @@ dependencies = [ [[package]] name = "clap" -version = "4.6.7" +version = "4.6.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa8876b300ab35ba921adea3dfd70157a46249b33f95c9084ae5709785478946" +checksum = "ac230478587d0269d8d6998b82ae69ea51509d55df66d9e92edd1f986904cd4a" dependencies = [ "clap_builder", "clap_derive", @@ -339,9 +339,9 @@ dependencies = [ [[package]] name = "clap_derive" -version = "4.6.7" +version = "4.6.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f9c751b79415d4e559e3d1fcf128e09e720eb673a06d26cf6f392d37d75b66e0" +checksum = "895c9d8d2ac2dd8b8a29f3724a14e72aaaa6debcf8c38c82f97305c6a172767a" dependencies = [ "heck", "proc-macro2", @@ -351,9 +351,9 @@ dependencies = [ [[package]] name = "clap_lex" -version = "1.1.1" +version = "1.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1c133bc6a41be0d194c306b5506d15e6feeea7b1d6604bd3f8310dfb2ca96486" +checksum = "e0921b3876b3a1df8a1c9f912e7f94342458022c2e84288015893d83c4d62a79" [[package]] name = "cmov" @@ -378,9 +378,9 @@ dependencies = [ [[package]] name = "const-oid" -version = "0.10.2" +version = "0.10.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a6ef517f0926dd24a1582492c791b6a4818a4d94e789a334894aa15b0d12f55c" +checksum = "be95d4a884358a21a199689323c29e9256b4a1b315e22f183d155422041d3a9a" [[package]] name = "cpubits" @@ -459,9 +459,9 @@ checksum = "66b7e2430c6dff6a955451e2cfc438f09cea1965a9d6f87f7e3b90decc014099" [[package]] name = "errno" -version = "0.3.14" +version = "0.3.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39cab71617ae0d63f51a36d69f866391735b51691dbda63cf6f96d042b63efeb" +checksum = "e35d6e78f4cebb90e51d543db8fe41528851d6deeef6ef21ebd4bfdc1e784776" dependencies = [ "libc", "windows-sys", @@ -685,9 +685,9 @@ dependencies = [ [[package]] name = "inout" -version = "0.2.5" +version = "0.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b5cf4372d022092674a83b8febf5865f7a573cc0c5baec5e49c879b6a20978f" +checksum = "3a580c13f0ffc335ef42dd3f6b1a41b726051c5e1656d9a3aa6fddb3c5dfbbf9" dependencies = [ "block-padding", "hybrid-array", @@ -701,9 +701,9 @@ checksum = "a6cb138bb79a146c1bd460005623e142ef0181e3d0219cb493e02f7d08a35695" [[package]] name = "itoa" -version = "1.0.18" +version = "1.0.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f42a60cbdf9a97f5d2305f08a87dc4e09308d1276d28c869c684d7777685682" +checksum = "3bd1574e617a9a6c1f8f8181bd7e841e1f20e4277607ef28945765188d6284d4" [[package]] name = "js-sys" @@ -845,9 +845,9 @@ dependencies = [ [[package]] name = "mio" -version = "1.2.4" +version = "1.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1788edb87fdc09c7e26304471e2f5be8cdefb1b6930d6e3985fc02ff53bf86ee" +checksum = "20521a903f02b0a573cd6840e9d0a5a0cc043d361fe924092cd70f8556cc9c4a" dependencies = [ "libc", "wasi", @@ -1430,9 +1430,9 @@ dependencies = [ [[package]] name = "regex" -version = "1.13.1" +version = "1.13.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f020237b6c8eed93db2e2cb53c00c60a8e1bc73da7d073199a1180401450218d" +checksum = "9807af0e638c12e753aa1b4e601791bf2a8f71274023c8bbeec12fc149950857" dependencies = [ "aho-corasick", "memchr", @@ -1442,9 +1442,9 @@ dependencies = [ [[package]] name = "regex-automata" -version = "0.4.18" +version = "0.4.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad8553b9b26413251cbf30e620595c7a41b3887f03da04579c0e6b0d6a06b4b2" +checksum = "41d60ef07df457506a0a1a2073112eb4aae5733dbd2813c3da77d1b0fd441158" dependencies = [ "aho-corasick", "memchr", @@ -1453,15 +1453,15 @@ dependencies = [ [[package]] name = "regex-syntax" -version = "0.8.11" +version = "0.8.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d6f6ff9a378485b298a5286656da665ba74413d36db0979633275d2e708145d4" +checksum = "d902046e6a28a1e4c3cab97258a0ce11e994903f01c2d97a9447a0b3df85f4f6" [[package]] name = "rpassword" -version = "7.5.4" +version = "7.5.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2da316a15f47e3d053de9cb2c439650bd8fa4aaeb9365f2e5f27f492ff73c196" +checksum = "1fa2c5d9304b618df61ff17f3d3485c6e1854a3d94902a49abbb8d43dfbe0464" dependencies = [ "libc", "rtoolbox", @@ -1622,9 +1622,9 @@ checksum = "0c790de23124f9ab44544d7ac05d60440adc586479ce501c1d6d7da3cd8c9cf5" [[package]] name = "smallvec" -version = "1.16.4" +version = "1.16.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d0d5d4b1981b8bbbb7aed204cae5726d683d5d6ac7e74ec54122ea28f315e7c8" +checksum = "3244542535d5de959d90ec55d1b5ff0fd2bb7b1310223907d5f11932847f7b59" [[package]] name = "socket2" @@ -1672,9 +1672,9 @@ dependencies = [ [[package]] name = "target-lexicon" -version = "0.13.5" +version = "0.13.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "adb6935a6f5c20170eeceb1a3835a49e12e19d792f6dd344ccc76a985ca5a6ca" +checksum = "8c447be3a2abfa84b2d91680c56600bd6b2873866de27b36ec911be705e291da" [[package]] name = "temp-dir" @@ -1899,9 +1899,9 @@ checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821" [[package]] name = "uuid" -version = "1.29.0" +version = "1.29.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4a0e2d11620c50695fe12bbbfde96b3477fe606e7284c22d505c12ce51214514" +checksum = "3c14b15dffa2f4bd712103e857140aa04a4f2ff6e955c77d7eb8e53ee02a3b64" dependencies = [ "getrandom 0.4.3", "js-sys", @@ -2034,9 +2034,9 @@ checksum = "1ebf944e87a7c253233ad6766e082e3cd714b5d03812acc24c318f549614536e" [[package]] name = "zbus" -version = "6.2.1" +version = "6.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ddb2961d9587ef9f24ad14cde1c3bc4c5edc9f1525932a8cffdd5bd98886eb9" +checksum = "6b4aae740b23927ceabed962431abab2cdefb9f7f885e5bbab062da09bf580e4" dependencies = [ "async-trait", "bitflags", @@ -2063,9 +2063,9 @@ dependencies = [ [[package]] name = "zbus_macros" -version = "6.2.1" +version = "6.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "083b38add47c340fc12ec560124fb1d9c23acb584f7021099f85ec6587a03c54" +checksum = "37c9dd4beaf145c16fcb2902862f50da86e54aed13dd368ddf64a1d17e6b8529" dependencies = [ "proc-macro2", "quote", @@ -2117,9 +2117,9 @@ dependencies = [ [[package]] name = "zeroize" -version = "1.9.1" +version = "1.9.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e13084392c5e4bc371903e2935a5eaeed24905a7511356b883835e18a78f6879" +checksum = "85ccff8a4805aba1eaa4cd4afcd49f7557dd2cf5fd79ffc37f8959466effc5aa" dependencies = [ "zeroize_derive", ] @@ -2170,9 +2170,9 @@ checksum = "29666d0abbfad1e3dc4dcf6144730dd3a3ab225bbbdac83319345b1b44ccfc1b" [[package]] name = "zruntime" -version = "0.2.2" +version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23ef5ed7d628cdf0af82f93dfe03330a8e37383bf7422a1d3d6eb72326680be5" +checksum = "ce6a55d4f521760475a30f7b96779508fe8c40dc834478709454dd1d5f0ebc72" dependencies = [ "futures-core", "futures-io", diff --git a/cli/src/main.rs b/cli/src/main.rs index 2771c206..3f2c4634 100644 --- a/cli/src/main.rs +++ b/cli/src/main.rs @@ -412,8 +412,10 @@ enum Commands { #[command(name = "change-secret", about = "Change the keyring secret")] ChangeSecret { - #[arg(help = "The new secret. If not provided, it will be read from the terminal")] - new_secret: Option, + #[arg( + help = "The new secret. If not provided, it will be read from the terminal. Use '-' to read it from stdin" + )] + new_secret: Option, }, #[command( @@ -448,9 +450,12 @@ impl fmt::Display for MigrateFormat { } impl Commands { - async fn execute(self, args: Arguments) -> Result<(), Error> { + async fn execute(self, mut args: Arguments) -> Result<(), Error> { + // A secret of "-" is read from stdin + let secret = resolve_secret(args.secret.take())?; + if matches!(self, Commands::Migrate { .. }) { - return self.migrate(args.secret).await; + return self.migrate(secret).await; } let service = Service::new().await?; @@ -494,9 +499,9 @@ impl Commands { }); (Some(secret), path) } else if let Some(keyring) = args.keyring { - let secret = args.secret.or_else(|| { + let secret = secret.or_else(|| { if std::io::stdin().is_terminal() { - rpassword::prompt_password("Keyring secret: ") + rpassword::prompt_password("Keyring Secret: ") .ok() .filter(|s| !s.is_empty()) .map(oo7::Secret::from) @@ -505,7 +510,7 @@ impl Commands { } }); (secret, Some(keyring)) - } else if let Some(secret) = args.secret { + } else if let Some(secret) = secret { ( Some(secret), data_dir().map(|mut path| { @@ -693,13 +698,21 @@ impl Commands { Keyring::File(keyring) => { let items = keyring.all_items().await?; let mut outputs = Vec::new(); + let mut n_invalid = 0; for item in items { match item { Ok(item) => outputs.push(ItemOutput::from_file_item(&item, hex)), - Err(_) if !json => { - println!("Item is not valid and cannot be decrypted"); - } - Err(_) => {} // Skip invalid items in JSON mode + Err(_) => n_invalid += 1, + } + } + if !json && n_invalid > 0 { + if outputs.is_empty() { + // All items fail to decrypt -> secret is wrong + println!( + "None of the items could be decrypted, the keyring secret is likely wrong" + ); + } else { + println!("{n_invalid} items are not valid and cannot be decrypted"); } } outputs @@ -752,7 +765,7 @@ impl Commands { Commands::ChangeSecret { new_secret } => { match keyring { Keyring::File(keyring) => { - let secret = match new_secret { + let secret = match resolve_secret(new_secret)? { Some(s) => s, None => { let s = rpassword::prompt_password("Type the new secret: ") @@ -949,9 +962,9 @@ struct Arguments { short, long, global = true, - help = "Specify the keyring secret" + help = "Specify the keyring secret. Use '-' to read it from stdin" )] - secret: Option, + secret: Option, #[arg( name = "app-id", long, @@ -968,6 +981,38 @@ struct Arguments { is_verbose: bool, } +/// Read a secret from stdin, prompting on the terminal if there is one. +fn read_secret_from_stdin() -> Result { + let mut stdin = std::io::stdin().lock(); + if stdin.is_terminal() { + rpassword::prompt_password("Keyring secret: ") + .map(Into::into) + .map_err(|_| Error::new("Can't read secret")) + } else { + let mut buf = Vec::new(); + stdin + .read_to_end(&mut buf) + .map_err(|_| Error::new("Can't read secret"))?; + // Drop the trailing newline added by echo + if buf.last() == Some(&b'\n') { + buf.pop(); + if buf.last() == Some(&b'\r') { + buf.pop(); + } + } + Ok(buf.into()) + } +} + +/// Resolve a secret argument, reading it from stdin when set to "-". +fn resolve_secret(secret: Option) -> Result, Error> { + match secret { + Some(s) if s == "-" => Ok(Some(read_secret_from_stdin()?)), + Some(s) => Ok(Some(s.into())), + None => Ok(None), + } +} + #[tokio::main(flavor = "current_thread")] async fn main() -> Result<(), Error> { let cli = Cli::parse(); diff --git a/portal/src/main.rs b/portal/src/main.rs index eab74f83..c8a0d8ec 100644 --- a/portal/src/main.rs +++ b/portal/src/main.rs @@ -38,10 +38,11 @@ impl ashpd::backend::secret::SecretImpl for Secret { token: HandleToken, app_id: ashpd::MaybeAppID, fd: std::os::fd::OwnedFd, + options: ashpd::desktop::secret::RetrieveOptions, ) -> ashpd::backend::Result> { tracing::debug!("Request from app: {app_id}"); - let task = tokio::spawn(async move { send_secret_to_app(&app_id, fd).await }); + let task = tokio::spawn(async move { send_secret_to_app(&app_id, fd, options).await }); // Store the abort handle for this request { @@ -66,7 +67,11 @@ impl ashpd::backend::secret::SecretImpl for Secret { } /// Generates, stores and send the secret back to the fd stream -async fn send_secret_to_app(app_id: &ashpd::MaybeAppID, fd: std::os::fd::OwnedFd) -> Result<()> { +async fn send_secret_to_app( + app_id: &ashpd::MaybeAppID, + fd: std::os::fd::OwnedFd, + options: ashpd::desktop::secret::RetrieveOptions, +) -> Result<()> { let service = Service::new().await?; let collection = service.default_collection().await?; // Native apps can have a desktop file name or an empty ID. Keep the @@ -78,7 +83,9 @@ async fn send_secret_to_app(app_id: &ashpd::MaybeAppID, fd: std::os::fd::OwnedFd let mut file = tokio::fs::File::from_std(std::fs::File::from(fd)); if collection.is_locked().await? { - collection.unlock(None).await?; + collection + .unlock(options.parent_window().cloned().map(Into::into)) + .await?; } if let Some(item) = collection.search_items(attributes).await?.first() {