Keyring 2.0

pmeunier

Apr 10, 2023, 3:33 PM

UMF6N7CZA4CTSPKQFZSZXA3VRHWQAKEA5GUNIEAAVRWC7FUSSKAAC

Dependencies

• [2] 4EN4MDBQ Update identity dependencies
• [3] DOEG3V7U Only re-write identity data when changed
• [4] IKZBGTGQ Handle absence of keyring as warning rather than error
• [5] KWD6K4F7 Handle absence of keyring for password creation
• [6] SXEYMYF7 Fixing the bad changes in history (unfortunately, by rebooting).
• [7] 2K7JLB4Z No pager on Windows
• [8] 7ZROQSSN Handling TAG uploads from the `pijul protocol` command
• [9] 4KJ45IJL Implement new identity management
• [10] DWSAYGVE Update codebase to use new identity management
• [11] 4OJWMSOW Fully replace crate::Identity

Change contents

• replacement in pijul/src/remote/ssh.rs at line 291
  [6.2612]→[6.2612:2699](∅→∅)
  − if let Ok(password) = keyring::Entry::new("pijul", &username).get_password() {
  [6.2612]

  [6.2699]
  + if let Ok(password) = keyring::Entry::new("pijul", &username).and_then(|x| x.get_password())

  + {
• replacement in pijul/src/remote/ssh.rs at line 316
  [6.3514]→[5.45:143](∅→∅)
  − if let Err(e) = keyring::Entry::new("pijul", &username).set_password(&password) {
  [6.3514]

  [5.143]
  + if let Err(e) =

  + keyring::Entry::new("pijul", &username).and_then(|x| x.set_password(&password))

  + {
• replacement in pijul/Cargo.toml at line 110
  [2.14060]→[2.14060:14078](∅→∅)
  − keyring = "1.2.0"
  [2.14060]

  [6.309]
  + keyring = "2.0"
• replacement in pijul/src/identity/mod.rs at line 133
  [6.4106]→[6.4106:4192](∅→∅)
  − if let Ok(password) = keyring::Entry::new("pijul", name).get_password() {
  [6.4106]

  [6.4192]
  + if let Ok(password) = keyring::Entry::new("pijul", name).and_then(|x| x.get_password()) {
• replacement in pijul/src/identity/mod.rs at line 148
  [6.4743]→[5.220:317](∅→∅)
  − if let Err(e) = keyring::Entry::new("pijul", name).set_password(&password_attempt) {
  [6.4743]

  [5.317]
  + if let Err(e) = keyring::Entry::new("pijul", name).and_then(|x| x.set_password(&password_attempt)) {
• replacement in pijul/src/identity/mod.rs at line 269
  [6.7658]→[5.388:488](∅→∅)
  − if let Err(e) = keyring::Entry::new("pijul", &self.name).set_password(&user_password) {
  [6.7658]

  [5.488]
  + if let Err(e) = keyring::Entry::new("pijul", &self.name).and_then(|x| x.set_password(&user_password)) {
• replacement in pijul/src/identity/create.rs at line 379
  [3.1735]→[6.40261:40341](∅→∅),[6.40261]→[6.40261:40341](∅→∅)
  − if let Err(e) = Entry::new("pijul", &self.name).delete_password() {
  [3.1735]

  [6.40341]
  + if let Err(e) = Entry::new("pijul", &self.name).and_then(|x| x.delete_password()) {
• replacement in pijul/src/identity/create.rs at line 395
  [6.14270]→[5.559:653](∅→∅)
  − if let Err(e) = Entry::new("pijul", &new_identity.name).set_password(&password) {
  [6.14270]

  [5.653]
  + if let Err(e) =

  + Entry::new("pijul", &new_identity.name).and_then(|x| x.set_password(&password))

  + {
• replacement in pijul/src/identity/create.rs at line 400
  [5.723]→[6.40598:40689](∅→∅),[6.40598]→[6.40598:40689](∅→∅)
  − } else if let Err(e) = Entry::new("pijul", &new_identity.name).delete_password() {
  [5.723]

  [6.40689]
  + } else if let Err(e) =

  + Entry::new("pijul", &new_identity.name).and_then(|x| x.delete_password())

  + {
• replacement in pijul/src/commands/identity.rs at line 358
  [6.53331]→[6.53331:53408](∅→∅)
  − keyring::Entry::new("pijul", &identity.name)
  [6.53331]

  [6.53408]
  + keyring::Entry::new("pijul", &identity.name)?
• replacement in pijul/src/commands/identity.rs at line 443
  [6.19585]→[4.16:108](∅→∅)
  − if let Err(e) = Entry::new("pijul", &identity.name).delete_password() {
  [6.19585]

  [4.108]
  + if let Err(e) = Entry::new("pijul", &identity.name).and_then(|x| x.delete_password()) {