{"header":{"message":"Update codebase to use new identity management","description":"This also adds some support for caching user secrets where appropriate, so it should make interaction with remotes have less friction.","timestamp":"2022-08-16T09:00:46.64580974Z","authors":[{}]},"hash":"DWSAYGVEOR4D2EKIICEZUWCRGJTUXQQLOUWMYIFV7XN62K44F4FAC","authors":[{"login":"finchie","key":"6WCsL9cxQoPBLLwR1PUvmFBJi6wGTGFAxcxMovPQCwTZ"}],"deps":{"hashes":[["DWSAYGVEOR4D2EKIICEZUWCRGJTUXQQLOUWMYIFV7XN62K44F4FAC","Update codebase to use new identity management"],["AA",null],["MU6P2JXG6RQEUOUV7HIZNA2734BGUCYMJYXAOLOO2CSGMNKVIH5QC","SSH: return with an error if the host key is wrong, rather than denying authentication"],["C267PHOH3QJBSBEWQB3J7PPOOXIUKM3DIIZIPLHPU4D5OXRCGLZAC","Tags: dropping useless Hashes in favour of Merkles"],["NAUECZW353R5RHT4GGQJIEZPA5EYRGQYTSP7IJNBJS3CXBSTNJDQC","Fixing the map between keys and identities"],["F6V27C3M7GZHBHXMGAZMYO5XGWDYYNNIF2HLDE2VPNHTEVDSYGVQC","Fixing the \"old file optimisation\" in record, after the move to parallelisable records"],["I24UEJQLCH2SOXA4UHIYWTRDCHSOPU7AFTRUOTX7HZIAV4AZKYEQC","Various post-fire fixes"],["NS36CJCO6E2FS65JRHHMOK4GTL7CLNOOLQZZAAAIZI2CQYNPAYRQC","Validating timestamps in record"],["TEQS7C6CFY4B2NX7X23TWXKM3CY3ID5HZN6FWULLC6PSGZGLS3TAC","Fixing filters in `pijul log`"],["LGEJSLTYI7Y2CYC3AN6ECMT3D3MTWCAKZPVQEG5MPM2OBW5FQ46AC","Fixing output (including its uses in reset and pull)"],["OU6JOR3CDZTH2H3NTGMV3WDIAWPD3VEJI7JRY3VJ7LPDR3QOA52QC","Add path filtering for log, add json output for log"],["CCLLB7OIFNFYJZTG3UCI7536TOCWSCSXR67VELSB466R24WLJSDAC","Upgrading to Sanakirja 0.15 + version bump"],["G6S6PWZEFJK7ARWBIFKDU6VYC5DCJ2YFJMWZOLLWWKU52R2QPXZAC","Do not touch the channel if this is a partial record"],["6U42MTEZTINWUU2KLJLQW33ZBZXKTHPTF6TMEG56TO642CQDZQMQC","Fixing log -- filters, along with performance improvements"],["EEBKW7VTILH6AGGV57ZIJ3DJGYHDSYBWGU3C7Q4WWAKSVNUGIYMQC","Keys and identities"],["SMMBFECLGSUKRZW5YPOQPOQCOY2CH2OTZXBSZ3KG2N3J3HQZ5PSAC","Converting to the new patch format \"online\""],["FDEVV5NGUMTEULP25EFYFZEVICWYLGV7XMED25PNKD36DL4NA46AC","Tag check"],["OU243LABJJZ3MQHYW2A2MYKW7KZLTZGHJJXDR2BIIIHXT5BSYN3AC","Support for staging"],["2RXOCWUWOGHEKHT5W73LAHJSOZVRTOGS7BWLSIGEEEBJGMCZBXQAC","Making libpijul deterministic (and getting rid of `rand`)"],["I6DVZEFUMGH6BFOLGBPM6J4PL5I4PAAODJYG7REXYPDHPKPBLDTAC","Do not ask for user input if the SSH channel is already closed"],["QL6K2ZM35B3NIXEMMCJWUSFXOBQHAGXRDMO7ID5DCKTJH4QJVY7QC","Tags"],["AAXP2534BWX2ZUDZZHUMLYDBMGFGUH32CNRA3KOLER3JKOIJUZLAC","Tags: completing the subcommand"],["ZDK3GNDBWXJ2OXFDYB72ZCEBGLBF4MKE5K3PVHDZATHJ7HJIDPRQC","Tag transactions (including a massive refactoring of errors)"],["LJFJEX43HDS33O5HCRXH7AR3GTQZDHNWHEQBOERDNPNXR3B3XZ3QC","Fixing newline issues in the protocol over OpenSSH"],["TFPETWTVADLG2DL7WERHJPGMJVOY4WOKCRWB3NZ3YOOQ4CVAUHBAC","Add config options for patch message templates\n"],["L4JXJHWXYNCL4QGJXNKKTOKKTAXKKXBJUUY7HFZGEUZ5A2V5H34QC","pijul/*: reorganize imports and remove extern crate"],["SZWBLWZ4LUJZHTSYOIGJMXM7KPCGWJFPKLHYA5MHY7UTPNLZV5KQC","Reading ~/.ssh/config"],["SXEYMYF7P4RZMZ46WPL4IZUTSQ2ATBWYZX7QNVMS3SGOYXYOHAGQC","Fixing the bad changes in history (unfortunately, by rebooting)."],["I52XSRUH5RVHQBFWVMAQPTUSPAJ4KNVID2RMI3UGCVKFLYUO6WZAC","Massive cleanup, and simplification"],["UDHP4ZVBQZT2VBURB2MDCU2IZDNMCAFSIUKWRBDQ5BWMFKSN2LYQC","Fixing SSH asynchronicity issues"],["MU5GSJAW65PEG3BRYUKZ7O37BPHW3MOX3S5E2RFOXKGUOJEEDQ5AC","Partial push and pull (WARNING: breaks the existing protocol)"],["IIV3EL2XYI2X7HZWKXEXQFAE3R3KC2Q7SGOT3Q332HSENMYVF32QC","Cleanup, formatting, and fixing the Git feature"],["A3RM526Y7LUXNYW4TL56YKQ5GVOK2R5D7JJVTSQ6TT5MEXIR6YAAC","Integrating identity malleability"],["RRCSHAYZ6RLWVPNYHF2F5FSRL2KKJNPQUQRIJYLJGB23BZQQ7JLQC","Formatting"],["HKA66XOQ5LOF3E5DIQGVKPEZGZKCXLLYRVTKDK7SAD7Y5JZB5OUQC","Updating Thrussh version for long or massive connections"],["E7UUQQCCX2WSVOSMO4OWCJFFU7RGQKQ4TRBBICVM52K7ATTHYNSAC","Apply changes with prefixes in .pijul/changes"],["TPEH2XNBS5RO4IEVKENVF6P65AH7IX64KK2JAYMSJT3J5GXO67EAC","1.0.0-alpha.28, with Tokio 1.0"],["EUZFFJSOWV4PXDFFPDAFBHFUUMOFEU6ST7JH57YYRRR2SEOXLN6QC","Updating Pijul with the latest changes in Libpijul"],["RUBBHYZ7MCLKJIHZ3EWEC3JR3FSKOU4T2NH7KRBG7ECAU4JF3LUAC","Removing unnecessary async/await"],["6F6AAHK4M2IVS23TVISR5OJSTZXUSEKLOP5BMM7SUHYG2FQNTSGQC","Simplifying pijul::commands::log, and fixing Broken Pipe errors"],["SLJ3OHD4F6GJGZ3SV2D7DMR3PXYHPSI64X77KZ3RJ24EGEX6ZNQAC","unrecord: show list of changes if none were given as arguments"],["U6TQX5Z2NF6GX3SRLUBQGCZ7WAXNYMWWZ2YMADUSG4EWVKNV2BIAC","pager function respects cli option and user config files, PAGER env var"],["3KRGVQFUWFHPOGZOXVTJYNCM4XBRVYITAEOVPKBSAZ5GZIUO5KVQC","Do not update the mtime of unmodified files"],["GUL4M5FIE7JYXJHR7MCTQS3543HIQXGPLBWZKASBAWWEA4SZ75CAC","Cleanup and formatting"]],"deps":["MU6P2JXG6RQEUOUV7HIZNA2734BGUCYMJYXAOLOO2CSGMNKVIH5QC","C267PHOH3QJBSBEWQB3J7PPOOXIUKM3DIIZIPLHPU4D5OXRCGLZAC","NAUECZW353R5RHT4GGQJIEZPA5EYRGQYTSP7IJNBJS3CXBSTNJDQC"],"known":["SXEYMYF7P4RZMZ46WPL4IZUTSQ2ATBWYZX7QNVMS3SGOYXYOHAGQC","L4JXJHWXYNCL4QGJXNKKTOKKTAXKKXBJUUY7HFZGEUZ5A2V5H34QC","UDHP4ZVBQZT2VBURB2MDCU2IZDNMCAFSIUKWRBDQ5BWMFKSN2LYQC","I52XSRUH5RVHQBFWVMAQPTUSPAJ4KNVID2RMI3UGCVKFLYUO6WZAC","SZWBLWZ4LUJZHTSYOIGJMXM7KPCGWJFPKLHYA5MHY7UTPNLZV5KQC","SLJ3OHD4F6GJGZ3SV2D7DMR3PXYHPSI64X77KZ3RJ24EGEX6ZNQAC","MU5GSJAW65PEG3BRYUKZ7O37BPHW3MOX3S5E2RFOXKGUOJEEDQ5AC","CCLLB7OIFNFYJZTG3UCI7536TOCWSCSXR67VELSB466R24WLJSDAC","TPEH2XNBS5RO4IEVKENVF6P65AH7IX64KK2JAYMSJT3J5GXO67EAC","3KRGVQFUWFHPOGZOXVTJYNCM4XBRVYITAEOVPKBSAZ5GZIUO5KVQC","G6S6PWZEFJK7ARWBIFKDU6VYC5DCJ2YFJMWZOLLWWKU52R2QPXZAC","OU243LABJJZ3MQHYW2A2MYKW7KZLTZGHJJXDR2BIIIHXT5BSYN3AC","LGEJSLTYI7Y2CYC3AN6ECMT3D3MTWCAKZPVQEG5MPM2OBW5FQ46AC","IIV3EL2XYI2X7HZWKXEXQFAE3R3KC2Q7SGOT3Q332HSENMYVF32QC","I6DVZEFUMGH6BFOLGBPM6J4PL5I4PAAODJYG7REXYPDHPKPBLDTAC","I24UEJQLCH2SOXA4UHIYWTRDCHSOPU7AFTRUOTX7HZIAV4AZKYEQC","F6V27C3M7GZHBHXMGAZMYO5XGWDYYNNIF2HLDE2VPNHTEVDSYGVQC","NS36CJCO6E2FS65JRHHMOK4GTL7CLNOOLQZZAAAIZI2CQYNPAYRQC","TFPETWTVADLG2DL7WERHJPGMJVOY4WOKCRWB3NZ3YOOQ4CVAUHBAC","QL6K2ZM35B3NIXEMMCJWUSFXOBQHAGXRDMO7ID5DCKTJH4QJVY7QC","AAXP2534BWX2ZUDZZHUMLYDBMGFGUH32CNRA3KOLER3JKOIJUZLAC","2RXOCWUWOGHEKHT5W73LAHJSOZVRTOGS7BWLSIGEEEBJGMCZBXQAC","GUL4M5FIE7JYXJHR7MCTQS3543HIQXGPLBWZKASBAWWEA4SZ75CAC","RRCSHAYZ6RLWVPNYHF2F5FSRL2KKJNPQUQRIJYLJGB23BZQQ7JLQC","EEBKW7VTILH6AGGV57ZIJ3DJGYHDSYBWGU3C7Q4WWAKSVNUGIYMQC","SMMBFECLGSUKRZW5YPOQPOQCOY2CH2OTZXBSZ3KG2N3J3HQZ5PSAC","A3RM526Y7LUXNYW4TL56YKQ5GVOK2R5D7JJVTSQ6TT5MEXIR6YAAC","HKA66XOQ5LOF3E5DIQGVKPEZGZKCXLLYRVTKDK7SAD7Y5JZB5OUQC","E7UUQQCCX2WSVOSMO4OWCJFFU7RGQKQ4TRBBICVM52K7ATTHYNSAC","EUZFFJSOWV4PXDFFPDAFBHFUUMOFEU6ST7JH57YYRRR2SEOXLN6QC","LJFJEX43HDS33O5HCRXH7AR3GTQZDHNWHEQBOERDNPNXR3B3XZ3QC","RUBBHYZ7MCLKJIHZ3EWEC3JR3FSKOU4T2NH7KRBG7ECAU4JF3LUAC","OU6JOR3CDZTH2H3NTGMV3WDIAWPD3VEJI7JRY3VJ7LPDR3QOA52QC","6F6AAHK4M2IVS23TVISR5OJSTZXUSEKLOP5BMM7SUHYG2FQNTSGQC","6U42MTEZTINWUU2KLJLQW33ZBZXKTHPTF6TMEG56TO642CQDZQMQC","ZDK3GNDBWXJ2OXFDYB72ZCEBGLBF4MKE5K3PVHDZATHJ7HJIDPRQC","FDEVV5NGUMTEULP25EFYFZEVICWYLGV7XMED25PNKD36DL4NA46AC","TEQS7C6CFY4B2NX7X23TWXKM3CY3ID5HZN6FWULLC6PSGZGLS3TAC","U6TQX5Z2NF6GX3SRLUBQGCZ7WAXNYMWWZ2YMADUSG4EWVKNV2BIAC"]},"hunks":[{"Replacement":{"inode":{"change":5,"pos":74},"path":"pijul/src/commands/tag.rs","line":86,"ins":{"up_context":[{"change":5,"pos":1480}],"down_context":[{"change":5,"pos":1538}],"flag":"BLOCK","start":0,"end":58,"inode":{"change":5,"pos":74}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":1480},"to":{"change":5,"start":1081,"end":1133},"introduced_by":5}],"inode":{"change":5,"pos":74}},"ins_contents":[{"Add":" pub async fn run(self) -> Result<(), anyhow::Error> {"}],"del_contents":[{"Del":" pub fn run(self) -> Result<(), anyhow::Error> {\n"}]}},{"Replacement":{"inode":{"change":5,"pos":74},"path":"pijul/src/commands/tag.rs","line":126,"ins":{"up_context":[{"change":5,"pos":2976}],"down_context":[{"change":3,"pos":74}],"flag":"BLOCK","start":59,"end":142,"inode":{"change":5,"pos":74}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":2976},"to":{"change":5,"start":2976,"end":3053},"introduced_by":5}],"inode":{"change":5,"pos":74}},"ins_contents":[{"Add":" let header = header(author.as_deref(), message, timestamp).await?;"}],"del_contents":[{"Del":" let header = header(author.as_deref(), message, timestamp)?;\n"}]}},{"Replacement":{"inode":{"change":5,"pos":74},"path":"pijul/src/commands/tag.rs","line":270,"ins":{"up_context":[{"change":5,"pos":4613}],"down_context":[{"change":5,"pos":4624}],"flag":"BLOCK","start":143,"end":160,"inode":{"change":5,"pos":74}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":4613},"to":{"change":5,"start":4613,"end":4624},"introduced_by":5}],"inode":{"change":5,"pos":74}},"ins_contents":[{"Add":"async fn header("}],"del_contents":[{"Del":"fn header(\n"}]}},{"Replacement":{"inode":{"change":5,"pos":74},"path":"pijul/src/commands/tag.rs","line":280,"ins":{"up_context":[{"change":5,"pos":13668}],"down_context":[{"change":5,"pos":1044}],"flag":"BLOCK","start":161,"end":373,"inode":{"change":5,"pos":74}},"del":{"edges":[{"previous":"","flag":"DELETED","from":{"change":5,"pos":44},"to":{"change":5,"start":757,"end":1002},"introduced_by":5},{"previous":"","flag":"DELETED","from":{"change":5,"pos":13668},"to":{"change":5,"start":757,"end":1002},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":757},"to":{"change":5,"start":757,"end":1002},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":1002},"to":{"change":5,"start":13669,"end":13820},"introduced_by":5},{"previous":"","flag":"DELETED","from":{"change":5,"pos":84},"to":{"change":5,"start":1034,"end":1044},"introduced_by":5},{"previous":"","flag":"DELETED","from":{"change":5,"pos":13820},"to":{"change":5,"start":1034,"end":1044},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":1034},"to":{"change":5,"start":1034,"end":1044},"introduced_by":5}],"inode":{"change":5,"pos":74}},"ins_contents":[{"Add":" } else if let Some(_dir) = crate::config::global_config_dir() {"},{"Add":" let k = crate::identity::public_key(&crate::identity::choose_identity_name(false).await?)?;"},{"Add":" b.insert(\"key\".to_string(), k.key);"}],"del_contents":[{"Del":" } else if let Some(mut dir) = crate::config::global_config_dir() {\n dir.push(\"publickey.json\");\n if let Ok(key) = std::fs::File::open(&dir) {\n let k: libpijul::key::PublicKey = serde_json::from_reader(key).unwrap();\n"},{"Del":" b.insert(\"key\".to_string(), k.key);\n } else {\n bail!(\"No identity configured yet. Please use `pijul key` to create one\")\n"},{"Del":" }\n"}]}},{"Edit":{"inode":{"change":5,"pos":101759},"path":"pijul/src/commands/record.rs","line":50,"atom":{"NewVertex":{"up_context":[{"change":5,"pos":102757}],"down_context":[{"change":5,"pos":102757}],"flag":"BLOCK","start":374,"end":477,"inode":{"change":5,"pos":101759}}},"contents":[{"Add":" /// Identity to sign changes with"},{"Add":" #[clap(long = \"identity\")]"},{"Add":" pub identity: Option,"}]}},{"Replacement":{"inode":{"change":5,"pos":101759},"path":"pijul/src/commands/record.rs","line":65,"ins":{"up_context":[{"change":5,"pos":102774}],"down_context":[{"change":5,"pos":13911}],"flag":"BLOCK","start":478,"end":536,"inode":{"change":5,"pos":101759}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":102774},"to":{"change":5,"start":1370,"end":1422},"introduced_by":5}],"inode":{"change":5,"pos":101759}},"ins_contents":[{"Add":" pub async fn run(self) -> Result<(), anyhow::Error> {"}],"del_contents":[{"Del":" pub fn run(self) -> Result<(), anyhow::Error> {\n"}]}},{"Replacement":{"inode":{"change":5,"pos":101759},"path":"pijul/src/commands/record.rs","line":132,"ins":{"up_context":[{"change":5,"pos":104017}],"down_context":[{"change":5,"pos":104043}],"flag":"BLOCK","start":537,"end":570,"inode":{"change":5,"pos":101759}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":104017},"to":{"change":5,"start":203,"end":230},"introduced_by":5}],"inode":{"change":5,"pos":101759}},"ins_contents":[{"Add":" self.header().await?"}],"del_contents":[{"Del":" self.header()?\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":571,"end":727,"inode":{"change":5,"pos":101759}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":1069},"to":{"change":4,"start":0,"end":43},"introduced_by":4}],"inode":{"change":5,"pos":101759}},"ins_contents":[{"Add":" let (_, key) = crate::identity::decrypt_secret_key("},{"Add":" &crate::identity::choose_identity_name(false).await?,"},{"Add":" None,"},{"Add":" )?;"}],"del_contents":[{"Del":" let (_, key) = super::load_key()?;\n"}]}},{"Edit":{"inode":{"change":5,"pos":101759},"path":"pijul/src/commands/record.rs","line":176,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":14174},"to":{"change":5,"start":14174,"end":14266},"introduced_by":5}],"inode":{"change":5,"pos":101759}}},"contents":[{"Del":" path.push(\"publickey.json\");\n std::fs::File::create(&path)?;\n"}]}},{"Replacement":{"inode":{"change":5,"pos":101759},"path":"pijul/src/commands/record.rs","line":210,"ins":{"up_context":[{"change":5,"pos":105380}],"down_context":[{"change":5,"pos":293}],"flag":"BLOCK","start":728,"end":796,"inode":{"change":5,"pos":101759}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":105380},"to":{"change":5,"start":231,"end":293},"introduced_by":5}],"inode":{"change":5,"pos":101759}},"ins_contents":[{"Add":" async fn header(&self) -> Result {"}],"del_contents":[{"Del":" fn header(&self) -> Result {\n"}]}},{"Replacement":{"inode":{"change":5,"pos":101759},"path":"pijul/src/commands/record.rs","line":216,"ins":{"up_context":[{"change":5,"pos":14377}],"down_context":[{"change":5,"pos":2488}],"flag":"BLOCK","start":797,"end":1111,"inode":{"change":5,"pos":101759}},"del":{"edges":[{"previous":"","flag":"DELETED","from":{"change":5,"pos":129},"to":{"change":5,"start":2177,"end":2438},"introduced_by":5},{"previous":"","flag":"DELETED","from":{"change":5,"pos":14377},"to":{"change":5,"start":2177,"end":2438},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":2177},"to":{"change":5,"start":2177,"end":2438},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":2438},"to":{"change":5,"start":14378,"end":14430},"introduced_by":5},{"previous":"","flag":"DELETED","from":{"change":5,"pos":14430},"to":{"change":5,"start":173,"end":284},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":173},"to":{"change":5,"start":173,"end":284},"introduced_by":5},{"previous":"","flag":"DELETED","from":{"change":5,"pos":284},"to":{"change":5,"start":2474,"end":2488},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":2474},"to":{"change":5,"start":2474,"end":2488},"introduced_by":5}],"inode":{"change":5,"pos":101759}},"ins_contents":[{"Add":" } else {"},{"Add":" let public_key = crate::identity::public_key("},{"Add":" &self"},{"Add":" .identity"},{"Add":" .clone()"},{"Add":" .unwrap_or(crate::identity::choose_identity_name(false).await?),"},{"Add":" );"},{"Add":" b.insert(\"key\".to_string(), public_key?.key);"}],"del_contents":[{"Del":" } else if let Some(mut dir) = crate::config::global_config_dir() {\n dir.push(\"publickey.json\");\n if let Ok(key) = std::fs::File::open(&dir) {\n let k: libpijul::key::PublicKey = serde_json::from_reader(key).unwrap();\n"},{"Del":" b.insert(\"key\".to_string(), k.key);\n"},{"Del":" } else {\n bail!(\"No identity configured yet. Please use `pijul key` to create one\")\n"},{"Del":" }\n"}]}},{"Edit":{"inode":{"change":5,"pos":101759},"path":"pijul/src/commands/record.rs","line":225,"atom":{"NewVertex":{"up_context":[{"change":5,"pos":2498}],"down_context":[{"change":5,"pos":14431}],"flag":"BLOCK","start":1112,"end":1113,"inode":{"change":5,"pos":101759}}},"contents":[{"Add":""}]}},{"Replacement":{"inode":{"change":5,"pos":123281},"path":"pijul/src/commands/protocol.rs","line":12,"ins":{"up_context":[{"change":5,"pos":15149}],"down_context":[{"change":5,"pos":123476}],"flag":"BLOCK","start":1114,"end":1145,"inode":{"change":5,"pos":123281}},"del":{"edges":[{"previous":"","flag":"DELETED","from":{"change":5,"pos":3078},"to":{"change":5,"start":1962,"end":1987},"introduced_by":5},{"previous":"","flag":"DELETED","from":{"change":5,"pos":15149},"to":{"change":5,"start":1962,"end":1987},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":123476},"to":{"change":5,"start":1962,"end":1987},"introduced_by":5}],"inode":{"change":5,"pos":123281}},"ins_contents":[{"Add":"use log::{debug, error, warn};"}],"del_contents":[{"Del":"use log::{debug, error};\n"}]}},{"Edit":{"inode":{"change":5,"pos":123281},"path":"pijul/src/commands/protocol.rs","line":374,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":359},"to":{"change":5,"start":359,"end":752},"introduced_by":5}],"inode":{"change":5,"pos":123281}}},"contents":[{"Del":"fn get_public_key() -> Result {\n if let Some(mut dir) = crate::config::global_config_dir() {\n dir.push(\"publickey.json\");\n if let Ok(mut pkf) = std::fs::File::open(&dir) {\n if let Ok(pkf) = serde_json::from_reader(&mut pkf) {\n return Ok(pkf);\n }\n }\n }\n bail!(\"No public key found\")\n}\n\n"}]}},{"Replacement":{"inode":{"change":5,"pos":123281},"path":"pijul/src/commands/protocol.rs","line":391,"ins":{"up_context":[{"change":5,"pos":1259}],"down_context":[{"change":5,"pos":2178}],"flag":"BLOCK","start":1146,"end":1239,"inode":{"change":5,"pos":123281}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":1259},"to":{"change":5,"start":1259,"end":1864},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":1864},"to":{"change":5,"start":1864,"end":1915},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":1915},"to":{"change":5,"start":1915,"end":2178},"introduced_by":5}],"inode":{"change":5,"pos":123281}},"ins_contents":[{"Add":" warn!(\"Skipping serializing old public key format.\");"},{"Add":" return Ok(());"}],"del_contents":[{"Del":" let public_key: libpijul::key::PublicKey = if let Ok(pk) = get_public_key() {\n pk\n } else {\n return Ok(());\n };\n if !done.insert(public_key.key.clone()) {\n return Ok(());\n }\n if let Ok((config, last_modified)) = crate::config::Global::load() {\n serde_json::to_writer(\n &mut o,\n &crate::Identity {\n public_key,\n email: config.author.email,\n name: config.author.full_name,\n"},{"Del":" login: config.author.name,\n"},{"Del":" origin: String::new(),\n last_modified,\n },\n )\n .unwrap();\n writeln!(o)?;\n } else {\n debug!(\"no global config\");\n }\n"}]}},{"Replacement":{"inode":{"change":5,"pos":133619},"path":"pijul/src/commands/mod.rs","line":59,"ins":{"up_context":[{"change":5,"pos":91}],"down_context":[{"change":5,"pos":2547}],"flag":"BLOCK","start":1240,"end":1275,"inode":{"change":5,"pos":133619}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":91},"to":{"change":5,"start":2522,"end":2547},"introduced_by":5}],"inode":{"change":5,"pos":133619}},"ins_contents":[{"Add":"mod identity;"},{"Add":"pub use identity::*;"}],"del_contents":[{"Del":"mod key;\npub use key::*;\n"}]}},{"Replacement":{"inode":{"change":5,"pos":133619},"path":"pijul/src/commands/mod.rs","line":280,"ins":{"up_context":[{"change":5,"pos":357}],"down_context":[{"change":5,"pos":398}],"flag":"BLOCK","start":1276,"end":1324,"inode":{"change":5,"pos":133619}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":357},"to":{"change":5,"start":357,"end":398},"introduced_by":5}],"inode":{"change":5,"pos":133619}},"ins_contents":[{"Add":"#[derive(Clone, Debug, Serialize, Deserialize)]"}],"del_contents":[{"Del":"#[derive(Debug, Serialize, Deserialize)]\n"}]}},{"Edit":{"inode":{"change":5,"pos":133619},"path":"pijul/src/commands/mod.rs","line":282,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":420},"to":{"change":5,"start":19978,"end":20024},"introduced_by":5}],"inode":{"change":5,"pos":133619}}},"contents":[{"Del":" pub public_key: libpijul::key::PublicKey,\n"}]}},{"Edit":{"inode":{"change":5,"pos":133619},"path":"pijul/src/commands/mod.rs","line":291,"atom":{"NewVertex":{"up_context":[{"change":5,"pos":20225}],"down_context":[{"change":5,"pos":20225}],"flag":"BLOCK","start":1325,"end":1371,"inode":{"change":5,"pos":133619}}},"contents":[{"Add":" pub public_key: libpijul::key::PublicKey,"}]}},{"Edit":{"inode":{"change":5,"pos":133619},"path":"pijul/src/commands/mod.rs","line":294,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":20228},"to":{"change":4,"start":67,"end":157},"introduced_by":4},{"previous":"","flag":"DELETED","from":{"change":4,"pos":157},"to":{"change":5,"start":20290,"end":20787},"introduced_by":4},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":20290},"to":{"change":5,"start":20290,"end":20787},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":20787},"to":{"change":4,"start":158,"end":229},"introduced_by":4},{"previous":"","flag":"DELETED","from":{"change":4,"pos":229},"to":{"change":5,"start":20828,"end":21042},"introduced_by":4},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":20828},"to":{"change":5,"start":20828,"end":21042},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":21042},"to":{"change":5,"start":60,"end":69},"introduced_by":5}],"inode":{"change":5,"pos":133619}}},"contents":[{"Del":"fn load_key() -> Result<(libpijul::key::SecretKey, libpijul::key::SKey), anyhow::Error> {\n"},{"Del":" if let Some(mut dir) = crate::config::global_config_dir() {\n dir.push(\"secretkey.json\");\n if let Ok(key) = std::fs::File::open(&dir) {\n let k: libpijul::key::SecretKey = serde_json::from_reader(key)?;\n let pass = if k.encryption.is_some() {\n Some(rpassword::read_password_from_tty(Some(&format!(\n \"Password for {:?}: \",\n dir\n )))?)\n } else {\n None\n };\n"},{"Del":" let sk = k.load(pass.as_deref())?;\n Ok((k, sk))\n"},{"Del":" } else {\n bail!(\"Secret key not found, please use `pijul key generate` and try again\")\n }\n } else {\n bail!(\"Secret key not found, please use `pijul key generate` and try again\")\n"},{"Del":" }\n}\n\n"}]}},{"Edit":{"inode":{"change":5,"pos":134376},"path":"pijul/src/commands/log.rs","line":84,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":244},"to":{"change":4,"start":244,"end":466},"introduced_by":4}],"inode":{"change":5,"pos":134376}}},"contents":[{"Del":" let mut global_id_path = crate::config::global_config_dir();\n if let Some(ref mut gl) = global_id_path {\n gl.push(\"identities\")\n }\n debug!(\"global_id_path = {:?}\", global_id_path);\n\n"}]}},{"Edit":{"inode":{"change":5,"pos":134376},"path":"pijul/src/commands/log.rs","line":89,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":1608},"to":{"change":4,"start":467,"end":495},"introduced_by":4}],"inode":{"change":5,"pos":134376}}},"contents":[{"Del":" global_id_path,\n"}]}},{"Edit":{"inode":{"change":5,"pos":134376},"path":"pijul/src/commands/log.rs","line":267,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":7422},"to":{"change":4,"start":496,"end":533},"introduced_by":4}],"inode":{"change":5,"pos":134376}}},"contents":[{"Del":" global_id_path: Option,\n"}]}},{"Edit":{"inode":{"change":5,"pos":134376},"path":"pijul/src/commands/log.rs","line":316,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":10433},"to":{"change":4,"start":536,"end":598},"introduced_by":4}],"inode":{"change":5,"pos":134376}}},"contents":[{"Del":" let mut global_id_path = self.global_id_path.clone();\n"}]}},{"Replacement":{"inode":{"change":5,"pos":134376},"path":"pijul/src/commands/log.rs","line":336,"ins":{"up_context":[{"change":5,"pos":1350}],"down_context":[{"change":5,"pos":1482}],"flag":"BLOCK","start":1372,"end":1504,"inode":{"change":5,"pos":134376}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":1350},"to":{"change":4,"start":599,"end":871},"introduced_by":4}],"inode":{"change":5,"pos":134376}},"ins_contents":[{"Add":" let entry ="},{"Add":" self.mk_log_entry(&mut authors, &mut id_path, h.into(), Some(mrk.into()))?;"}],"del_contents":[{"Del":" let entry = self.mk_log_entry(\n &mut authors,\n &mut id_path,\n &mut global_id_path,\n h.into(),\n Some(mrk.into()),\n )?;\n"}]}},{"Edit":{"inode":{"change":5,"pos":134376},"path":"pijul/src/commands/log.rs","line":359,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":12405},"to":{"change":4,"start":872,"end":918},"introduced_by":4}],"inode":{"change":5,"pos":134376}}},"contents":[{"Del":" global_id_path: &mut Option,\n"}]}},{"Replacement":{"inode":{"change":5,"pos":134376},"path":"pijul/src/commands/log.rs","line":382,"ins":{"up_context":[{"change":5,"pos":13299}],"down_context":[{"change":4,"pos":1745}],"flag":"BLOCK","start":1505,"end":1862,"inode":{"change":5,"pos":134376}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":13299},"to":{"change":4,"start":995,"end":1745},"introduced_by":4}],"inode":{"change":5,"pos":134376}},"ins_contents":[{"Add":" debug!(\"{:?}\", id);"},{"Add":" if let Ok(identities) = crate::identity::Complete::load_all() {"},{"Add":" for identity in identities {"},{"Add":" if &identity.identity.public_key.key == e.key() {"},{"Add":" id = Some(identity.identity);"}],"del_contents":[{"Del":" debug!(\"{:?} {:?}\", global_id_path, id);\n if let Some(ref mut global_id_path) = global_id_path {\n if id.is_none() {\n global_id_path.push(e.key());\n debug!(\"{:?}\", global_id_path);\n if let Ok(f) = std::fs::File::open(&global_id_path) {\n if let Ok(id_) = serde_json::from_reader(f) {\n id = Some(id_)\n } else {\n debug!(\"wrong identity for {:?}\", e.key());\n }\n"}]}},{"Edit":{"inode":{"change":5,"pos":134376},"path":"pijul/src/commands/log.rs","line":388,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":1783},"to":{"change":4,"start":1783,"end":1841},"introduced_by":4}],"inode":{"change":5,"pos":134376}}},"contents":[{"Del":" global_id_path.pop();\n"}]}},{"Replacement":{"inode":{"change":5,"pos":25380},"path":"pijul/src/remote/ssh.rs","line":3,"ins":{"up_context":[{"change":5,"pos":25667}],"down_context":[{"change":5,"pos":0}],"flag":"BLOCK","start":1863,"end":1887,"inode":{"change":5,"pos":25380}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":25667},"to":{"change":5,"start":25667,"end":25699},"introduced_by":5}],"inode":{"change":5,"pos":25380}},"ins_contents":[{"Add":"use std::path::PathBuf;"}],"del_contents":[{"Del":"use std::path::{Path, PathBuf};\n"}]}},{"Replacement":{"inode":{"change":5,"pos":25380},"path":"pijul/src/remote/ssh.rs","line":123,"ins":{"up_context":[{"change":2,"pos":138}],"down_context":[{"change":2,"pos":233}],"flag":"BLOCK","start":1888,"end":2291,"inode":{"change":5,"pos":25380}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":2,"pos":138},"to":{"change":2,"start":138,"end":233},"introduced_by":2}],"inode":{"change":5,"pos":25380}},"ins_contents":[{"Add":" let mut stderr = std::io::stderr();"},{"Add":" writeln!(stderr, \"Warning: Unable to automatically authenticate with server. Please make sure your SSH keys have been uploaded to the Nest.\")?;"},{"Add":" writeln!(stderr, \"For more information, please visit https://pijul.org/manual/the_nest/public_keys.html#ssh-public-keys\")?;"},{"Add":""},{"Add":" self.auth_password(&mut h).await?"}],"del_contents":[{"Del":" self.auth_pk(&mut h, &mut key_path).await || self.auth_password(&mut h).await?\n"}]}},{"Replacement":{"inode":{"change":5,"pos":25380},"path":"pijul/src/remote/ssh.rs","line":133,"ins":{"up_context":[{"change":5,"pos":28303}],"down_context":[{"change":5,"pos":28359}],"flag":"BLOCK","start":2292,"end":2378,"inode":{"change":5,"pos":25380}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":28303},"to":{"change":5,"start":7903,"end":7942},"introduced_by":5}],"inode":{"change":5,"pos":25380}},"ins_contents":[{"Add":" bail!(\"Not authenticated. Please check your credentials and try again.\");"}],"del_contents":[{"Del":" bail!(\"Not authenticated\")\n"}]}},{"Edit":{"inode":{"change":5,"pos":25380},"path":"pijul/src/remote/ssh.rs","line":211,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":30396},"to":{"change":5,"start":30396,"end":30403},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":30403},"to":{"change":5,"start":344,"end":481},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":481},"to":{"change":5,"start":0,"end":63},"introduced_by":5},{"previous":"","flag":"DELETED","from":{"change":5,"pos":63},"to":{"change":5,"start":30498,"end":30537},"introduced_by":5},{"previous":"","flag":"DELETED","from":{"change":5,"pos":481},"to":{"change":5,"start":30498,"end":30537},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":30498},"to":{"change":5,"start":30498,"end":30537},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":30537},"to":{"change":5,"start":1618,"end":1878},"introduced_by":5},{"previous":"","flag":"DELETED","from":{"change":5,"pos":1878},"to":{"change":5,"start":30582,"end":30825},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":30582},"to":{"change":5,"start":30582,"end":30825},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":30825},"to":{"change":5,"start":1879,"end":1951},"introduced_by":5},{"previous":"","flag":"DELETED","from":{"change":5,"pos":1951},"to":{"change":5,"start":30898,"end":31112},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":30898},"to":{"change":5,"start":30898,"end":31112},"introduced_by":5}],"inode":{"change":5,"pos":25380}}},"contents":[{"Del":" }\n\n"},{"Del":" async fn auth_pk(\n &self,\n h: &mut thrussh::client::Handle,\n key_path: &mut PathBuf,\n ) -> bool {\n"},{"Del":" if h.is_closed() {\n return false;\n }\n"},{"Del":" let mut authenticated = false;\n"},{"Del":" let mut keys = Vec::new();\n if let Some(ref file) = self.config.identity_file {\n keys.push(file.as_str())\n } else {\n keys.push(\"id_ed25519\");\n keys.push(\"id_rsa\");\n }\n for k in keys.iter() {\n"},{"Del":" key_path.push(k);\n let k = if let Some(k) = load_secret_key(&key_path, k) {\n k\n } else {\n key_path.pop();\n continue;\n };\n if let Ok(auth) = h\n"},{"Del":" .authenticate_publickey(&self.config.user, Arc::new(k))\n"},{"Del":" .await\n {\n authenticated = auth\n }\n key_path.pop();\n if authenticated {\n return true;\n }\n }\n false\n"}]}},{"Edit":{"inode":{"change":5,"pos":25380},"path":"pijul/src/remote/ssh.rs","line":220,"atom":{"EdgeMap":{"edges":[{"previous":"","flag":"DELETED","from":{"change":5,"pos":131},"to":{"change":5,"start":31219,"end":31323},"introduced_by":5},{"previous":"","flag":"DELETED","from":{"change":5,"pos":617},"to":{"change":5,"start":31219,"end":31323},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":31219},"to":{"change":5,"start":31219,"end":31323},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":31323},"to":{"change":5,"start":1952,"end":2004},"introduced_by":5},{"previous":"","flag":"DELETED","from":{"change":5,"pos":2004},"to":{"change":5,"start":31356,"end":31370},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":31356},"to":{"change":5,"start":31356,"end":31370},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":31370},"to":{"change":5,"start":2005,"end":2093},"introduced_by":5},{"previous":"","flag":"DELETED","from":{"change":5,"pos":2093},"to":{"change":5,"start":31438,"end":31446},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":31438},"to":{"change":5,"start":31438,"end":31446},"introduced_by":5}],"inode":{"change":5,"pos":25380}}},"contents":[{"Del":" let pass = rpassword::read_password_from_tty(Some(&format!(\n \"Password for {}@{}: \",\n"},{"Del":" self.config.user, self.config.host_name\n"},{"Del":" )))?;\n"},{"Del":" h.authenticate_password(self.config.user.to_string(), &pass)\n .await\n"},{"Del":" }\n}\n"}]}},{"Replacement":{"inode":{"change":5,"pos":25380},"path":"pijul/src/remote/ssh.rs","line":221,"ins":{"up_context":[{"change":5,"pos":31447}],"down_context":[{"change":5,"pos":32203}],"flag":"BLOCK","start":2379,"end":3848,"inode":{"change":5,"pos":25380}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":31447},"to":{"change":5,"start":238,"end":406},"introduced_by":5},{"previous":"","flag":"DELETED","from":{"change":5,"pos":406},"to":{"change":5,"start":31595,"end":31641},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":31595},"to":{"change":5,"start":31595,"end":31641},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":31641},"to":{"change":5,"start":618,"end":679},"introduced_by":5},{"previous":"","flag":"DELETED","from":{"change":5,"pos":679},"to":{"change":5,"start":31717,"end":32070},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":31717},"to":{"change":5,"start":31717,"end":32070},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":32070},"to":{"change":5,"start":0,"end":87},"introduced_by":5},{"previous":"","flag":"DELETED","from":{"change":5,"pos":87},"to":{"change":5,"start":32167,"end":32203},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":32167},"to":{"change":5,"start":32167,"end":32203},"introduced_by":5}],"inode":{"change":5,"pos":25380}},"ins_contents":[{"Add":" // Authentication can be attempted multiple times"},{"Add":" let mut authenticated = false;"},{"Add":" let username = format!(\"{}@{}\", self.config.user, self.config.host_name);"},{"Add":""},{"Add":" // Try authenticate using the user's keyring"},{"Add":" if let Ok(password) = keyring::Entry::new(\"pijul\", &username).get_password() {"},{"Add":" authenticated = h"},{"Add":" .authenticate_password(self.config.user.to_string(), &password)"},{"Add":" .await?;"},{"Add":" }"},{"Add":""},{"Add":" // Try authenticate using user's password"},{"Add":" if !authenticated {"},{"Add":" let password = dialoguer::Password::with_theme("},{"Add":" crate::config::load_theme()"},{"Add":" .expect(\"Could not load config\")"},{"Add":" .as_ref(),"},{"Add":" )"},{"Add":" .with_prompt(format!(\"Password for {username}\"))"},{"Add":" .allow_empty_password(true)"},{"Add":" .interact()"},{"Add":" .unwrap();"},{"Add":""},{"Add":" authenticated = h"},{"Add":" .authenticate_password(self.config.user.to_string(), &password)"},{"Add":" .await?;"},{"Add":""},{"Add":" // If the new password is valid, update the keyring to match"},{"Add":" if authenticated {"},{"Add":" match keyring::Entry::new(\"pijul\", &username).set_password(&password) {"},{"Add":" Err(e) => writeln!("},{"Add":" std::io::stderr(),"},{"Add":" \"Warning: could not write new password to keychain: {e}\""},{"Add":" )"},{"Add":" .unwrap(),"},{"Add":" _ => (),"}],"del_contents":[{"Del":"pub fn load_secret_key>(key_path: P, k: &str) -> Option {\n match thrussh_keys::load_secret_key(key_path.as_ref(), None) {\n"},{"Del":" Ok(k) => Some(k),\n Err(e) => {\n"},{"Del":" if let thrussh_keys::Error::KeyIsEncrypted = e {\n"},{"Del":" let pass = if let Ok(pass) =\n rpassword::read_password_from_tty(Some(&format!(\"Password for key {:?}: \", k)))\n {\n pass\n } else {\n return None;\n };\n if pass.is_empty() {\n return None;\n }\n"},{"Del":" if let Ok(k) = thrussh_keys::load_secret_key(&key_path, Some(&pass)) {\n"},{"Del":" return Some(k);\n"}]}},{"Edit":{"inode":{"change":5,"pos":25380},"path":"pijul/src/remote/ssh.rs","line":259,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":32235},"to":{"change":5,"start":32235,"end":32252},"introduced_by":5}],"inode":{"change":5,"pos":25380}}},"contents":[{"Del":" None\n"}]}},{"Edit":{"inode":{"change":5,"pos":25380},"path":"pijul/src/remote/ssh.rs","line":260,"atom":{"NewVertex":{"up_context":[{"change":5,"pos":32262}],"down_context":[{"change":5,"pos":32262}],"flag":"BLOCK","start":3849,"end":3876,"inode":{"change":5,"pos":25380}}},"contents":[{"Add":""},{"Add":" Ok(authenticated)"}]}},{"Replacement":{"inode":{"change":5,"pos":5013},"path":"libpijul/src/key.rs","line":19,"ins":{"up_context":[{"change":5,"pos":5695}],"down_context":[{"change":5,"pos":5729}],"flag":"BLOCK","start":3877,"end":3925,"inode":{"change":5,"pos":5013}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":5695},"to":{"change":5,"start":5695,"end":5729},"introduced_by":5}],"inode":{"change":5,"pos":5013}},"ins_contents":[{"Add":"#[derive(Clone, Debug, Serialize, Deserialize)]"}],"del_contents":[{"Del":"#[derive(Serialize, Deserialize)]\n"}]}},{"Replacement":{"inode":{"change":5,"pos":5013},"path":"libpijul/src/key.rs","line":319,"ins":{"up_context":[{"change":5,"pos":40384}],"down_context":[{"change":5,"pos":14868}],"flag":"BLOCK","start":3926,"end":3974,"inode":{"change":5,"pos":5013}},"del":{"edges":[{"previous":"","flag":"DELETED","from":{"change":5,"pos":40384},"to":{"change":5,"start":14834,"end":14868},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":14834},"to":{"change":5,"start":14834,"end":14868},"introduced_by":5}],"inode":{"change":5,"pos":5013}},"ins_contents":[{"Add":"#[derive(Clone, Debug, Serialize, Deserialize)]"}],"del_contents":[{"Del":"#[derive(Serialize, Deserialize)]\n"}]}},{"Replacement":{"inode":{"change":5,"pos":5013},"path":"libpijul/src/key.rs","line":324,"ins":{"up_context":[{"change":5,"pos":14910}],"down_context":[{"change":5,"pos":14944}],"flag":"BLOCK","start":3975,"end":4023,"inode":{"change":5,"pos":5013}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":14910},"to":{"change":5,"start":14910,"end":14944},"introduced_by":5}],"inode":{"change":5,"pos":5013}},"ins_contents":[{"Add":"#[derive(Clone, Debug, Serialize, Deserialize)]"}],"del_contents":[{"Del":"#[derive(Serialize, Deserialize)]\n"}]}}],"owner":"irevoire","repo":"pijul","token":"l9oYxgYYC6+R0OF8FIihtyizY+xwmwjT/xBcK2RT5Vo=","login":null}

…

Dependencies

Change contents