{"header":{"message":"Fully replace crate::Identity","description":"This is quite a large refactor that completely removes the previous crate::Identity struct in favour of the new crate::identity::Complete, which is almost a drop-in replacement with some extra features. To accomplish this, identity::Complete has been re-worked to support all use-cases, including storage of identities both locally & remotely. Also, some implementations on identity::Complete have been re-worked to allow for greater readability, and the previously removed `key_path` field has been re-implemented.","timestamp":"2022-09-22T08:35:27.79284243Z","authors":[{}]},"hash":"4OJWMSOWWNT5N4W4FDMKBZB5UARCLGV3SRZVKGR4EFAYFUMUHM7AC","authors":[{"login":"finchie","key":"6WCsL9cxQoPBLLwR1PUvmFBJi6wGTGFAxcxMovPQCwTZ"}],"deps":{"hashes":[["4OJWMSOWWNT5N4W4FDMKBZB5UARCLGV3SRZVKGR4EFAYFUMUHM7AC","Fully replace crate::Identity"],["AA",null],["FVQYZQFL7WHSC3UUPJ4IWTP7SKTDQ4K6K5HY4EDK3JKXG3CQNZEAC","Create dialoguer themes based on global config"],["4KJ45IJLTIE35KQZUSFMFS67RNENG4P2FZMKMULJLGGYMKJUVRSQC","Implement new identity management"],["DWSAYGVEOR4D2EKIICEZUWCRGJTUXQQLOUWMYIFV7XN62K44F4FAC","Update codebase to use new identity management"],["A3RM526Y7LUXNYW4TL56YKQ5GVOK2R5D7JJVTSQ6TT5MEXIR6YAAC","Integrating identity malleability"],["OU6JOR3CDZTH2H3NTGMV3WDIAWPD3VEJI7JRY3VJ7LPDR3QOA52QC","Add path filtering for log, add json output for log"],["NAUECZW353R5RHT4GGQJIEZPA5EYRGQYTSP7IJNBJS3CXBSTNJDQC","Fixing the map between keys and identities"],["KI2AFWOSN3PTGBGYQ7UKHFOZERZWEUWQ4AQNADG5S4QDJ53ESXFAC","Fixing a panic in pull"],["SXEYMYF7P4RZMZ46WPL4IZUTSQ2ATBWYZX7QNVMS3SGOYXYOHAGQC","Fixing the bad changes in history (unfortunately, by rebooting)."],["DO2Y5TY5JQISUHCVNPI2FXO7WWZVJQ3LGPWF4DNADMGZRIO6PT2QC","Tag synchronisation"],["SLJ3OHD4F6GJGZ3SV2D7DMR3PXYHPSI64X77KZ3RJ24EGEX6ZNQAC","unrecord: show list of changes if none were given as arguments"],["LJFJEX43HDS33O5HCRXH7AR3GTQZDHNWHEQBOERDNPNXR3B3XZ3QC","Fixing newline issues in the protocol over OpenSSH"],["SMMBFECLGSUKRZW5YPOQPOQCOY2CH2OTZXBSZ3KG2N3J3HQZ5PSAC","Converting to the new patch format \"online\""],["OU243LABJJZ3MQHYW2A2MYKW7KZLTZGHJJXDR2BIIIHXT5BSYN3AC","Support for staging"],["5BB266P6HPUGYEVR7QNNOA62EFPYPUYJ3UMLE5J3LLYMSUWXANIQC","Optional colours in the global config file"],["EEBKW7VTILH6AGGV57ZIJ3DJGYHDSYBWGU3C7Q4WWAKSVNUGIYMQC","Keys and identities"],["UDHP4ZVBQZT2VBURB2MDCU2IZDNMCAFSIUKWRBDQ5BWMFKSN2LYQC","Fixing SSH asynchronicity issues"],["MU5GSJAW65PEG3BRYUKZ7O37BPHW3MOX3S5E2RFOXKGUOJEEDQ5AC","Partial push and pull (WARNING: breaks the existing protocol)"],["I24UEJQLCH2SOXA4UHIYWTRDCHSOPU7AFTRUOTX7HZIAV4AZKYEQC","Various post-fire fixes"],["LGEJSLTYI7Y2CYC3AN6ECMT3D3MTWCAKZPVQEG5MPM2OBW5FQ46AC","Fixing output (including its uses in reset and pull)"],["FBXYP7QM7SG6P2JDJVQPPCRKJE3GVYXNQ5GVV4GRDUNG6Q4ZRDJQC","Forgot to add remote::http"]],"deps":["FVQYZQFL7WHSC3UUPJ4IWTP7SKTDQ4K6K5HY4EDK3JKXG3CQNZEAC","4KJ45IJLTIE35KQZUSFMFS67RNENG4P2FZMKMULJLGGYMKJUVRSQC","DWSAYGVEOR4D2EKIICEZUWCRGJTUXQQLOUWMYIFV7XN62K44F4FAC"],"known":["SXEYMYF7P4RZMZ46WPL4IZUTSQ2ATBWYZX7QNVMS3SGOYXYOHAGQC","UDHP4ZVBQZT2VBURB2MDCU2IZDNMCAFSIUKWRBDQ5BWMFKSN2LYQC","SLJ3OHD4F6GJGZ3SV2D7DMR3PXYHPSI64X77KZ3RJ24EGEX6ZNQAC","MU5GSJAW65PEG3BRYUKZ7O37BPHW3MOX3S5E2RFOXKGUOJEEDQ5AC","KI2AFWOSN3PTGBGYQ7UKHFOZERZWEUWQ4AQNADG5S4QDJ53ESXFAC","OU243LABJJZ3MQHYW2A2MYKW7KZLTZGHJJXDR2BIIIHXT5BSYN3AC","5BB266P6HPUGYEVR7QNNOA62EFPYPUYJ3UMLE5J3LLYMSUWXANIQC","I24UEJQLCH2SOXA4UHIYWTRDCHSOPU7AFTRUOTX7HZIAV4AZKYEQC","EEBKW7VTILH6AGGV57ZIJ3DJGYHDSYBWGU3C7Q4WWAKSVNUGIYMQC","SMMBFECLGSUKRZW5YPOQPOQCOY2CH2OTZXBSZ3KG2N3J3HQZ5PSAC","A3RM526Y7LUXNYW4TL56YKQ5GVOK2R5D7JJVTSQ6TT5MEXIR6YAAC","LJFJEX43HDS33O5HCRXH7AR3GTQZDHNWHEQBOERDNPNXR3B3XZ3QC","OU6JOR3CDZTH2H3NTGMV3WDIAWPD3VEJI7JRY3VJ7LPDR3QOA52QC","DO2Y5TY5JQISUHCVNPI2FXO7WWZVJQ3LGPWF4DNADMGZRIO6PT2QC","NAUECZW353R5RHT4GGQJIEZPA5EYRGQYTSP7IJNBJS3CXBSTNJDQC"]},"hunks":[{"Edit":{"inode":{"change":5,"pos":25380},"path":"pijul/src/remote/ssh.rs","line":2,"atom":{"NewVertex":{"up_context":[{"change":21,"pos":31}],"down_context":[{"change":5,"pos":25647}],"flag":"BLOCK","start":0,"end":27,"inode":{"change":5,"pos":25380}}},"contents":[{"Add":"use std::convert::TryInto;"}]}},{"Replacement":{"inode":{"change":5,"pos":25380},"path":"pijul/src/remote/ssh.rs","line":309,"ins":{"up_context":[{"change":5,"pos":839}],"down_context":[{"change":5,"pos":907}],"flag":"BLOCK","start":28,"end":106,"inode":{"change":5,"pos":25380}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":839},"to":{"change":5,"start":839,"end":907},"introduced_by":5}],"inode":{"change":5,"pos":25380}},"ins_contents":[{"Add":" sender: Option>,"}],"del_contents":[{"Del":" sender: Option>,\n"}]}},{"Replacement":{"inode":{"change":5,"pos":25380},"path":"pijul/src/remote/ssh.rs","line":1041,"ins":{"up_context":[{"change":5,"pos":5863}],"down_context":[{"change":5,"pos":5918}],"flag":"BLOCK","start":107,"end":174,"inode":{"change":5,"pos":25380}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":5863},"to":{"change":5,"start":5863,"end":5918},"introduced_by":5}],"inode":{"change":5,"pos":25380}},"ins_contents":[{"Add":" revision = revision.max(id.last_modified.timestamp());"}],"del_contents":[{"Del":" revision = revision.max(id.last_modified);\n"}]}},{"Replacement":{"inode":{"change":5,"pos":25380},"path":"pijul/src/remote/ssh.rs","line":1044,"ins":{"up_context":[{"change":5,"pos":5962}],"down_context":[{"change":5,"pos":52456}],"flag":"BLOCK","start":175,"end":216,"inode":{"change":5,"pos":25380}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":5962},"to":{"change":5,"start":5962,"end":5983},"introduced_by":5}],"inode":{"change":5,"pos":25380}},"ins_contents":[{"Add":" Ok(revision.try_into().unwrap())"}],"del_contents":[{"Del":" Ok(revision)\n"}]}},{"Replacement":{"inode":{"change":22,"pos":10},"path":"pijul/src/remote/http.rs","line":468,"ins":{"up_context":[{"change":5,"pos":12184}],"down_context":[{"change":5,"pos":12222}],"flag":"BLOCK","start":217,"end":265,"inode":{"change":22,"pos":10}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":12184},"to":{"change":5,"start":12184,"end":12222},"introduced_by":5}],"inode":{"change":22,"pos":10}},"ins_contents":[{"Add":" id: Vec,"}],"del_contents":[{"Del":" id: Vec,\n"}]}},{"Replacement":{"inode":{"change":22,"pos":10},"path":"pijul/src/remote/http.rs","line":478,"ins":{"up_context":[{"change":5,"pos":12543}],"down_context":[{"change":5,"pos":12605}],"flag":"BLOCK","start":266,"end":342,"inode":{"change":22,"pos":10}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":12543},"to":{"change":5,"start":12543,"end":12605},"introduced_by":5}],"inode":{"change":22,"pos":10}},"ins_contents":[{"Add":" serde_json::to_writer_pretty(&mut id_file, &id.as_portable())?;"}],"del_contents":[{"Del":" serde_json::to_writer_pretty(&mut id_file, &id)?;\n"}]}},{"Replacement":{"inode":{"change":3,"pos":56},"path":"pijul/src/identity/repair.rs","line":2,"ins":{"up_context":[{"change":3,"pos":97}],"down_context":[{"change":3,"pos":171}],"flag":"BLOCK","start":343,"end":364,"inode":{"change":3,"pos":56}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":97},"to":{"change":3,"start":97,"end":171},"introduced_by":3}],"inode":{"change":3,"pos":56}},"ins_contents":[{"Add":"use super::Complete;"}],"del_contents":[{"Del":"use super::{get_valid_password, Complete};\nuse crate::commands::Identity;\n"}]}},{"Edit":{"inode":{"change":3,"pos":56},"path":"pijul/src/identity/repair.rs","line":7,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":235},"to":{"change":3,"start":235,"end":262},"introduced_by":3}],"inode":{"change":3,"pos":56}}},"contents":[{"Del":"use std::convert::TryInto;\n"}]}},{"Edit":{"inode":{"change":3,"pos":56},"path":"pijul/src/identity/repair.rs","line":37,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":1412},"to":{"change":3,"start":1412,"end":3106},"introduced_by":3}],"inode":{"change":3,"pos":56}}},"contents":[{"Del":"#[derive(Debug)]\npub(super) struct PotentialPublicKey {\n pub key: PublicKey,\n pub generated_by: GeneratedBy,\n}\n\n#[derive(Debug)]\npub(super) enum GeneratedBy {\n SecretKey,\n PublicKey,\n Identity,\n}\n\nimpl PotentialPublicKey {\n /// Loads all given public keys into an array.\n ///\n /// # Arguments\n /// * `public_key` - The public key to validate\n /// * `identity` - The identity to validate\n /// * `secret_key` - The secret key to validate\n /// * `password` - The password used to decrypt the secret key\n /// * `name` - The name of the identity. This is encoded on-disk as identities/``\n pub(super) fn load_public_keys(\n public_key: Option,\n identity: Option,\n secret_key: &SecretKey,\n password: Option,\n name: &str,\n ) -> Result, anyhow::Error> {\n // Construct a vec of all potential (not yet validated) public keys, and make sure they all match\n let mut public_keys: Vec = vec![];\n\n let user_password = get_valid_password(secret_key, password, name)?;\n\n public_keys.push(Self {\n key: secret_key.load(user_password.as_deref())?.public_key(),\n generated_by: GeneratedBy::SecretKey,\n });\n\n if let Some(key) = public_key {\n public_keys.push(Self {\n key,\n generated_by: GeneratedBy::PublicKey,\n });\n }\n\n if let Some(user_identity) = identity {\n public_keys.push(Self {\n key: user_identity.public_key,\n generated_by: GeneratedBy::Identity,\n });\n }\n\n Ok(public_keys)\n }\n}\n\n"}]}},{"Replacement":{"inode":{"change":3,"pos":56},"path":"pijul/src/identity/repair.rs","line":57,"ins":{"up_context":[{"change":3,"pos":3880}],"down_context":[{"change":3,"pos":3945}],"flag":"BLOCK","start":365,"end":426,"inode":{"change":3,"pos":56}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":3880},"to":{"change":3,"start":3880,"end":3945},"introduced_by":3}],"inode":{"change":3,"pos":56}},"ins_contents":[{"Add":" let extraction_result = Complete::from_old_format();"}],"del_contents":[{"Del":" let extraction_result = Complete::from_old_format(None);\n"}]}},{"Replacement":{"inode":{"change":3,"pos":56},"path":"pijul/src/identity/repair.rs","line":76,"ins":{"up_context":[{"change":3,"pos":4969}],"down_context":[{"change":3,"pos":5070}],"flag":"BLOCK","start":427,"end":519,"inode":{"change":3,"pos":56}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":4969},"to":{"change":3,"start":4969,"end":5070},"introduced_by":3}],"inode":{"change":3,"pos":56}},"ins_contents":[{"Add":" let identity_path = format!(\"identities/{}\", &old_identity.public_key.key);"}],"del_contents":[{"Del":" let identity_path = format!(\"identities/{}\", &old_identity.identity.public_key.key);\n"}]}},{"Replacement":{"inode":{"change":3,"pos":56},"path":"pijul/src/identity/repair.rs","line":124,"ins":{"up_context":[{"change":3,"pos":6793}],"down_context":[{"change":3,"pos":7160}],"flag":"BLOCK","start":520,"end":629,"inode":{"change":3,"pos":56}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":6793},"to":{"change":3,"start":6793,"end":7160},"introduced_by":3}],"inode":{"change":3,"pos":56}},"ins_contents":[{"Add":" let public_key = &self.public_key;"},{"Add":" let decryped_public_key = self.decrypt()?.0.public_key();"}],"del_contents":[{"Del":" let public_keys = PotentialPublicKey::load_public_keys(\n None,\n Some(self.identity.clone()),\n &self.secret_key,\n self.password.clone(),\n &self.name,\n )?;\n if public_keys.len() >= 2 {\n let mut keys_iter = public_keys.iter();\n let first_key = keys_iter.next().unwrap();\n"}]}},{"Replacement":{"inode":{"change":3,"pos":56},"path":"pijul/src/identity/repair.rs","line":127,"ins":{"up_context":[{"change":3,"pos":7161}],"down_context":[{"change":3,"pos":8040}],"flag":"BLOCK","start":630,"end":1021,"inode":{"change":3,"pos":56}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":7161},"to":{"change":3,"start":7161,"end":8040},"introduced_by":3}],"inode":{"change":3,"pos":56}},"ins_contents":[{"Add":" if public_key.key != decryped_public_key.key {"},{"Add":" let mut stderr = std::io::stderr();"},{"Add":" writeln!(stderr, \"{MISMATCHED_KEYS_MESSAGE}\")?;"},{"Add":" writeln!(stderr, \"Got the following public key signatures:\")?;"},{"Add":" writeln!(stderr, \"Plaintext public key: {public_key:#?}\")?;"},{"Add":" writeln!(stderr, \"Decrypted public key: {decryped_public_key:#?}\")?;"}],"del_contents":[{"Del":" let mut different_keys = vec![first_key];\n for key in keys_iter {\n if !different_keys.iter().any(|k| k.key == key.key) {\n different_keys.push(key);\n }\n }\n\n if different_keys.len() != 1 {\n let mut stderr = std::io::stderr();\n writeln!(stderr, \"{MISMATCHED_KEYS_MESSAGE}\")?;\n writeln!(stderr, \"Got the following public key signatures:\")?;\n\n for key in different_keys {\n let source = match key.generated_by {\n GeneratedBy::Identity => \"Identity\",\n GeneratedBy::PublicKey => \"Public key\",\n GeneratedBy::SecretKey => \"Secret key\",\n };\n\n writeln!(stderr, \"{} ({source})\", key.key.key)?;\n }\n"}]}},{"Replacement":{"inode":{"change":3,"pos":56},"path":"pijul/src/identity/repair.rs","line":134,"ins":{"up_context":[{"change":3,"pos":8041}],"down_context":[{"change":3,"pos":8089}],"flag":"BLOCK","start":1022,"end":1052,"inode":{"change":3,"pos":56}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":8041},"to":{"change":3,"start":8041,"end":8089},"introduced_by":3}],"inode":{"change":3,"pos":56}},"ins_contents":[{"Add":" return Ok(false);"}],"del_contents":[{"Del":" return Ok(false);\n }\n"}]}},{"Replacement":{"inode":{"change":3,"pos":56},"path":"pijul/src/identity/repair.rs","line":187,"ins":{"up_context":[{"change":3,"pos":9995}],"down_context":[{"change":3,"pos":10086}],"flag":"BLOCK","start":1053,"end":1116,"inode":{"change":3,"pos":56}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":9995},"to":{"change":3,"start":9995,"end":10086},"introduced_by":3}],"inode":{"change":3,"pos":56}},"ins_contents":[{"Add":" fn from_old_format() -> Result {"}],"del_contents":[{"Del":" fn from_old_format(mut password: Option) -> Result {\n"}]}},{"Replacement":{"inode":{"change":3,"pos":56},"path":"pijul/src/identity/repair.rs","line":232,"ins":{"up_context":[{"change":3,"pos":12053}],"down_context":[{"change":3,"pos":12124}],"flag":"BLOCK","start":1117,"end":1188,"inode":{"change":3,"pos":56}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":12053},"to":{"change":3,"start":12053,"end":12124},"introduced_by":3}],"inode":{"change":3,"pos":56}},"ins_contents":[{"Add":" let identity: Option = if identities_path.exists() {"}],"del_contents":[{"Del":" let identity: Option = if identities_path.exists() {\n"}]}},{"Replacement":{"inode":{"change":3,"pos":56},"path":"pijul/src/identity/repair.rs","line":236,"ins":{"up_context":[{"change":3,"pos":12303}],"down_context":[{"change":3,"pos":12363}],"flag":"BLOCK","start":1189,"end":1249,"inode":{"change":3,"pos":56}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":12303},"to":{"change":3,"start":12303,"end":12363},"introduced_by":3}],"inode":{"change":3,"pos":56}},"ins_contents":[{"Add":" let mut identities: Vec = vec![];"}],"del_contents":[{"Del":" let mut identities: Vec = vec![];\n"}]}},{"Replacement":{"inode":{"change":3,"pos":56},"path":"pijul/src/identity/repair.rs","line":251,"ins":{"up_context":[{"change":3,"pos":13095}],"down_context":[{"change":3,"pos":13169}],"flag":"BLOCK","start":1250,"end":1324,"inode":{"change":3,"pos":56}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":13095},"to":{"change":3,"start":13095,"end":13169},"introduced_by":3}],"inode":{"change":3,"pos":56}},"ins_contents":[{"Add":" let deserialization_result: Result ="}],"del_contents":[{"Del":" let deserialization_result: Result =\n"}]}},{"Replacement":{"inode":{"change":3,"pos":56},"path":"pijul/src/identity/repair.rs","line":275,"ins":{"up_context":[{"change":3,"pos":13841}],"down_context":[{"change":3,"pos":13904}],"flag":"BLOCK","start":1325,"end":1387,"inode":{"change":3,"pos":56}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":13841},"to":{"change":3,"start":13841,"end":13904},"introduced_by":3}],"inode":{"change":3,"pos":56}},"ins_contents":[{"Add":" let config: super::Config = if config_path.exists() {"}],"del_contents":[{"Del":" let author: config::Author = if config_path.exists() {\n"}]}},{"Replacement":{"inode":{"change":3,"pos":56},"path":"pijul/src/identity/repair.rs","line":285,"ins":{"up_context":[{"change":3,"pos":14336}],"down_context":[{"change":3,"pos":14367}],"flag":"BLOCK","start":1388,"end":1538,"inode":{"change":3,"pos":56}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":14336},"to":{"change":3,"start":14336,"end":14367},"introduced_by":3}],"inode":{"change":3,"pos":56}},"ins_contents":[{"Add":""},{"Add":" super::Config {"},{"Add":" key_path: config_data.author.key_path.clone(),"},{"Add":" author: config_data.author,"},{"Add":" }"}],"del_contents":[{"Del":" config_data.author\n"}]}},{"Replacement":{"inode":{"change":3,"pos":56},"path":"pijul/src/identity/repair.rs","line":291,"ins":{"up_context":[{"change":3,"pos":14384}],"down_context":[{"change":3,"pos":14417}],"flag":"BLOCK","start":1539,"end":1635,"inode":{"change":3,"pos":56}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":14384},"to":{"change":3,"start":14384,"end":14417},"introduced_by":3}],"inode":{"change":3,"pos":56}},"ins_contents":[{"Add":" let mut author = config::Author::default();"},{"Add":" author.user_name = identity"}],"del_contents":[{"Del":" let login = identity\n"}]}},{"Replacement":{"inode":{"change":3,"pos":56},"path":"pijul/src/identity/repair.rs","line":294,"ins":{"up_context":[{"change":3,"pos":14443}],"down_context":[{"change":3,"pos":14646}],"flag":"BLOCK","start":1636,"end":1718,"inode":{"change":3,"pos":56}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":14443},"to":{"change":3,"start":14443,"end":14646},"introduced_by":3}],"inode":{"change":3,"pos":56}},"ins_contents":[{"Add":" .map_or_else(String::new, |x| x.config.author.user_name.clone());"}],"del_contents":[{"Del":" .map_or_else(String::new, |x| x.login.clone());\n config::Author {\n login,\n email: None,\n full_name: None,\n }\n };\n"}]}},{"Replacement":{"inode":{"change":3,"pos":56},"path":"pijul/src/identity/repair.rs","line":296,"ins":{"up_context":[{"change":3,"pos":14647}],"down_context":[{"change":3,"pos":14762}],"flag":"BLOCK","start":1719,"end":1817,"inode":{"change":3,"pos":56}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":14647},"to":{"change":3,"start":14647,"end":14762},"introduced_by":3}],"inode":{"change":3,"pos":56}},"ins_contents":[{"Add":" super::Config {"},{"Add":" key_path: None,"},{"Add":" author,"},{"Add":" }"}],"del_contents":[{"Del":" let origin = if let Some(id) = identity {\n id.origin\n } else {\n String::new()\n"}]}},{"Edit":{"inode":{"change":3,"pos":56},"path":"pijul/src/identity/repair.rs","line":302,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":14774},"to":{"change":3,"start":14774,"end":14909},"introduced_by":3}],"inode":{"change":3,"pos":56}}},"contents":[{"Del":" // If the secret is encrypted, prompt for password\n password = get_valid_password(&secret_key, password.clone(), \"\")?;\n\n"}]}},{"Replacement":{"inode":{"change":3,"pos":56},"path":"pijul/src/identity/repair.rs","line":304,"ins":{"up_context":[{"change":3,"pos":14980}],"down_context":[{"change":3,"pos":15434}],"flag":"BLOCK","start":1818,"end":1918,"inode":{"change":3,"pos":56}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":14980},"to":{"change":3,"start":14980,"end":15434},"introduced_by":3}],"inode":{"change":3,"pos":56}},"ins_contents":[{"Add":" config,"},{"Add":" public_key,"},{"Add":" Some(super::Credentials::from(secret_key)),"}],"del_contents":[{"Del":" password,\n secret_key,\n Identity {\n login: author.login,\n name: author.full_name,\n email: author.email,\n origin,\n last_modified: chrono::DateTime::timestamp(&chrono::offset::Utc::now())\n .try_into()\n .context(\"Failed to create UNIX timestamp\")?,\n public_key,\n },\n true,\n"}]}},{"Replacement":{"inode":{"change":3,"pos":15627},"path":"pijul/src/identity/mod.rs","line":42,"ins":{"up_context":[{"change":3,"pos":16999}],"down_context":[{"change":3,"pos":17069}],"flag":"BLOCK","start":1919,"end":1969,"inode":{"change":3,"pos":15627}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":16999},"to":{"change":3,"start":16999,"end":17069},"introduced_by":3}],"inode":{"change":3,"pos":15627}},"ins_contents":[{"Add":"pub use load::{choose_identity_name, public_key};"}],"del_contents":[{"Del":"pub use load::{choose_identity_name, decrypt_secret_key, public_key};\n"}]}},{"Replacement":{"inode":{"change":3,"pos":15627},"path":"pijul/src/identity/mod.rs","line":46,"ins":{"up_context":[{"change":3,"pos":17121}],"down_context":[{"change":3,"pos":17142}],"flag":"BLOCK","start":1970,"end":1997,"inode":{"change":3,"pos":15627}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":17121},"to":{"change":3,"start":17121,"end":17142},"introduced_by":3}],"inode":{"change":3,"pos":15627}},"ins_contents":[{"Add":"use crate::config::Author;"}],"del_contents":[{"Del":"use crate::Identity;\n"}]}},{"Replacement":{"inode":{"change":3,"pos":15627},"path":"pijul/src/identity/mod.rs","line":48,"ins":{"up_context":[{"change":3,"pos":17143}],"down_context":[{"change":3,"pos":17181}],"flag":"BLOCK","start":1998,"end":2047,"inode":{"change":3,"pos":15627}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":17143},"to":{"change":3,"start":17143,"end":17181},"introduced_by":3}],"inode":{"change":3,"pos":15627}},"ins_contents":[{"Add":"use libpijul::key::{PublicKey, SKey, SecretKey};"}],"del_contents":[{"Del":"use libpijul::key::{SKey, SecretKey};\n"}]}},{"Edit":{"inode":{"change":3,"pos":15627},"path":"pijul/src/identity/mod.rs","line":50,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":17182},"to":{"change":3,"start":17182,"end":17209},"introduced_by":3}],"inode":{"change":3,"pos":15627}}},"contents":[{"Del":"use std::convert::TryInto;\n"}]}},{"Edit":{"inode":{"change":3,"pos":15627},"path":"pijul/src/identity/mod.rs","line":53,"atom":{"NewVertex":{"up_context":[{"change":3,"pos":17273}],"down_context":[{"change":3,"pos":17273}],"flag":"BLOCK","start":2048,"end":2072,"inode":{"change":3,"pos":15627}}},"contents":[{"Add":"use std::path::PathBuf;"}]}},{"Edit":{"inode":{"change":3,"pos":15627},"path":"pijul/src/identity/mod.rs","line":56,"atom":{"NewVertex":{"up_context":[{"change":3,"pos":17299}],"down_context":[{"change":3,"pos":17299}],"flag":"BLOCK","start":2073,"end":2141,"inode":{"change":3,"pos":15627}}},"contents":[{"Add":"use once_cell::sync::OnceCell;"},{"Add":"use serde::{Deserialize, Serialize};"}]}},{"Edit":{"inode":{"change":3,"pos":15627},"path":"pijul/src/identity/mod.rs","line":59,"atom":{"NewVertex":{"up_context":[{"change":3,"pos":17300}],"down_context":[{"change":3,"pos":17300}],"flag":"BLOCK","start":2142,"end":2662,"inode":{"change":3,"pos":15627}}},"contents":[{"Add":"#[derive(Clone, Debug, Serialize, Deserialize)]"},{"Add":"pub struct Config {"},{"Add":" #[serde(flatten)]"},{"Add":" pub author: Author,"},{"Add":" #[serde(default, skip_serializing_if = \"Option::is_none\")]"},{"Add":" pub key_path: Option,"},{"Add":"}"},{"Add":""},{"Add":"impl Default for Config {"},{"Add":" fn default() -> Self {"},{"Add":" Self {"},{"Add":" key_path: None,"},{"Add":" author: Author::default(),"},{"Add":" }"},{"Add":" }"},{"Add":"}"},{"Add":""},{"Add":"impl From for Config {"},{"Add":" fn from(author: Author) -> Self {"},{"Add":" Self {"},{"Add":" key_path: None,"},{"Add":" author,"},{"Add":" }"},{"Add":" }"},{"Add":"}"},{"Add":""}]}},{"Edit":{"inode":{"change":3,"pos":15627},"path":"pijul/src/identity/mod.rs","line":86,"atom":{"NewVertex":{"up_context":[{"change":3,"pos":17324}],"down_context":[{"change":3,"pos":17324}],"flag":"BLOCK","start":2663,"end":5094,"inode":{"change":3,"pos":15627}}},"contents":[{"Add":"pub struct Credentials {"},{"Add":" secret_key: SecretKey,"},{"Add":" password: OnceCell,"},{"Add":"}"},{"Add":""},{"Add":"impl Credentials {"},{"Add":" pub fn new(secret_key: SecretKey, password: Option) -> Self {"},{"Add":" Self {"},{"Add":" secret_key,"},{"Add":" password: if let Some(pw) = password {"},{"Add":" OnceCell::from(pw)"},{"Add":" } else {"},{"Add":" OnceCell::new()"},{"Add":" },"},{"Add":" }"},{"Add":" }"},{"Add":"}"},{"Add":""},{"Add":"impl From for Credentials {"},{"Add":" fn from(secret_key: SecretKey) -> Self {"},{"Add":" Self {"},{"Add":" secret_key,"},{"Add":" password: OnceCell::new(),"},{"Add":" }"},{"Add":" }"},{"Add":"}"},{"Add":""},{"Add":"impl Credentials {"},{"Add":" pub fn decrypt(&mut self, name: &str) -> Result<(SKey, Option), anyhow::Error> {"},{"Add":" if self.secret_key.encryption.is_none() {"},{"Add":" // Don't mind what the given password is, the secret key has no encryption"},{"Add":" // Make sure to revoke the password"},{"Add":" self.password.take();"},{"Add":" Ok((self.secret_key.load(None)?, None))"},{"Add":" } else if let Ok(key) = self"},{"Add":" .secret_key"},{"Add":" .load(self.password.get().map(String::as_str))"},{"Add":" {"},{"Add":" // The password matches secret key, no extra work needed"},{"Add":" Ok((key, self.password.get().map(|x| x.to_owned())))"},{"Add":" } else {"},{"Add":" // Password does not match secret key"},{"Add":" let mut stderr = std::io::stderr();"},{"Add":" let mut password_attempt = String::new();"},{"Add":""},{"Add":" // Try a password stored in the keychain"},{"Add":" if let Ok(password) = keyring::Entry::new(\"pijul\", name).get_password() {"},{"Add":" password_attempt = password;"},{"Add":" }"},{"Add":""},{"Add":" // Re-prompt as long as the password doesn't work"},{"Add":" while self.secret_key.load(Some(&password_attempt)).is_err() {"},{"Add":" writeln!(stderr, \"Password does not match secret key\")?;"},{"Add":""},{"Add":" password_attempt = Password::with_theme(config::load_theme()?.as_ref())"},{"Add":" .with_prompt(\"Password for secret key\")"},{"Add":" .allow_empty_password(true)"},{"Add":" .interact()?;"},{"Add":" }"},{"Add":""},{"Add":" // Update the password"},{"Add":" keyring::Entry::new(\"pijul\", name).set_password(&password_attempt)?;"},{"Add":" self.password.set(password_attempt.clone()).unwrap();"},{"Add":""},{"Add":" Ok(("},{"Add":" self.secret_key.load(Some(&password_attempt))?,"},{"Add":" Some(password_attempt),"},{"Add":" ))"},{"Add":" }"},{"Add":" }"},{"Add":"}"},{"Add":""},{"Add":"#[derive(Clone, Debug, Serialize, Deserialize)]"}]}},{"Edit":{"inode":{"change":3,"pos":15627},"path":"pijul/src/identity/mod.rs","line":161,"atom":{"NewVertex":{"up_context":[{"change":3,"pos":17431}],"down_context":[{"change":3,"pos":17431}],"flag":"BLOCK","start":5095,"end":5114,"inode":{"change":3,"pos":15627}}},"contents":[{"Add":" #[serde(skip)]"}]}},{"Replacement":{"inode":{"change":3,"pos":15627},"path":"pijul/src/identity/mod.rs","line":163,"ins":{"up_context":[{"change":3,"pos":17453}],"down_context":[{"change":3,"pos":17573}],"flag":"BLOCK","start":5115,"end":5303,"inode":{"change":3,"pos":15627}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":17453},"to":{"change":3,"start":17453,"end":17573},"introduced_by":3}],"inode":{"change":3,"pos":15627}},"ins_contents":[{"Add":" #[serde(flatten)]"},{"Add":" pub config: Config,"},{"Add":" pub last_modified: chrono::DateTime,"},{"Add":" pub public_key: PublicKey,"},{"Add":" #[serde(skip)]"},{"Add":" credentials: Option,"}],"del_contents":[{"Del":" pub password: Option,\n pub secret_key: SecretKey,\n pub identity: Identity,\n pub link_remote: bool,\n"}]}},{"Replacement":{"inode":{"change":3,"pos":15627},"path":"pijul/src/identity/mod.rs","line":176,"ins":{"up_context":[{"change":3,"pos":17743}],"down_context":[{"change":3,"pos":18053}],"flag":"BLOCK","start":5304,"end":5523,"inode":{"change":3,"pos":15627}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":17743},"to":{"change":3,"start":17743,"end":18053},"introduced_by":3}],"inode":{"change":3,"pos":15627}},"ins_contents":[{"Add":" /// * `config` - User configuration including author details & SSH key"},{"Add":" /// * `public_key` - The user's public key"},{"Add":" /// * `credentials` - The user's secret data including secret key & password"},{"Add":" pub fn new("}],"del_contents":[{"Del":" /// * `password` - Password used to decrypt the secret key\n /// * `secret_key` - The corresponding secret key\n /// * `identity` - Information about the author including name, email, login\n /// * `link_remote` - If this identity should be linked with a remote (e.g. the Nest)\n pub const fn new(\n"}]}},{"Replacement":{"inode":{"change":3,"pos":15627},"path":"pijul/src/identity/mod.rs","line":181,"ins":{"up_context":[{"change":3,"pos":18075}],"down_context":[{"change":3,"pos":18195}],"flag":"BLOCK","start":5524,"end":5621,"inode":{"change":3,"pos":15627}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":18075},"to":{"change":3,"start":18075,"end":18195},"introduced_by":3}],"inode":{"change":3,"pos":15627}},"ins_contents":[{"Add":" config: Config,"},{"Add":" public_key: PublicKey,"},{"Add":" credentials: Option,"}],"del_contents":[{"Del":" password: Option,\n secret_key: SecretKey,\n identity: Identity,\n link_remote: bool,\n"}]}},{"Edit":{"inode":{"change":3,"pos":15627},"path":"pijul/src/identity/mod.rs","line":185,"atom":{"NewVertex":{"up_context":[{"change":3,"pos":18211}],"down_context":[{"change":3,"pos":18211}],"flag":"BLOCK","start":5622,"end":5716,"inode":{"change":3,"pos":15627}}},"contents":[{"Add":" if name.is_empty() {"},{"Add":" panic!(\"Identity name cannot be empty!\");"},{"Add":" }"},{"Add":""}]}},{"Replacement":{"inode":{"change":3,"pos":15627},"path":"pijul/src/identity/mod.rs","line":191,"ins":{"up_context":[{"change":3,"pos":18244}],"down_context":[{"change":3,"pos":18337}],"flag":"BLOCK","start":5717,"end":5841,"inode":{"change":3,"pos":15627}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":18244},"to":{"change":3,"start":18244,"end":18337},"introduced_by":3}],"inode":{"change":3,"pos":15627}},"ins_contents":[{"Add":" config,"},{"Add":" public_key,"},{"Add":" credentials,"},{"Add":" last_modified: chrono::offset::Utc::now(),"}],"del_contents":[{"Del":" password,\n secret_key,\n identity,\n link_remote,\n"}]}},{"Edit":{"inode":{"change":3,"pos":15627},"path":"pijul/src/identity/mod.rs","line":197,"atom":{"NewVertex":{"up_context":[{"change":3,"pos":18353}],"down_context":[{"change":3,"pos":18353}],"flag":"BLOCK","start":5842,"end":5843,"inode":{"change":3,"pos":15627}}},"contents":[{"Add":""}]}},{"Replacement":{"inode":{"change":3,"pos":15627},"path":"pijul/src/identity/mod.rs","line":201,"ins":{"up_context":[{"change":3,"pos":18571}],"down_context":[{"change":3,"pos":18634}],"flag":"BLOCK","start":5844,"end":5899,"inode":{"change":3,"pos":15627}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":18571},"to":{"change":3,"start":18571,"end":18634},"introduced_by":3}],"inode":{"change":3,"pos":15627}},"ins_contents":[{"Add":" let author: Author = if config_path.exists() {"}],"del_contents":[{"Del":" let author: config::Author = if config_path.exists() {\n"}]}},{"Replacement":{"inode":{"change":3,"pos":15627},"path":"pijul/src/identity/mod.rs","line":209,"ins":{"up_context":[{"change":3,"pos":18937}],"down_context":[{"change":3,"pos":19100}],"flag":"BLOCK","start":5900,"end":5930,"inode":{"change":3,"pos":15627}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":18937},"to":{"change":3,"start":18937,"end":19100},"introduced_by":3}],"inode":{"change":3,"pos":15627}},"ins_contents":[{"Add":" Author::default()"}],"del_contents":[{"Del":" config::Author {\n login: String::new(),\n email: None,\n full_name: Some(whoami::realname()),\n }\n"}]}},{"Replacement":{"inode":{"change":3,"pos":15627},"path":"pijul/src/identity/mod.rs","line":217,"ins":{"up_context":[{"change":3,"pos":19269}],"down_context":[{"change":3,"pos":19697}],"flag":"BLOCK","start":5931,"end":6049,"inode":{"change":3,"pos":15627}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":19269},"to":{"change":3,"start":19269,"end":19697},"introduced_by":3}],"inode":{"change":3,"pos":15627}},"ins_contents":[{"Add":" Config::from(author),"},{"Add":" public_key,"},{"Add":" Some(Credentials::from(secret_key.save(None))),"}],"del_contents":[{"Del":" None,\n secret_key.save(None),\n Identity {\n login: author.login,\n name: author.full_name,\n origin: String::from(\"ssh.pijul.com\"),\n email: author.email,\n last_modified: chrono::DateTime::timestamp(&chrono::offset::Utc::now())\n .try_into()?,\n public_key,\n },\n true,\n"}]}},{"Edit":{"inode":{"change":3,"pos":15627},"path":"pijul/src/identity/mod.rs","line":221,"atom":{"NewVertex":{"up_context":[{"change":3,"pos":19708}],"down_context":[{"change":3,"pos":19708}],"flag":"BLOCK","start":6050,"end":8083,"inode":{"change":3,"pos":15627}}},"contents":[{"Add":" }"},{"Add":""},{"Add":" /// Returns the secret key, if one exists"},{"Add":" pub fn secret_key(&self) -> Option {"},{"Add":" if let Some(credentials) = &self.credentials {"},{"Add":" Some(credentials.secret_key.clone())"},{"Add":" } else {"},{"Add":" None"},{"Add":" }"},{"Add":" }"},{"Add":""},{"Add":" /// Strips the identity of any device-specific information, such as key path & identity name"},{"Add":" /// Returns the stripped identity"},{"Add":" pub fn as_portable(&self) -> Self {"},{"Add":" Self {"},{"Add":" name: String::new(),"},{"Add":" last_modified: chrono::offset::Utc::now(),"},{"Add":" config: Config {"},{"Add":" key_path: None,"},{"Add":" author: self.config.author.clone(),"},{"Add":" },"},{"Add":" public_key: self.public_key.clone(),"},{"Add":" credentials: None,"},{"Add":" }"},{"Add":" }"},{"Add":""},{"Add":" /// Decrypts the user's secret key, prompting the user for password if necessary"},{"Add":" /// Returns a tuple containing the decrypted key & the valid password"},{"Add":" pub fn decrypt(&self) -> Result<(SKey, Option), anyhow::Error> {"},{"Add":" self.credentials.clone().unwrap().decrypt(&self.name)"},{"Add":" }"},{"Add":""},{"Add":" fn change_password(&mut self) -> Result<(), anyhow::Error> {"},{"Add":" let (decryped_key, _) = self.decrypt()?;"},{"Add":""},{"Add":" let user_password = Password::with_theme(config::load_theme()?.as_ref())"},{"Add":" .with_prompt(\"New password\")"},{"Add":" .allow_empty_password(true)"},{"Add":" .with_confirmation(\"Confirm password\", \"Password mismatch\")"},{"Add":" .interact()?;"},{"Add":""},{"Add":" let password = if user_password.is_empty() {"},{"Add":" OnceCell::new()"},{"Add":" } else {"},{"Add":" // User has entered a password, add it to the keyring"},{"Add":" keyring::Entry::new(\"pijul\", &self.name).set_password(&user_password)?;"},{"Add":""},{"Add":" OnceCell::from(user_password)"},{"Add":" };"},{"Add":""},{"Add":" // Update the key pair to match this new password"},{"Add":" self.public_key = decryped_key.public_key();"},{"Add":" self.credentials = Some(Credentials {"},{"Add":" secret_key: decryped_key.save(password.get().map(String::as_str)),"},{"Add":" password,"},{"Add":" });"},{"Add":""},{"Add":" Ok(())"}]}},{"Replacement":{"inode":{"change":3,"pos":15627},"path":"pijul/src/identity/mod.rs","line":286,"ins":{"up_context":[{"change":3,"pos":19976}],"down_context":[{"change":3,"pos":20095}],"flag":"BLOCK","start":8084,"end":8217,"inode":{"change":3,"pos":15627}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":19976},"to":{"change":3,"start":19976,"end":20095},"introduced_by":3}],"inode":{"change":3,"pos":15627}},"ins_contents":[{"Add":" let has_username = !self.config.author.user_name.is_empty();"},{"Add":" let has_remote = !self.config.author.origin.is_empty();"}],"del_contents":[{"Del":" let has_username = !self.identity.login.is_empty();\n let has_remote = !self.identity.origin.is_empty();\n"}]}},{"Replacement":{"inode":{"change":3,"pos":15627},"path":"pijul/src/identity/mod.rs","line":292,"ins":{"up_context":[{"change":3,"pos":20227}],"down_context":[{"change":3,"pos":20285}],"flag":"BLOCK","start":8218,"end":8290,"inode":{"change":3,"pos":15627}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":20227},"to":{"change":3,"start":20227,"end":20285},"introduced_by":3}],"inode":{"change":3,"pos":15627}},"ins_contents":[{"Add":" self.config.author.user_name, self.config.author.origin"}],"del_contents":[{"Del":" self.identity.login, self.identity.origin\n"}]}},{"Replacement":{"inode":{"change":3,"pos":15627},"path":"pijul/src/identity/mod.rs","line":295,"ins":{"up_context":[{"change":3,"pos":20333}],"down_context":[{"change":3,"pos":20390}],"flag":"BLOCK","start":8291,"end":8357,"inode":{"change":3,"pos":15627}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":20333},"to":{"change":3,"start":20333,"end":20390},"introduced_by":3}],"inode":{"change":3,"pos":15627}},"ins_contents":[{"Add":" Some(format!(\" [@{}]\", self.config.author.user_name))"}],"del_contents":[{"Del":" Some(format!(\" [@{}]\", self.identity.login))\n"}]}},{"Replacement":{"inode":{"change":3,"pos":15627},"path":"pijul/src/identity/mod.rs","line":297,"ins":{"up_context":[{"change":3,"pos":20421}],"down_context":[{"change":3,"pos":20479}],"flag":"BLOCK","start":8358,"end":8421,"inode":{"change":3,"pos":15627}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":20421},"to":{"change":3,"start":20421,"end":20479},"introduced_by":3}],"inode":{"change":3,"pos":15627}},"ins_contents":[{"Add":" Some(format!(\" [:{}]\", self.config.author.origin))"}],"del_contents":[{"Del":" Some(format!(\" [:{}]\", self.identity.origin))\n"}]}},{"Edit":{"inode":{"change":3,"pos":15627},"path":"pijul/src/identity/mod.rs","line":303,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":20598},"to":{"change":3,"start":20598,"end":21293},"introduced_by":3}],"inode":{"change":3,"pos":15627}}},"contents":[{"Del":" }\n}\n\n/// Loads a password, either from the keychain or from user input\n///\n/// # Arguments\n/// * `name` - The name of the identity. This is encoded on-disk as identities/``\nfn load_password(name: &str) -> Result, anyhow::Error> {\n if let Ok(password) = keyring::Entry::new(\"pijul\", name).get_password() {\n if password.is_empty() {\n return Ok(None);\n }\n\n return Ok(Some(password));\n }\n\n let pw = Password::with_theme(config::load_theme()?.as_ref())\n .with_prompt(\"Password for secret key\")\n .allow_empty_password(true)\n .interact()?;\n\n if pw.is_empty() {\n Ok(None)\n } else {\n Ok(Some(pw))\n"}]}},{"Edit":{"inode":{"change":3,"pos":15627},"path":"pijul/src/identity/mod.rs","line":305,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":21301},"to":{"change":3,"start":21301,"end":22354},"introduced_by":3}],"inode":{"change":3,"pos":15627}}},"contents":[{"Del":"\n/// Validates a given password, prompting for user input if needed.\n///\n/// # Arguments\n/// * `secret_key` - The secret key to decrypt\n/// * `password` - The password to validate\n/// * `name` - The name of the identity. This is encoded on-disk as identities/``\npub fn get_valid_password(\n secret_key: &SecretKey,\n password: Option,\n name: &str,\n) -> Result, anyhow::Error> {\n if secret_key.encryption.is_some() || secret_key.load(None).is_err() {\n if secret_key.load(password.as_deref()).is_ok() {\n Ok(password)\n } else {\n let mut user_password = load_password(name)?;\n\n // If the user enters the wrong password, reprompt\n let mut stderr = std::io::stderr();\n while secret_key.load(user_password.as_deref()).is_err() {\n writeln!(stderr, \"Incorrect password! Please try again.\")?;\n user_password = load_password(name)?;\n }\n\n Ok(user_password)\n }\n } else {\n Ok(None)\n }\n}\n"}]}},{"Edit":{"inode":{"change":3,"pos":22387},"path":"pijul/src/identity/load.rs","line":2,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":22415},"to":{"change":3,"start":22415,"end":22446},"introduced_by":3}],"inode":{"change":3,"pos":22387}}},"contents":[{"Del":"use super::get_valid_password;\n"}]}},{"Edit":{"inode":{"change":3,"pos":22387},"path":"pijul/src/identity/load.rs","line":4,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":22486},"to":{"change":3,"start":22486,"end":22507},"introduced_by":3}],"inode":{"change":3,"pos":22387}}},"contents":[{"Del":"use crate::Identity;\n"}]}},{"Replacement":{"inode":{"change":3,"pos":22387},"path":"pijul/src/identity/load.rs","line":49,"ins":{"up_context":[{"change":3,"pos":23838}],"down_context":[{"change":3,"pos":23891}],"flag":"BLOCK","start":8422,"end":8475,"inode":{"change":3,"pos":22387}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":23838},"to":{"change":3,"start":23838,"end":23891},"introduced_by":3}],"inode":{"change":3,"pos":22387}},"ins_contents":[{"Add":" let identity: Complete = toml::from_str(&text)?;"}],"del_contents":[{"Del":" let identity: Identity = toml::from_str(&text)?;\n"}]}},{"Edit":{"inode":{"change":3,"pos":22387},"path":"pijul/src/identity/load.rs","line":121,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":26039},"to":{"change":3,"start":26039,"end":26734},"introduced_by":3}],"inode":{"change":3,"pos":22387}}},"contents":[{"Del":"/// Decrypts the secret key associated with the given identity name. If the given password is invalid, the user may be prompted.\n///\n/// # Arguments\n/// * `identity_name` - The name of the identity. This is encoded on-disk as identities/``\n/// * `password` - The password used to attempt decryption\npub fn decrypt_secret_key(\n identity_name: &str,\n password: Option,\n) -> Result<(libpijul::key::SecretKey, libpijul::key::SKey), anyhow::Error> {\n let secret_key = secret_key(identity_name)?;\n let password = get_valid_password(&secret_key, password, identity_name)?;\n let decrypted_key = secret_key.load(password.as_deref())?;\n\n Ok((secret_key, decrypted_key))\n}\n\n"}]}},{"Replacement":{"inode":{"change":3,"pos":22387},"path":"pijul/src/identity/load.rs","line":130,"ins":{"up_context":[{"change":3,"pos":27158}],"down_context":[{"change":3,"pos":27215}],"flag":"BLOCK","start":8476,"end":8533,"inode":{"change":3,"pos":22387}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":27158},"to":{"change":3,"start":27158,"end":27215},"introduced_by":3}],"inode":{"change":3,"pos":22387}},"ins_contents":[{"Add":" let identity: Complete = toml::from_str(&text)?;"}],"del_contents":[{"Del":" let identity: Identity = toml::from_str(&text)?;\n"}]}},{"Replacement":{"inode":{"change":3,"pos":22387},"path":"pijul/src/identity/load.rs","line":136,"ins":{"up_context":[{"change":3,"pos":27331}],"down_context":[{"change":3,"pos":27413}],"flag":"BLOCK","start":8534,"end":8652,"inode":{"change":3,"pos":22387}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":27331},"to":{"change":3,"start":27331,"end":27413},"introduced_by":3}],"inode":{"change":3,"pos":22387}},"ins_contents":[{"Add":" identity.config,"},{"Add":" identity.public_key,"},{"Add":" Some(super::Credentials::from(secret_key)),"}],"del_contents":[{"Del":" None,\n secret_key,\n identity,\n true,\n"}]}},{"Replacement":{"inode":{"change":3,"pos":28175},"path":"pijul/src/identity/create.rs","line":2,"ins":{"up_context":[{"change":3,"pos":28199}],"down_context":[{"change":3,"pos":28242}],"flag":"BLOCK","start":8653,"end":8674,"inode":{"change":3,"pos":28175}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":28199},"to":{"change":3,"start":28199,"end":28242},"introduced_by":3}],"inode":{"change":3,"pos":28175}},"ins_contents":[{"Add":"use super::Complete;"}],"del_contents":[{"Del":"use super::{get_valid_password, Complete};\n"}]}},{"Edit":{"inode":{"change":3,"pos":28175},"path":"pijul/src/identity/create.rs","line":6,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":28326},"to":{"change":3,"start":28326,"end":28347},"introduced_by":3}],"inode":{"change":3,"pos":28175}}},"contents":[{"Del":"use crate::Identity;\n"}]}},{"Edit":{"inode":{"change":3,"pos":28175},"path":"pijul/src/identity/create.rs","line":7,"atom":{"NewVertex":{"up_context":[{"change":3,"pos":28348}],"down_context":[{"change":3,"pos":28348}],"flag":"BLOCK","start":8675,"end":8688,"inode":{"change":3,"pos":28175}}},"contents":[{"Add":"use std::fs;"}]}},{"Edit":{"inode":{"change":3,"pos":28175},"path":"pijul/src/identity/create.rs","line":9,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":28368},"to":{"change":3,"start":28368,"end":28401},"introduced_by":3}],"inode":{"change":3,"pos":28175}}},"contents":[{"Del":"use std::{convert::TryInto, fs};\n"}]}},{"Replacement":{"inode":{"change":3,"pos":28175},"path":"pijul/src/identity/create.rs","line":11,"ins":{"up_context":[{"change":3,"pos":28431}],"down_context":[{"change":3,"pos":28474}],"flag":"BLOCK","start":8689,"end":8735,"inode":{"change":3,"pos":28175}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":28431},"to":{"change":3,"start":28431,"end":28474},"introduced_by":3}],"inode":{"change":3,"pos":28175}},"ins_contents":[{"Add":"use dialoguer::{Confirm, FuzzySelect, Input};"}],"del_contents":[{"Del":"use dialoguer::{Confirm, Input, Password};\n"}]}},{"Edit":{"inode":{"change":3,"pos":28175},"path":"pijul/src/identity/create.rs","line":16,"atom":{"NewVertex":{"up_context":[{"change":3,"pos":28571}],"down_context":[{"change":3,"pos":28571}],"flag":"BLOCK","start":8736,"end":8770,"inode":{"change":3,"pos":28175}}},"contents":[{"Add":"use thrussh_keys::key::PublicKey;"}]}},{"Replacement":{"inode":{"change":3,"pos":28175},"path":"pijul/src/identity/create.rs","line":29,"ins":{"up_context":[{"change":3,"pos":28970}],"down_context":[{"change":3,"pos":29026}],"flag":"BLOCK","start":8771,"end":8854,"inode":{"change":3,"pos":28175}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":28970},"to":{"change":3,"start":28970,"end":29026},"introduced_by":3}],"inode":{"change":3,"pos":28175}},"ins_contents":[{"Add":" /// Prompt the user to make changes to an identity, returning the new identity"}],"del_contents":[{"Del":" /// Prompt the user to make changes to an identity.\n"}]}},{"Replacement":{"inode":{"change":3,"pos":28175},"path":"pijul/src/identity/create.rs","line":33,"ins":{"up_context":[{"change":3,"pos":29133}],"down_context":[{"change":3,"pos":29225}],"flag":"BLOCK","start":8855,"end":9045,"inode":{"change":3,"pos":28175}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":29133},"to":{"change":3,"start":29133,"end":29225},"introduced_by":3}],"inode":{"change":3,"pos":28175}},"ins_contents":[{"Add":" pub async fn prompt_changes("},{"Add":" &self,"},{"Add":" replace_current: bool,"},{"Add":" link_remote: bool,"},{"Add":" ) -> Result {"},{"Add":" let mut new_identity = self.clone();"}],"del_contents":[{"Del":" pub fn prompt_changes(mut self, replace_current: bool) -> Result {\n"}]}},{"Replacement":{"inode":{"change":3,"pos":28175},"path":"pijul/src/identity/create.rs","line":41,"ins":{"up_context":[{"change":3,"pos":29270}],"down_context":[{"change":3,"pos":29341}],"flag":"BLOCK","start":9046,"end":9109,"inode":{"change":3,"pos":28175}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":29270},"to":{"change":3,"start":29270,"end":29341},"introduced_by":3}],"inode":{"change":3,"pos":28175}},"ins_contents":[{"Add":" new_identity.name = Input::with_theme(config.as_ref())"}],"del_contents":[{"Del":" let identity_name: String = Input::with_theme(config.as_ref())\n"}]}},{"Replacement":{"inode":{"change":3,"pos":28175},"path":"pijul/src/identity/create.rs","line":46,"ins":{"up_context":[{"change":3,"pos":29520}],"down_context":[{"change":3,"pos":29546}],"flag":"BLOCK","start":9110,"end":9144,"inode":{"change":3,"pos":28175}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":29520},"to":{"change":3,"start":29520,"end":29546},"introduced_by":3}],"inode":{"change":3,"pos":28175}},"ins_contents":[{"Add":" self.name.clone()"}],"del_contents":[{"Del":" self.name\n"}]}},{"Replacement":{"inode":{"change":3,"pos":28175},"path":"pijul/src/identity/create.rs","line":65,"ins":{"up_context":[{"change":3,"pos":30212}],"down_context":[{"change":3,"pos":30279}],"flag":"BLOCK","start":9145,"end":9230,"inode":{"change":3,"pos":28175}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":30212},"to":{"change":3,"start":30212,"end":30279},"introduced_by":3}],"inode":{"change":3,"pos":28175}},"ins_contents":[{"Add":" new_identity.config.author.display_name = Input::with_theme(config.as_ref())"}],"del_contents":[{"Del":" let full_name: String = Input::with_theme(config.as_ref())\n"}]}},{"Replacement":{"inode":{"change":3,"pos":28175},"path":"pijul/src/identity/create.rs","line":68,"ins":{"up_context":[{"change":3,"pos":30351}],"down_context":[{"change":3,"pos":30565}],"flag":"BLOCK","start":9231,"end":9296,"inode":{"change":3,"pos":28175}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":30351},"to":{"change":3,"start":30351,"end":30565},"introduced_by":3}],"inode":{"change":3,"pos":28175}},"ins_contents":[{"Add":" .with_initial_text(&self.config.author.display_name)"}],"del_contents":[{"Del":" .default(whoami::realname())\n .with_initial_text(if replace_current {\n self.identity.name.unwrap_or_default()\n } else {\n String::new()\n })\n"}]}},{"Replacement":{"inode":{"change":3,"pos":28175},"path":"pijul/src/identity/create.rs","line":71,"ins":{"up_context":[{"change":3,"pos":30597}],"down_context":[{"change":3,"pos":30665}],"flag":"BLOCK","start":9297,"end":9375,"inode":{"change":3,"pos":28175}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":30597},"to":{"change":3,"start":30597,"end":30665},"introduced_by":3}],"inode":{"change":3,"pos":28175}},"ins_contents":[{"Add":" new_identity.config.author.email = Input::with_theme(config.as_ref())"}],"del_contents":[{"Del":" let user_email: String = Input::with_theme(config.as_ref())\n"}]}},{"Replacement":{"inode":{"change":3,"pos":28175},"path":"pijul/src/identity/create.rs","line":74,"ins":{"up_context":[{"change":3,"pos":30753}],"down_context":[{"change":3,"pos":30825}],"flag":"BLOCK","start":9376,"end":9434,"inode":{"change":3,"pos":28175}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":30753},"to":{"change":3,"start":30753,"end":30825},"introduced_by":3}],"inode":{"change":3,"pos":28175}},"ins_contents":[{"Add":" .with_initial_text(&self.config.author.email)"}],"del_contents":[{"Del":" .with_initial_text(self.identity.email.unwrap_or_default())\n"}]}},{"Replacement":{"inode":{"change":3,"pos":28175},"path":"pijul/src/identity/create.rs","line":83,"ins":{"up_context":[{"change":3,"pos":31135}],"down_context":[{"change":3,"pos":31272}],"flag":"BLOCK","start":9435,"end":13409,"inode":{"change":3,"pos":28175}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":31135},"to":{"change":3,"start":31135,"end":31272},"introduced_by":3}],"inode":{"change":3,"pos":28175}},"ins_contents":[{"Add":""},{"Add":" if Confirm::with_theme(config.as_ref())"},{"Add":" .with_prompt(&format!("},{"Add":" \"Would you like to change the default SSH key? (Current key: {})\","},{"Add":" if let Some(path) = &self.config.key_path {"},{"Add":" format!(\"{path:#?}\")"},{"Add":" } else {"},{"Add":" String::from(\"none\")"},{"Add":" }"},{"Add":" ))"},{"Add":" .default(false)"},{"Add":" .interact()?"},{"Add":" {"},{"Add":" new_identity.prompt_ssh().await?;"},{"Add":" }"},{"Add":""},{"Add":" if Confirm::with_theme(config.as_ref())"},{"Add":" .with_prompt(&format!("},{"Add":" \"Do you want to change the encryption? (Current status: {})\","},{"Add":" self.credentials"},{"Add":" .clone()"},{"Add":" .unwrap()"},{"Add":" .secret_key"},{"Add":" .encryption"},{"Add":" .map_or(\"not encrypted\", |_| \"encrypted\")"},{"Add":" ))"},{"Add":" .default(false)"},{"Add":" .interact()?"},{"Add":" {"},{"Add":" new_identity.change_password()?;"},{"Add":" }"},{"Add":""},{"Add":" // Update the expiry AFTER potential secret key reset"},{"Add":" new_identity.prompt_expiry()?;"},{"Add":""},{"Add":" if Confirm::with_theme(config.as_ref())"},{"Add":" .with_prompt(\"Do you want to link this identity to a remote?\")"},{"Add":" .default(true)"},{"Add":" .interact()?"},{"Add":" {"},{"Add":" new_identity.prompt_remote(link_remote).await?;"},{"Add":" }"},{"Add":""},{"Add":" new_identity.last_modified = chrono::offset::Utc::now();"},{"Add":""},{"Add":" Ok(new_identity)"},{"Add":" }"},{"Add":""},{"Add":" async fn prompt_ssh(&mut self) -> Result<(), anyhow::Error> {"},{"Add":" let mut ssh_agent = thrussh_keys::agent::client::AgentClient::connect_env().await?;"},{"Add":" let identities = ssh_agent.request_identities().await?;"},{"Add":" let ssh_dir = dirs_next::home_dir().unwrap().join(\".ssh\");"},{"Add":""},{"Add":" let selection = FuzzySelect::with_theme(config::load_theme()?.as_ref())"},{"Add":" .with_prompt(\"Select key\")"},{"Add":" .items("},{"Add":" &identities"},{"Add":" .iter()"},{"Add":" .map(|id| {"},{"Add":" format!("},{"Add":" \"{}: {} ({})\","},{"Add":" id.name(),"},{"Add":" id.fingerprint(),"},{"Add":" ssh_dir"},{"Add":" .join(match id {"},{"Add":" PublicKey::Ed25519(_) =>"},{"Add":" thrussh_keys::key::ED25519.identity_file(),"},{"Add":" PublicKey::RSA { ref hash, .. } => hash.name().identity_file(),"},{"Add":" })"},{"Add":" .display(),"},{"Add":" )"},{"Add":" })"},{"Add":" .collect::>(),"},{"Add":" )"},{"Add":" .default(0)"},{"Add":" .interact()?;"},{"Add":""},{"Add":" self.config.key_path = Some(ssh_dir.join(match identities[selection] {"},{"Add":" PublicKey::Ed25519(_) => thrussh_keys::key::ED25519.identity_file(),"},{"Add":" PublicKey::RSA { ref hash, .. } => hash.name().identity_file(),"},{"Add":" }));"},{"Add":""},{"Add":" Ok(())"},{"Add":" }"},{"Add":""},{"Add":" async fn prompt_remote(&mut self, link_remote: bool) -> Result<(), IdentityCreateError> {"},{"Add":" let config = config::load_theme()?;"},{"Add":""},{"Add":" self.config.author.user_name = Input::with_theme(config.as_ref())"},{"Add":" .with_prompt(\"Remote username\")"},{"Add":" .default(whoami::username())"},{"Add":" .with_initial_text(&self.config.author.user_name)"},{"Add":" .interact_text()"},{"Add":" .unwrap();"},{"Add":""},{"Add":" self.config.author.origin = Input::with_theme(config.as_ref())"},{"Add":" .with_prompt(\"Remote URL\")"},{"Add":" .with_initial_text(&self.config.author.origin)"},{"Add":" .default(String::from(\"ssh.pijul.com\"))"},{"Add":" .interact_text()"},{"Add":" .unwrap();"},{"Add":""},{"Add":" // Prove the identity to the server"},{"Add":" if link_remote"},{"Add":" && self"},{"Add":" .prove(*NO_CERT_CHECK.get_or_init(|| false))"},{"Add":" .await"},{"Add":" .is_err()"},{"Add":" {"},{"Add":" return Err(IdentityCreateError::ProveFailed(self.name.clone()));"},{"Add":" }"},{"Add":""},{"Add":" Ok(())"},{"Add":" }"}],"del_contents":[{"Del":" let email: Option = if user_email.is_empty() {\n None\n } else {\n Some(user_email)\n };\n"}]}},{"Edit":{"inode":{"change":3,"pos":28175},"path":"pijul/src/identity/create.rs","line":198,"atom":{"NewVertex":{"up_context":[{"change":3,"pos":31273}],"down_context":[{"change":3,"pos":31273}],"flag":"BLOCK","start":13410,"end":13518,"inode":{"change":3,"pos":28175}}},"contents":[{"Add":" fn prompt_expiry(&mut self) -> Result<(), anyhow::Error> {"},{"Add":" let config = config::load_theme()?;"},{"Add":""}]}},{"Edit":{"inode":{"change":3,"pos":28175},"path":"pijul/src/identity/create.rs","line":202,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":31307},"to":{"change":3,"start":31307,"end":31329},"introduced_by":3}],"inode":{"change":3,"pos":28175}}},"contents":[{"Del":" .identity\n"}]}},{"Replacement":{"inode":{"change":3,"pos":28175},"path":"pijul/src/identity/create.rs","line":206,"ins":{"up_context":[{"change":3,"pos":31446}],"down_context":[{"change":3,"pos":31507}],"flag":"BLOCK","start":13519,"end":13593,"inode":{"change":3,"pos":28175}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":31446},"to":{"change":3,"start":31446,"end":31507},"introduced_by":3}],"inode":{"change":3,"pos":28175}},"ins_contents":[{"Add":" self.public_key.expires = if Confirm::with_theme(config.as_ref())"}],"del_contents":[{"Del":" let expiry = if Confirm::with_theme(config.as_ref())\n"}]}},{"Edit":{"inode":{"change":3,"pos":28175},"path":"pijul/src/identity/create.rs","line":240,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":32814},"to":{"change":3,"start":32814,"end":33802},"introduced_by":3}],"inode":{"change":3,"pos":28175}}},"contents":[{"Del":" };\n\n let link_remote: bool = Confirm::with_theme(config.as_ref())\n .with_prompt(\"Do you want to link this identity to a remote?\")\n .default(self.link_remote)\n .interact()?;\n\n let user_name = if link_remote {\n Input::with_theme(config.as_ref())\n .with_prompt(\"Remote username\")\n .default(whoami::username())\n .with_initial_text(self.identity.login)\n .interact_text()?\n } else {\n String::new()\n };\n\n let remote_url = if link_remote {\n Input::with_theme(config.as_ref())\n .with_prompt(\"Remote URL\")\n .with_initial_text(if replace_current {\n self.identity.origin\n } else {\n String::new()\n })\n .default(String::from(\"ssh.pijul.com\"))\n .interact_text()?\n } else {\n String::new()\n"}]}},{"Edit":{"inode":{"change":3,"pos":28175},"path":"pijul/src/identity/create.rs","line":241,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":33813},"to":{"change":3,"start":33813,"end":34535},"introduced_by":3}],"inode":{"change":3,"pos":28175}}},"contents":[{"Del":"\n let change_password = Confirm::with_theme(config.as_ref())\n .with_prompt(&format!(\n \"Do you want to change the encryption? (Current status: {})\",\n self.secret_key\n .encryption\n .clone()\n .map_or(\"not encrypted\", |_| \"encrypted\")\n ))\n .default(false)\n .interact()?;\n\n let password = if change_password {\n let user_password = Password::with_theme(config.as_ref())\n .with_prompt(\"Secret key password\")\n .allow_empty_password(true)\n .with_confirmation(\"Confirm password\", \"Password mismatch\")\n .interact()?;\n"}]}},{"Replacement":{"inode":{"change":3,"pos":28175},"path":"pijul/src/identity/create.rs","line":242,"ins":{"up_context":[{"change":3,"pos":34536}],"down_context":[{"change":3,"pos":35714}],"flag":"BLOCK","start":13594,"end":13609,"inode":{"change":3,"pos":28175}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":34536},"to":{"change":3,"start":34536,"end":35714},"introduced_by":3}],"inode":{"change":3,"pos":28175}},"ins_contents":[{"Add":" Ok(())"}],"del_contents":[{"Del":" let pass = if user_password.is_empty() {\n None\n } else {\n Some(user_password)\n };\n\n // Update the key pair to match this new password\n let loaded_key = self.secret_key.clone().load(\n get_valid_password(&self.secret_key, self.password, &identity_name)?.as_deref(),\n )?;\n self.identity.public_key = loaded_key.public_key();\n self.secret_key = loaded_key.save(pass.as_deref());\n\n pass\n } else {\n self.password\n };\n\n // Update the expiry AFTER potential secret key reset\n self.identity.public_key.expires = expiry;\n\n Ok(Self::new(\n identity_name,\n password,\n self.secret_key,\n Identity {\n public_key: self.identity.public_key,\n login: user_name,\n name: Some(full_name),\n origin: remote_url,\n email,\n last_modified: chrono::DateTime::timestamp(&chrono::offset::Utc::now())\n .try_into()?,\n },\n link_remote,\n ))\n"}]}},{"Replacement":{"inode":{"change":3,"pos":28175},"path":"pijul/src/identity/create.rs","line":261,"ins":{"up_context":[{"change":3,"pos":36298}],"down_context":[{"change":3,"pos":36365}],"flag":"BLOCK","start":13610,"end":13668,"inode":{"change":3,"pos":28175}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":36298},"to":{"change":3,"start":36298,"end":36365},"introduced_by":3}],"inode":{"change":3,"pos":28175}},"ins_contents":[{"Add":" let config_data = toml::to_string_pretty(&self)?;"}],"del_contents":[{"Del":" let config_data = toml::to_string_pretty(&self.identity)?;\n"}]}},{"Replacement":{"inode":{"change":3,"pos":28175},"path":"pijul/src/identity/create.rs","line":265,"ins":{"up_context":[{"change":3,"pos":36512}],"down_context":[{"change":3,"pos":36584}],"flag":"BLOCK","start":13669,"end":13743,"inode":{"change":3,"pos":28175}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":36512},"to":{"change":3,"start":36512,"end":36584},"introduced_by":3}],"inode":{"change":3,"pos":28175}},"ins_contents":[{"Add":" let key_data = serde_json::to_string_pretty(&self.secret_key())?;"}],"del_contents":[{"Del":" let key_data = serde_json::to_string_pretty(&self.secret_key)?;\n"}]}},{"Replacement":{"inode":{"change":3,"pos":28175},"path":"pijul/src/identity/create.rs","line":279,"ins":{"up_context":[{"change":3,"pos":37098}],"down_context":[{"change":3,"pos":37154}],"flag":"BLOCK","start":13744,"end":13814,"inode":{"change":3,"pos":28175}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":37098},"to":{"change":3,"start":37098,"end":37154},"introduced_by":3}],"inode":{"change":3,"pos":28175}},"ins_contents":[{"Add":" &self.config.author.user_name, &self.config.author.origin"}],"del_contents":[{"Del":" &self.identity.login, &self.identity.origin\n"}]}},{"Replacement":{"inode":{"change":3,"pos":28175},"path":"pijul/src/identity/create.rs","line":282,"ins":{"up_context":[{"change":3,"pos":37167}],"down_context":[{"change":3,"pos":37218}],"flag":"BLOCK","start":13815,"end":13871,"inode":{"change":3,"pos":28175}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":37167},"to":{"change":3,"start":37167,"end":37218},"introduced_by":3}],"inode":{"change":3,"pos":28175}},"ins_contents":[{"Add":" let remote = self.config.author.origin.clone();"}],"del_contents":[{"Del":" let remote = self.identity.origin.clone();\n"}]}},{"Replacement":{"inode":{"change":3,"pos":28175},"path":"pijul/src/identity/create.rs","line":310,"ins":{"up_context":[{"change":3,"pos":38119}],"down_context":[{"change":3,"pos":38194}],"flag":"BLOCK","start":13872,"end":13959,"inode":{"change":3,"pos":28175}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":38119},"to":{"change":3,"start":38119,"end":38194},"introduced_by":3}],"inode":{"change":3,"pos":28175}},"ins_contents":[{"Add":" let (key, _password) = self.credentials.clone().unwrap().decrypt(&self.name)?;"}],"del_contents":[{"Del":" let (_, key) = super::load::decrypt_secret_key(&self.name, None)?;\n"}]}},{"Replacement":{"inode":{"change":3,"pos":28175},"path":"pijul/src/identity/create.rs","line":322,"ins":{"up_context":[{"change":3,"pos":38554}],"down_context":[{"change":3,"pos":38568}],"flag":"BLOCK","start":13960,"end":13975,"inode":{"change":3,"pos":28175}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":38554},"to":{"change":3,"start":38554,"end":38568},"introduced_by":3}],"inode":{"change":3,"pos":28175}},"ins_contents":[{"Add":" &self,"}],"del_contents":[{"Del":" self,\n"}]}},{"Replacement":{"inode":{"change":3,"pos":28175},"path":"pijul/src/identity/create.rs","line":325,"ins":{"up_context":[{"change":3,"pos":38620}],"down_context":[{"change":3,"pos":38665}],"flag":"BLOCK","start":13976,"end":14076,"inode":{"change":3,"pos":28175}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":38620},"to":{"change":3,"start":38620,"end":38665},"introduced_by":3}],"inode":{"change":3,"pos":28175}},"ins_contents":[{"Add":" ) -> Result<(), IdentityCreateError> {"},{"Add":" // Prompt the user to edit changes interactively"}],"del_contents":[{"Del":" ) -> Result {\n"}]}},{"Replacement":{"inode":{"change":3,"pos":28175},"path":"pijul/src/identity/create.rs","line":328,"ins":{"up_context":[{"change":3,"pos":38713}],"down_context":[{"change":3,"pos":38730}],"flag":"BLOCK","start":14077,"end":14102,"inode":{"change":3,"pos":28175}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":38713},"to":{"change":3,"start":38713,"end":38730},"introduced_by":3}],"inode":{"change":3,"pos":28175}},"ins_contents":[{"Add":" self.clone()"}],"del_contents":[{"Del":" self\n"}]}},{"Replacement":{"inode":{"change":3,"pos":28175},"path":"pijul/src/identity/create.rs","line":330,"ins":{"up_context":[{"change":3,"pos":38747}],"down_context":[{"change":3,"pos":38787}],"flag":"BLOCK","start":14103,"end":14162,"inode":{"change":3,"pos":28175}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":38747},"to":{"change":3,"start":38747,"end":38787},"introduced_by":3}],"inode":{"change":3,"pos":28175}},"ins_contents":[{"Add":" self.prompt_changes(false, link_remote).await?"}],"del_contents":[{"Del":" self.prompt_changes(false)?\n"}]}},{"Replacement":{"inode":{"change":3,"pos":28175},"path":"pijul/src/identity/create.rs","line":335,"ins":{"up_context":[{"change":3,"pos":38842}],"down_context":[{"change":3,"pos":39610}],"flag":"BLOCK","start":14163,"end":14178,"inode":{"change":3,"pos":28175}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":38842},"to":{"change":3,"start":38842,"end":39610},"introduced_by":3}],"inode":{"change":3,"pos":28175}},"ins_contents":[{"Add":" Ok(())"}],"del_contents":[{"Del":" // Only exchange keys with the server if the user agreed to do so\n if link_remote\n && confirmed_identity.link_remote\n && confirmed_identity\n .prove(*NO_CERT_CHECK.get_or_init(|| false))\n .await\n .is_err()\n {\n return Err(IdentityCreateError::ProveFailed(\n confirmed_identity.name.clone(),\n ));\n }\n\n // If the user has entered a password, add it to the keyring\n if let Some(password) = confirmed_identity.password.clone() {\n Entry::new(\"pijul\", &confirmed_identity.name)\n .set_password(&password)\n .context(\"Unable to write to keychain\")?;\n }\n\n Ok(confirmed_identity)\n"}]}},{"Replacement":{"inode":{"change":3,"pos":28175},"path":"pijul/src/identity/create.rs","line":359,"ins":{"up_context":[{"change":3,"pos":40456}],"down_context":[{"change":3,"pos":40520}],"flag":"BLOCK","start":14179,"end":14270,"inode":{"change":3,"pos":28175}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":40456},"to":{"change":3,"start":40456,"end":40520},"introduced_by":3}],"inode":{"change":3,"pos":28175}},"ins_contents":[{"Add":" if let Some(password) = new_identity.credentials.clone().unwrap().password.get() {"}],"del_contents":[{"Del":" if let Some(password) = new_identity.password.clone() {\n"}]}},{"Replacement":{"inode":{"change":5,"pos":89866},"path":"pijul/src/config.rs","line":22,"ins":{"up_context":[{"change":5,"pos":182}],"down_context":[{"change":5,"pos":302}],"flag":"BLOCK","start":14271,"end":15184,"inode":{"change":5,"pos":89866}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":182},"to":{"change":2,"start":23,"end":138},"introduced_by":2},{"previous":"","flag":"DELETED","from":{"change":2,"pos":138},"to":{"change":5,"start":236,"end":302},"introduced_by":2},{"previous":"","flag":"DELETED","from":{"change":5,"pos":12750},"to":{"change":5,"start":236,"end":302},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":236},"to":{"change":5,"start":236,"end":302},"introduced_by":5}],"inode":{"change":5,"pos":89866}},"ins_contents":[{"Add":" // Older versions called this 'name', but 'user_name' is more descriptive"},{"Add":" #[serde(alias = \"name\", default, skip_serializing_if = \"String::is_empty\")]"},{"Add":" pub user_name: String,"},{"Add":" #[serde(alias = \"full_name\", default, skip_serializing_if = \"String::is_empty\")]"},{"Add":" pub display_name: String,"},{"Add":" #[serde(default, skip_serializing_if = \"String::is_empty\")]"},{"Add":" pub email: String,"},{"Add":" #[serde(default, skip_serializing_if = \"String::is_empty\")]"},{"Add":" pub origin: String,"},{"Add":" // This has been moved to identity::Config, but we should still be able to read the values"},{"Add":" #[serde(default, skip_serializing)]"},{"Add":" pub key_path: Option,"},{"Add":"}"},{"Add":""},{"Add":"impl Default for Author {"},{"Add":" fn default() -> Self {"},{"Add":" Self {"},{"Add":" user_name: String::new(),"},{"Add":" email: String::new(),"},{"Add":" display_name: whoami::realname(),"},{"Add":" origin: String::new(),"},{"Add":" key_path: None,"},{"Add":" }"},{"Add":" }"}],"del_contents":[{"Del":" // This is for backwards compatability with older versions\n #[serde(alias = \"name\")]\n pub login: String,\n"},{"Del":" pub email: Option,\n pub full_name: Option,\n"}]}},{"Replacement":{"inode":{"change":5,"pos":101759},"path":"pijul/src/commands/record.rs","line":145,"ins":{"up_context":[{"change":5,"pos":1069}],"down_context":[{"change":5,"pos":1910}],"flag":"BLOCK","start":15185,"end":15344,"inode":{"change":5,"pos":101759}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":1069},"to":{"change":4,"start":571,"end":727},"introduced_by":4}],"inode":{"change":5,"pos":101759}},"ins_contents":[{"Add":" let (key, _password) ="},{"Add":" crate::identity::Complete::load(&crate::identity::choose_identity_name(false).await?)?"},{"Add":" .decrypt()?;"}],"del_contents":[{"Del":" let (_, key) = crate::identity::decrypt_secret_key(\n &crate::identity::choose_identity_name(false).await?,\n None,\n )?;\n"}]}},{"Replacement":{"inode":{"change":5,"pos":123281},"path":"pijul/src/commands/protocol.rs","line":399,"ins":{"up_context":[{"change":5,"pos":2347}],"down_context":[{"change":5,"pos":2431}],"flag":"BLOCK","start":15345,"end":15439,"inode":{"change":5,"pos":123281}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":2347},"to":{"change":5,"start":2347,"end":2431},"introduced_by":5}],"inode":{"change":5,"pos":123281}},"ins_contents":[{"Add":" let id: Result = serde_json::from_reader(&mut idf);"}],"del_contents":[{"Del":" let id: Result = serde_json::from_reader(&mut idf);\n"}]}},{"Replacement":{"inode":{"change":5,"pos":123281},"path":"pijul/src/commands/protocol.rs","line":404,"ins":{"up_context":[{"change":5,"pos":2578}],"down_context":[{"change":5,"pos":2639}],"flag":"BLOCK","start":15440,"end":15515,"inode":{"change":5,"pos":123281}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":2578},"to":{"change":5,"start":2578,"end":2639},"introduced_by":5}],"inode":{"change":5,"pos":123281}},"ins_contents":[{"Add":" serde_json::to_writer(&mut o, &id.as_portable()).unwrap();"}],"del_contents":[{"Del":" serde_json::to_writer(&mut o, &id).unwrap();\n"}]}},{"Edit":{"inode":{"change":5,"pos":133619},"path":"pijul/src/commands/mod.rs","line":276,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":5215},"to":{"change":5,"start":332,"end":357},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":357},"to":{"change":4,"start":1276,"end":1324},"introduced_by":4},{"previous":"","flag":"DELETED","from":{"change":4,"pos":1324},"to":{"change":5,"start":398,"end":420},"introduced_by":4},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":398},"to":{"change":5,"start":398,"end":420},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":20024},"to":{"change":5,"start":20024,"end":20140},"introduced_by":5},{"previous":"","flag":"DELETED","from":{"change":5,"pos":20140},"to":{"change":5,"start":480,"end":544},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":480},"to":{"change":5,"start":480,"end":544},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":544},"to":{"change":5,"start":20141,"end":20165},"introduced_by":5},{"previous":"","flag":"DELETED","from":{"change":5,"pos":20165},"to":{"change":5,"start":564,"end":627},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":564},"to":{"change":5,"start":564,"end":627},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":627},"to":{"change":5,"start":20166,"end":20197},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":20197},"to":{"change":5,"start":44,"end":66},"introduced_by":5},{"previous":"","flag":"DELETED","from":{"change":5,"pos":66},"to":{"change":5,"start":20197,"end":20225},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":20197},"to":{"change":5,"start":20197,"end":20225},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":20225},"to":{"change":4,"start":1325,"end":1371},"introduced_by":4}],"inode":{"change":5,"pos":133619}}},"contents":[{"Del":"}\n\nuse serde_derive::*;\n\n"},{"Del":"#[derive(Clone, Debug, Serialize, Deserialize)]\n"},{"Del":"pub struct Identity {\n"},{"Del":" pub login: String,\n #[serde(default, skip_serializing_if = \"Option::is_none\")]\n pub name: Option,\n"},{"Del":" #[serde(default, skip_serializing_if = \"String::is_empty\")]\n"},{"Del":" pub origin: String,\n"},{"Del":" #[serde(default, skip_serializing_if = \"Option::is_none\")]\n"},{"Del":" pub email: Option,\n"},{"Del":" #[serde(default)]\n"},{"Del":" pub last_modified: u64,\n"},{"Del":" pub public_key: libpijul::key::PublicKey,\n"}]}},{"Replacement":{"inode":{"change":5,"pos":134376},"path":"pijul/src/commands/log.rs","line":377,"ins":{"up_context":[{"change":5,"pos":994}],"down_context":[{"change":5,"pos":13174}],"flag":"BLOCK","start":15516,"end":15694,"inode":{"change":5,"pos":134376}},"del":{"edges":[{"previous":"","flag":"DELETED","from":{"change":5,"pos":994},"to":{"change":5,"start":13074,"end":13174},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":13074},"to":{"change":5,"start":13074,"end":13174},"introduced_by":5}],"inode":{"change":5,"pos":134376}},"ins_contents":[{"Add":" if let Ok(id_) ="},{"Add":" serde_json::from_reader::<_, crate::identity::Complete>(f)"},{"Add":" {"}],"del_contents":[{"Del":" if let Ok(id_) = serde_json::from_reader::<_, super::Identity>(f) {\n"}]}},{"Edit":{"inode":{"change":5,"pos":134376},"path":"pijul/src/commands/log.rs","line":385,"atom":{"NewVertex":{"up_context":[{"change":4,"pos":1553}],"down_context":[{"change":4,"pos":1553}],"flag":"BLOCK","start":15695,"end":15696,"inode":{"change":5,"pos":134376}}},"contents":[{"Add":""}]}},{"Replacement":{"inode":{"change":5,"pos":134376},"path":"pijul/src/commands/log.rs","line":388,"ins":{"up_context":[{"change":4,"pos":1706}],"down_context":[{"change":5,"pos":1745}],"flag":"BLOCK","start":15697,"end":15835,"inode":{"change":5,"pos":134376}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":1706},"to":{"change":4,"start":1706,"end":1862},"introduced_by":4}],"inode":{"change":5,"pos":134376}},"ins_contents":[{"Add":" if &identity.public_key.key == e.key() {"},{"Add":" id = Some(identity);"}],"del_contents":[{"Del":" if &identity.identity.public_key.key == e.key() {\n id = Some(identity.identity);\n"}]}},{"Replacement":{"inode":{"change":5,"pos":134376},"path":"pijul/src/commands/log.rs","line":395,"ins":{"up_context":[{"change":5,"pos":13350}],"down_context":[{"change":5,"pos":2142}],"flag":"BLOCK","start":15836,"end":16405,"inode":{"change":5,"pos":134376}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":13350},"to":{"change":5,"start":1907,"end":2142},"introduced_by":5}],"inode":{"change":5,"pos":134376}},"ins_contents":[{"Add":" if id.config.author.display_name.is_empty() {"},{"Add":" e.insert(id.config.author.user_name)"},{"Add":" } else {"},{"Add":" if id.config.author.email.is_empty() {"},{"Add":" e.insert(format!("},{"Add":" \"{} ({})\","},{"Add":" id.config.author.display_name,"},{"Add":" id.config.author.user_name"},{"Add":" ))"}],"del_contents":[{"Del":" if let Some(ref name) = id.name {\n if let Some(ref email) = id.email {\n e.insert(format!(\"{} ({}) <{}>\", name, id.login, email))\n"}]}},{"Replacement":{"inode":{"change":5,"pos":134376},"path":"pijul/src/commands/log.rs","line":405,"ins":{"up_context":[{"change":5,"pos":2187}],"down_context":[{"change":5,"pos":2272}],"flag":"BLOCK","start":16406,"end":16781,"inode":{"change":5,"pos":134376}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":2187},"to":{"change":5,"start":2187,"end":2272},"introduced_by":5}],"inode":{"change":5,"pos":134376}},"ins_contents":[{"Add":" e.insert(format!("},{"Add":" \"{} ({}) <{}>\","},{"Add":" id.config.author.display_name,"},{"Add":" id.config.author.user_name,"},{"Add":" id.config.author.email"},{"Add":" ))"}],"del_contents":[{"Del":" e.insert(format!(\"{} ({})\", name, id.login))\n"}]}},{"Edit":{"inode":{"change":5,"pos":134376},"path":"pijul/src/commands/log.rs","line":412,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":2310},"to":{"change":5,"start":2310,"end":2406},"introduced_by":5}],"inode":{"change":5,"pos":134376}}},"contents":[{"Del":" } else {\n e.insert(id.login)\n"}]}},{"Replacement":{"inode":{"change":3,"pos":40825},"path":"pijul/src/commands/identity.rs","line":2,"ins":{"up_context":[{"change":3,"pos":40839}],"down_context":[{"change":3,"pos":40929}],"flag":"BLOCK","start":16782,"end":16880,"inode":{"change":3,"pos":40825}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":40839},"to":{"change":3,"start":40839,"end":40929},"introduced_by":3}],"inode":{"change":3,"pos":40825}},"ins_contents":[{"Add":" config::{self, Author},"},{"Add":" identity::{self, choose_identity_name, fix_identities, Complete},"}],"del_contents":[{"Del":" config,\n identity::{choose_identity_name, fix_identities, Complete},\n Identity,\n"}]}},{"Replacement":{"inode":{"change":3,"pos":40825},"path":"pijul/src/commands/identity.rs","line":6,"ins":{"up_context":[{"change":3,"pos":40933}],"down_context":[{"change":3,"pos":40973}],"flag":"BLOCK","start":16881,"end":16901,"inode":{"change":3,"pos":40825}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":40933},"to":{"change":3,"start":40933,"end":40973},"introduced_by":3}],"inode":{"change":3,"pos":40825}},"ins_contents":[{"Add":"use std::io::Write;"}],"del_contents":[{"Del":"use std::{convert::TryInto, io::Write};\n"}]}},{"Replacement":{"inode":{"change":3,"pos":40825},"path":"pijul/src/commands/identity.rs","line":9,"ins":{"up_context":[{"change":3,"pos":40992}],"down_context":[{"change":3,"pos":41036}],"flag":"BLOCK","start":16902,"end":16931,"inode":{"change":3,"pos":40825}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":40992},"to":{"change":3,"start":40992,"end":41036},"introduced_by":3}],"inode":{"change":3,"pos":40825}},"ins_contents":[{"Add":"use chrono::{DateTime, Utc};"}],"del_contents":[{"Del":"use chrono::{DateTime, NaiveDateTime, Utc};\n"}]}},{"Replacement":{"inode":{"change":3,"pos":40825},"path":"pijul/src/commands/identity.rs","line":219,"ins":{"up_context":[{"change":3,"pos":47911}],"down_context":[{"change":3,"pos":48435}],"flag":"BLOCK","start":16932,"end":17440,"inode":{"change":3,"pos":40825}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":47911},"to":{"change":3,"start":47911,"end":48435},"introduced_by":3}],"inode":{"change":3,"pos":40825}},"ins_contents":[{"Add":" Ok(Complete::new("},{"Add":" identity_name.unwrap_or(default.name),"},{"Add":" identity::Config {"},{"Add":" key_path: None,"},{"Add":" author: Author {"},{"Add":" user_name: login.unwrap_or(default.config.author.user_name),"},{"Add":" display_name: display_name.unwrap_or(default.config.author.display_name),"},{"Add":" email: email.unwrap_or(default.config.author.email),"},{"Add":" origin: origin.unwrap_or(default.config.author.origin),"},{"Add":" key_path: None,"},{"Add":" },"}],"del_contents":[{"Del":" Ok(Complete {\n name: identity_name.unwrap_or(default.name),\n password: pw.clone(),\n secret_key: secret_key.save(pw.as_deref()),\n identity: Identity {\n login: login.unwrap_or(default.identity.login),\n name: display_name.or(default.identity.name),\n origin: origin.unwrap_or(default.identity.origin),\n email: email.or(default.identity.email),\n last_modified: default.identity.last_modified,\n public_key: secret_key.public_key(),\n"}]}},{"Replacement":{"inode":{"change":3,"pos":40825},"path":"pijul/src/commands/identity.rs","line":231,"ins":{"up_context":[{"change":3,"pos":48446}],"down_context":[{"change":3,"pos":48480}],"flag":"BLOCK","start":17441,"end":17594,"inode":{"change":3,"pos":40825}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":48446},"to":{"change":3,"start":48446,"end":48480},"introduced_by":3}],"inode":{"change":3,"pos":40825}},"ins_contents":[{"Add":" secret_key.public_key(),"},{"Add":" Some(identity::Credentials::new("},{"Add":" secret_key.save(pw.as_deref()),"},{"Add":" pw,"},{"Add":" )),"},{"Add":" ))"}],"del_contents":[{"Del":" link_remote: true,\n })\n"}]}},{"Replacement":{"inode":{"change":3,"pos":40825},"path":"pijul/src/commands/identity.rs","line":293,"ins":{"up_context":[{"change":3,"pos":50560}],"down_context":[{"change":3,"pos":50773}],"flag":"BLOCK","start":17595,"end":17879,"inode":{"change":3,"pos":40825}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":50560},"to":{"change":3,"start":50560,"end":50773},"introduced_by":3}],"inode":{"change":3,"pos":40825}},"ins_contents":[{"Add":" \"Display name: {}\","},{"Add":" if identity.config.author.display_name.is_empty() {"},{"Add":" \"\""},{"Add":" } else {"},{"Add":" &identity.config.author.display_name"},{"Add":" }"}],"del_contents":[{"Del":" \"Name: {}\",\n identity\n .identity\n .name\n .unwrap_or_else(|| \"\".to_string())\n"}]}},{"Edit":{"inode":{"change":3,"pos":40825},"path":"pijul/src/commands/identity.rs","line":300,"atom":{"NewVertex":{"up_context":[{"change":3,"pos":50797}],"down_context":[{"change":3,"pos":50797}],"flag":"BLOCK","start":17880,"end":17881,"inode":{"change":3,"pos":40825}}},"contents":[{"Add":""}]}},{"Replacement":{"inode":{"change":3,"pos":40825},"path":"pijul/src/commands/identity.rs","line":303,"ins":{"up_context":[{"change":3,"pos":50884}],"down_context":[{"change":3,"pos":51063}],"flag":"BLOCK","start":17882,"end":18109,"inode":{"change":3,"pos":40825}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":50884},"to":{"change":3,"start":50884,"end":51063},"introduced_by":3}],"inode":{"change":3,"pos":40825}},"ins_contents":[{"Add":" if identity.config.author.email.is_empty() {"},{"Add":" \"\""},{"Add":" } else {"},{"Add":" &identity.config.author.email"},{"Add":" }"}],"del_contents":[{"Del":" identity\n .identity\n .email\n .unwrap_or_else(|| \"\".to_string())\n"}]}},{"Replacement":{"inode":{"change":3,"pos":40825},"path":"pijul/src/commands/identity.rs","line":310,"ins":{"up_context":[{"change":3,"pos":51088}],"down_context":[{"change":3,"pos":51214}],"flag":"BLOCK","start":18110,"end":18234,"inode":{"change":3,"pos":40825}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":51088},"to":{"change":3,"start":51088,"end":51214},"introduced_by":3}],"inode":{"change":3,"pos":40825}},"ins_contents":[{"Add":" let username = if identity.config.author.user_name.is_empty() {"},{"Add":" \"\""}],"del_contents":[{"Del":" let login = if identity.identity.login.is_empty() {\n String::from(\"\")\n"}]}},{"Replacement":{"inode":{"change":3,"pos":40825},"path":"pijul/src/commands/identity.rs","line":313,"ins":{"up_context":[{"change":3,"pos":51243}],"down_context":[{"change":3,"pos":51291}],"flag":"BLOCK","start":18235,"end":18293,"inode":{"change":3,"pos":40825}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":51243},"to":{"change":3,"start":51243,"end":51291},"introduced_by":3}],"inode":{"change":3,"pos":40825}},"ins_contents":[{"Add":" &identity.config.author.user_name"}],"del_contents":[{"Del":" identity.identity.login\n"}]}},{"Replacement":{"inode":{"change":3,"pos":40825},"path":"pijul/src/commands/identity.rs","line":316,"ins":{"up_context":[{"change":3,"pos":51315}],"down_context":[{"change":3,"pos":51441}],"flag":"BLOCK","start":18294,"end":18411,"inode":{"change":3,"pos":40825}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":51315},"to":{"change":3,"start":51315,"end":51441},"introduced_by":3}],"inode":{"change":3,"pos":40825}},"ins_contents":[{"Add":" let origin = if identity.config.author.origin.is_empty() {"},{"Add":" \"\""}],"del_contents":[{"Del":" let origin = if identity.identity.origin.is_empty() {\n String::from(\"\")\n"}]}},{"Replacement":{"inode":{"change":3,"pos":40825},"path":"pijul/src/commands/identity.rs","line":319,"ins":{"up_context":[{"change":3,"pos":51470}],"down_context":[{"change":3,"pos":51519}],"flag":"BLOCK","start":18412,"end":18467,"inode":{"change":3,"pos":40825}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":51470},"to":{"change":3,"start":51470,"end":51519},"introduced_by":3}],"inode":{"change":3,"pos":40825}},"ins_contents":[{"Add":" &identity.config.author.origin"}],"del_contents":[{"Del":" identity.identity.origin\n"}]}},{"Replacement":{"inode":{"change":3,"pos":40825},"path":"pijul/src/commands/identity.rs","line":321,"ins":{"up_context":[{"change":3,"pos":51542}],"down_context":[{"change":3,"pos":51620}],"flag":"BLOCK","start":18468,"end":18549,"inode":{"change":3,"pos":40825}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":51542},"to":{"change":3,"start":51542,"end":51620},"introduced_by":3}],"inode":{"change":3,"pos":40825}},"ins_contents":[{"Add":" tree.add_empty_child(format!(\"Login: {username}@{origin}\"));"}],"del_contents":[{"Del":" tree.add_empty_child(format!(\"Login: {login}@{origin}\"));\n"}]}},{"Replacement":{"inode":{"change":3,"pos":40825},"path":"pijul/src/commands/identity.rs","line":324,"ins":{"up_context":[{"change":3,"pos":51685}],"down_context":[{"change":3,"pos":51955}],"flag":"BLOCK","start":18550,"end":18732,"inode":{"change":3,"pos":40825}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":51685},"to":{"change":3,"start":51685,"end":51955},"introduced_by":3}],"inode":{"change":3,"pos":40825}},"ins_contents":[{"Add":" tree.add_empty_child(format!(\"Key: {}\", identity.public_key.key));"},{"Add":" tree.add_empty_child(format!(\"Version: {}\", identity.public_key.version));"}],"del_contents":[{"Del":" tree.add_empty_child(format!(\"Key: {}\", identity.identity.public_key.key));\n tree.add_empty_child(format!(\n \"Version: {}\",\n identity.identity.public_key.version\n ));\n"}]}},{"Replacement":{"inode":{"change":3,"pos":40825},"path":"pijul/src/commands/identity.rs","line":328,"ins":{"up_context":[{"change":3,"pos":52049}],"down_context":[{"change":3,"pos":52112}],"flag":"BLOCK","start":18733,"end":18787,"inode":{"change":3,"pos":40825}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":52049},"to":{"change":3,"start":52049,"end":52112},"introduced_by":3}],"inode":{"change":3,"pos":40825}},"ins_contents":[{"Add":" identity.public_key.algorithm"}],"del_contents":[{"Del":" identity.identity.public_key.algorithm\n"}]}},{"Edit":{"inode":{"change":3,"pos":40825},"path":"pijul/src/commands/identity.rs","line":333,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":52257},"to":{"change":3,"start":52257,"end":52295},"introduced_by":3}],"inode":{"change":3,"pos":40825}}},"contents":[{"Del":" .identity\n"}]}},{"Replacement":{"inode":{"change":3,"pos":40825},"path":"pijul/src/commands/identity.rs","line":341,"ins":{"up_context":[{"change":3,"pos":52659}],"down_context":[{"change":3,"pos":52754}],"flag":"BLOCK","start":18788,"end":18964,"inode":{"change":3,"pos":40825}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":52659},"to":{"change":3,"start":52659,"end":52754},"introduced_by":3}],"inode":{"change":3,"pos":40825}},"ins_contents":[{"Add":" tree.add_empty_child(format!("},{"Add":" \"Version: {}\","},{"Add":" identity.secret_key().unwrap().version"},{"Add":" ));"}],"del_contents":[{"Del":" tree.add_empty_child(format!(\"Version: {}\", identity.secret_key.version));\n"}]}},{"Replacement":{"inode":{"change":3,"pos":40825},"path":"pijul/src/commands/identity.rs","line":347,"ins":{"up_context":[{"change":3,"pos":52848}],"down_context":[{"change":3,"pos":52902}],"flag":"BLOCK","start":18965,"end":19030,"inode":{"change":3,"pos":40825}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":52848},"to":{"change":3,"start":52848,"end":52902},"introduced_by":3}],"inode":{"change":3,"pos":40825}},"ins_contents":[{"Add":" identity.secret_key().unwrap().algorithm"}],"del_contents":[{"Del":" identity.secret_key.algorithm\n"}]}},{"Replacement":{"inode":{"change":3,"pos":40825},"path":"pijul/src/commands/identity.rs","line":351,"ins":{"up_context":[{"change":3,"pos":52972}],"down_context":[{"change":3,"pos":53055}],"flag":"BLOCK","start":19031,"end":19125,"inode":{"change":3,"pos":40825}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":52972},"to":{"change":3,"start":52972,"end":53055},"introduced_by":3}],"inode":{"change":3,"pos":40825}},"ins_contents":[{"Add":" if let Some(encryption) = identity.secret_key().unwrap().encryption {"}],"del_contents":[{"Del":" if let Some(encryption) = identity.secret_key.encryption {\n"}]}},{"Edit":{"inode":{"change":3,"pos":40825},"path":"pijul/src/commands/identity.rs","line":368,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":53771},"to":{"change":3,"start":53771,"end":54041},"introduced_by":3}],"inode":{"change":3,"pos":40825}}},"contents":[{"Del":" let naive_time = NaiveDateTime::from_timestamp(\n identity.identity.last_modified.try_into()?,\n 0,\n );\n let date: DateTime = DateTime::from_utc(naive_time, Utc);\n"}]}},{"Replacement":{"inode":{"change":3,"pos":40825},"path":"pijul/src/commands/identity.rs","line":370,"ins":{"up_context":[{"change":3,"pos":54135}],"down_context":[{"change":3,"pos":54198}],"flag":"BLOCK","start":19126,"end":19207,"inode":{"change":3,"pos":40825}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":54135},"to":{"change":3,"start":54135,"end":54198},"introduced_by":3}],"inode":{"change":3,"pos":40825}},"ins_contents":[{"Add":" identity.last_modified.format(\"%Y-%m-%d %H:%M:%S (UTC)\")"}],"del_contents":[{"Del":" date.format(\"%Y-%m-%d %H:%M:%S (UTC)\")\n"}]}},{"Edit":{"inode":{"change":3,"pos":40825},"path":"pijul/src/commands/identity.rs","line":383,"atom":{"NewVertex":{"up_context":[{"change":3,"pos":54595}],"down_context":[{"change":3,"pos":54595}],"flag":"BLOCK","start":19208,"end":19289,"inode":{"change":3,"pos":40825}}},"contents":[{"Add":" writeln!(std::io::stderr(), \"Editing identity: {old_id_name}\")?;"}]}},{"Replacement":{"inode":{"change":3,"pos":40825},"path":"pijul/src/commands/identity.rs","line":399,"ins":{"up_context":[{"change":3,"pos":55139}],"down_context":[{"change":3,"pos":55202}],"flag":"BLOCK","start":19290,"end":19452,"inode":{"change":3,"pos":40825}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":55139},"to":{"change":3,"start":55139,"end":55202},"introduced_by":3}],"inode":{"change":3,"pos":40825}},"ins_contents":[{"Add":" old_identity"},{"Add":" .clone()"},{"Add":" .prompt_changes(true, !options.no_link)"},{"Add":" .await?"}],"del_contents":[{"Del":" old_identity.clone().prompt_changes(true)?\n"}]}},{"Edit":{"inode":{"change":3,"pos":40825},"path":"pijul/src/commands/identity.rs","line":404,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":55221},"to":{"change":3,"start":55221,"end":55296},"introduced_by":3}],"inode":{"change":3,"pos":40825}}},"contents":[{"Del":"\n old_identity.clone().replace_with(new_identity.clone())?;\n"}]}},{"Replacement":{"inode":{"change":3,"pos":40825},"path":"pijul/src/commands/identity.rs","line":405,"ins":{"up_context":[{"change":3,"pos":55297}],"down_context":[{"change":3,"pos":55730}],"flag":"BLOCK","start":19453,"end":19511,"inode":{"change":3,"pos":40825}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":55297},"to":{"change":3,"start":55297,"end":55730},"introduced_by":3}],"inode":{"change":3,"pos":40825}},"ins_contents":[{"Add":" old_identity.replace_with(new_identity)?;"}],"del_contents":[{"Del":" // User has changed credentials, so attempt to re-prove\n if old_identity.identity.login != new_identity.identity.login\n || old_identity.identity.origin != new_identity.identity.origin\n {\n if !options.no_link && new_identity.link_remote {\n new_identity.prove(self.no_cert_check).await?;\n }\n }\n"}]}},{"Replacement":{"inode":{"change":3,"pos":40825},"path":"pijul/src/commands/identity.rs","line":435,"ins":{"up_context":[{"change":3,"pos":56822}],"down_context":[{"change":3,"pos":56884}],"flag":"BLOCK","start":19512,"end":19585,"inode":{"change":3,"pos":40825}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":56822},"to":{"change":3,"start":56822,"end":56884},"introduced_by":3}],"inode":{"change":3,"pos":40825}},"ins_contents":[{"Add":" if identity.secret_key().unwrap().encryption.is_some() {"}],"del_contents":[{"Del":" if identity.secret_key.encryption.is_some() {\n"}]}}],"owner":"irevoire","repo":"pijul","token":"d/zm/u+qXglK5S15rqeGJhNZTuyuFTsJbY0et3bfS3I=","login":null}

…

Dependencies

Change contents