{"header":{"message":"identities: Add store/load for forge identities","description":null,"timestamp":"2023-10-13T11:23:56.289600091Z","authors":[{}]},"hash":"PHZUP2AONLUTA5FYRFTBGGZ23JWRADCREFLOT6IXGBY4S2XI7QIAC","authors":[{"login":"kim","key":"GatQwNAvmxN5tCNcwspWc3AJdZydkGgDErEEr6JJLffY"}],"deps":{"hashes":[["PHZUP2AONLUTA5FYRFTBGGZ23JWRADCREFLOT6IXGBY4S2XI7QIAC","identities: Add store/load for forge identities"],["AA",null],["QZ5HE3YCM4QPKQDF2XUHI7IASJ5PYGMKTF4JVWM3TLRIWGEIM5QQC","identities: Intial support for forge keys (gh, glab)"],["U63IONGETCB4NUGTSWYUJQMZNR5O6ZZKIPPBYJPBGVLAFXSFDNOAC","Start dabbling"],["HGDC5V5PNOXYZ4NM66GEQ2AQZ7FHQ4FYWTSFV3Z5Y3MTFVKAJXGQC","identities: Initial support for pijul identities"]],"deps":["QZ5HE3YCM4QPKQDF2XUHI7IASJ5PYGMKTF4JVWM3TLRIWGEIM5QQC"],"known":["U63IONGETCB4NUGTSWYUJQMZNR5O6ZZKIPPBYJPBGVLAFXSFDNOAC"]},"hunks":[{"Replacement":{"inode":{"change":2,"pos":99},"path":"nestje-identities/src/forge.rs","line":5,"ins":{"up_context":[{"change":2,"pos":207}],"down_context":[{"change":2,"pos":257}],"flag":"BLOCK","start":0,"end":144,"inode":{"change":2,"pos":99}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":2,"pos":207},"to":{"change":2,"start":207,"end":257},"introduced_by":2}],"inode":{"change":2,"pos":99}},"ins_contents":[{"Add":"use std::{"},{"Add":" collections::{"},{"Add":" HashMap,"},{"Add":" HashSet,"},{"Add":" },"},{"Add":" fs,"},{"Add":" io::Write,"},{"Add":" path::{"},{"Add":" Path,"},{"Add":" PathBuf,"},{"Add":" },"}],"del_contents":[{"Del":"use std::collections::{\n HashMap,\n HashSet,\n"}]}},{"Edit":{"inode":{"change":2,"pos":99},"path":"nestje-identities/src/forge.rs","line":18,"atom":{"NewVertex":{"up_context":[{"change":2,"pos":261}],"down_context":[{"change":2,"pos":261}],"flag":"BLOCK","start":145,"end":200,"inode":{"change":2,"pos":99}}},"contents":[{"Add":"use pgp::{"},{"Add":" types::KeyTrait,"},{"Add":" Deserializable,"},{"Add":"};"}]}},{"Edit":{"inode":{"change":2,"pos":99},"path":"nestje-identities/src/forge.rs","line":41,"atom":{"NewVertex":{"up_context":[{"change":2,"pos":570}],"down_context":[{"change":2,"pos":570}],"flag":"BLOCK","start":201,"end":221,"inode":{"change":2,"pos":99}}},"contents":[{"Add":"use tracing::debug;"}]}},{"Replacement":{"inode":{"change":2,"pos":99},"path":"nestje-identities/src/forge.rs","line":46,"ins":{"up_context":[{"change":2,"pos":596}],"down_context":[{"change":2,"pos":626}],"flag":"BLOCK","start":222,"end":352,"inode":{"change":2,"pos":99}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":2,"pos":596},"to":{"change":2,"start":596,"end":626},"introduced_by":2}],"inode":{"change":2,"pos":99}},"ins_contents":[{"Add":"pub type Error = anyhow::Error;"},{"Add":"pub type Result = std::result::Result;"},{"Add":""},{"Add":"#[derive(Clone, Copy, Debug, Eq, PartialEq)]"}],"del_contents":[{"Del":"#[derive(Clone, Copy, Debug)]\n"}]}},{"Edit":{"inode":{"change":2,"pos":99},"path":"nestje-identities/src/forge.rs","line":55,"atom":{"NewVertex":{"up_context":[{"change":2,"pos":673}],"down_context":[{"change":2,"pos":673}],"flag":"BLOCK","start":353,"end":576,"inode":{"change":2,"pos":99}}},"contents":[{"Add":"impl Platform {"},{"Add":" fn as_path(&self) -> &Path {"},{"Add":" match self {"},{"Add":" Self::Github => Path::new(\"github.com\"),"},{"Add":" Self::Gitlab => Path::new(\"gitlab.com\"),"},{"Add":" }"},{"Add":" }"},{"Add":"}"},{"Add":""},{"Add":"#[derive(Clone, PartialEq)]"}]}},{"Replacement":{"inode":{"change":2,"pos":99},"path":"nestje-identities/src/forge.rs","line":94,"ins":{"up_context":[{"change":2,"pos":1488}],"down_context":[{"change":2,"pos":1573}],"flag":"BLOCK","start":577,"end":654,"inode":{"change":2,"pos":99}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":2,"pos":1488},"to":{"change":2,"start":1488,"end":1573},"introduced_by":2}],"inode":{"change":2,"pos":99}},"ins_contents":[{"Add":" pub async fn resolve(platform: Platform, username: S) -> Result"}],"del_contents":[{"Del":" pub async fn resolve(platform: Platform, username: S) -> anyhow::Result\n"}]}},{"Edit":{"inode":{"change":2,"pos":99},"path":"nestje-identities/src/forge.rs","line":111,"atom":{"NewVertex":{"up_context":[{"change":2,"pos":2085}],"down_context":[{"change":2,"pos":2085}],"flag":"BLOCK","start":655,"end":3690,"inode":{"change":2,"pos":99}}},"contents":[{"Add":""},{"Add":" #[tracing::instrument(skip(root))]"},{"Add":" pub fn load("},{"Add":" root: impl Into,"},{"Add":" platform: Platform,"},{"Add":" username: String,"},{"Add":" ) -> Result> {"},{"Add":" let mut root: PathBuf = root.into();"},{"Add":" root.push(\"identities\");"},{"Add":" root.push(platform.as_path());"},{"Add":" root.push(&username);"},{"Add":""},{"Add":" if !root.try_exists()? {"},{"Add":" return Ok(None);"},{"Add":" }"},{"Add":""},{"Add":" let mut ssh = HashSet::new();"},{"Add":" let mut gpg = HashMap::new();"},{"Add":""},{"Add":" debug!(\"Loading keys from {}\", root.display());"},{"Add":" for entry in fs::read_dir(&root)? {"},{"Add":" let entry = entry?;"},{"Add":" let path = entry.path();"},{"Add":" match path.extension().and_then(|os| os.to_str()) {"},{"Add":" Some(\"ssh\") => {"},{"Add":" let key = ssh::PublicKey::read_openssh_file(&path)?;"},{"Add":" debug!(\"Read SSH key from {}\", path.display());"},{"Add":" ssh.insert(key);"},{"Add":" },"},{"Add":" Some(\"gpg\") => {"},{"Add":" let ascii = fs::read_to_string(&path)?;"},{"Add":" let (key, _) = gpg::SignedPublicKey::from_string(&ascii)?;"},{"Add":" debug!(\"Read GPG key from {}\", path.display());"},{"Add":" gpg.insert(key.fingerprint(), key);"},{"Add":" },"},{"Add":""},{"Add":" _ => {},"},{"Add":" }"},{"Add":" }"},{"Add":""},{"Add":" Ok(Some(Self {"},{"Add":" platform,"},{"Add":" username,"},{"Add":" ssh,"},{"Add":" gpg,"},{"Add":" }))"},{"Add":" }"},{"Add":""},{"Add":" #[tracing::instrument(skip_all, fields(platform = ?self.platform, username = self.username))]"},{"Add":" pub fn store(&self, root: impl Into) -> Result<()> {"},{"Add":" let mut root: PathBuf = root.into();"},{"Add":" root.push(\"identities\");"},{"Add":" root.push(self.platform.as_path());"},{"Add":" root.push(&self.username);"},{"Add":""},{"Add":" fs::create_dir_all(&root)?;"},{"Add":""},{"Add":" for key in &self.ssh {"},{"Add":" let fp = key.fingerprint(ssh::HashAlg::Sha512);"},{"Add":" root.push(bs58::encode(fp.as_bytes()).into_string());"},{"Add":" root.set_extension(\"tmp\");"},{"Add":""},{"Add":" let mut file = fs::File::options()"},{"Add":" .create_new(true)"},{"Add":" .write(true)"},{"Add":" .open(&root)?;"},{"Add":" let key = key.to_openssh()?;"},{"Add":" file.write_all(key.as_bytes())?;"},{"Add":" file.sync_all()?;"},{"Add":" drop(file);"},{"Add":" let target = root.with_extension(\"ssh\");"},{"Add":" fs::rename(&root, &target)?;"},{"Add":" debug!(\"Wrote SSH key to {}\", target.display());"},{"Add":""},{"Add":" root.pop();"},{"Add":" }"},{"Add":""},{"Add":" for (fp, key) in &self.gpg {"},{"Add":" root.push(hex::encode_upper(fp));"},{"Add":" root.set_extension(\"tmp\");"},{"Add":""},{"Add":" let mut file = fs::File::options()"},{"Add":" .create_new(true)"},{"Add":" .write(true)"},{"Add":" .open(&root)?;"},{"Add":" key.to_armored_writer(&mut file, None)?;"},{"Add":" file.sync_all()?;"},{"Add":" drop(file);"},{"Add":" let target = root.with_extension(\"gpg\");"},{"Add":" fs::rename(&root, &target)?;"},{"Add":" debug!(\"Wrote GPG key to {}\", target.display());"},{"Add":""},{"Add":" root.pop();"},{"Add":" }"},{"Add":""},{"Add":" Ok(())"},{"Add":" }"}]}},{"Edit":{"inode":{"change":2,"pos":2140},"path":"nestje-identities/src/forge/tests.rs","line":4,"atom":{"NewVertex":{"up_context":[{"change":2,"pos":2233}],"down_context":[{"change":2,"pos":2233}],"flag":"BLOCK","start":3691,"end":3714,"inode":{"change":2,"pos":2140}}},"contents":[{"Add":"use tempfile::tempdir;"}]}},{"Edit":{"inode":{"change":2,"pos":2140},"path":"nestje-identities/src/forge/tests.rs","line":6,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":2,"pos":2253},"to":{"change":2,"start":2253,"end":2272},"introduced_by":2}],"inode":{"change":2,"pos":2140}}},"contents":[{"Del":"use tracing::info;\n"}]}},{"Edit":{"inode":{"change":2,"pos":2140},"path":"nestje-identities/src/forge/tests.rs","line":22,"atom":{"NewVertex":{"up_context":[{"change":2,"pos":2651}],"down_context":[{"change":2,"pos":2651}],"flag":"BLOCK","start":3715,"end":3750,"inode":{"change":2,"pos":2140}}},"contents":[{"Add":""},{"Add":" let tmp = tempdir().unwrap();"}]}},{"Replacement":{"inode":{"change":2,"pos":2140},"path":"nestje-identities/src/forge/tests.rs","line":25,"ins":{"up_context":[{"change":2,"pos":2652}],"down_context":[{"change":2,"pos":2696}],"flag":"BLOCK","start":3751,"end":4161,"inode":{"change":2,"pos":2140}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":2,"pos":2652},"to":{"change":2,"start":2652,"end":2696},"introduced_by":2}],"inode":{"change":2,"pos":2140}},"ins_contents":[{"Add":" gh.store(tmp.path()).unwrap();"},{"Add":" assert_eq!("},{"Add":" gh,"},{"Add":" Identity::load(tmp.path(), Platform::Github, \"kim\".into())"},{"Add":" .unwrap()"},{"Add":" .expect(\"GH identity not found\")"},{"Add":" );"},{"Add":""},{"Add":" gl.store(tmp.path()).unwrap();"},{"Add":" assert_eq!("},{"Add":" gl,"},{"Add":" Identity::load(tmp.path(), Platform::Gitlab, \"kalt\".into())"},{"Add":" .unwrap()"},{"Add":" .expect(\"GL identity not found\")"},{"Add":" );"}],"del_contents":[{"Del":" info!(\"{gh:#?}\");\n info!(\"{gl:#?}\");\n"}]}},{"Edit":{"inode":{"change":5,"pos":7902},"path":"nestje-identities/Cargo.toml","line":13,"atom":{"NewVertex":{"up_context":[{"change":2,"pos":9563}],"down_context":[{"change":5,"pos":8104}],"flag":"BLOCK","start":4162,"end":4184,"inode":{"change":5,"pos":7902}}},"contents":[{"Add":"bs58.workspace = true"}]}},{"Edit":{"inode":{"change":3,"pos":7503},"path":"Cargo.toml","line":21,"atom":{"NewVertex":{"up_context":[{"change":3,"pos":7786}],"down_context":[{"change":5,"pos":8366}],"flag":"BLOCK","start":4185,"end":4198,"inode":{"change":3,"pos":7503}}},"contents":[{"Add":"bs58 = \"0.5\""}]}},{"Edit":{"inode":{"change":3,"pos":7915},"path":"Cargo.lock","line":271,"atom":{"NewVertex":{"up_context":[{"change":3,"pos":12910}],"down_context":[{"change":3,"pos":12910}],"flag":"BLOCK","start":4199,"end":4418,"inode":{"change":3,"pos":7915}}},"contents":[{"Add":""},{"Add":"[[package]]"},{"Add":"name = \"bs58\""},{"Add":"version = \"0.5.0\""},{"Add":"source = \"registry+https://github.com/rust-lang/crates.io-index\""},{"Add":"checksum = \"f5353f36341f7451062466f0b755b96ac3a9547e4d7f6b70d603fc721a7d7896\""},{"Add":"dependencies = ["},{"Add":" \"tinyvec\","},{"Add":"]"}]}},{"Replacement":{"inode":{"change":3,"pos":7915},"path":"Cargo.lock","line":1352,"ins":{"up_context":[{"change":3,"pos":25417}],"down_context":[{"change":3,"pos":25426}],"flag":"BLOCK","start":4419,"end":4434,"inode":{"change":3,"pos":7915}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":25417},"to":{"change":3,"start":25417,"end":25426},"introduced_by":3}],"inode":{"change":3,"pos":7915}},"ins_contents":[{"Add":" \"bs58 0.4.0\","}],"del_contents":[{"Del":" \"bs58\",\n"}]}},{"Edit":{"inode":{"change":3,"pos":7915},"path":"Cargo.lock","line":1555,"atom":{"NewVertex":{"up_context":[{"change":2,"pos":26281}],"down_context":[{"change":5,"pos":10429}],"flag":"BLOCK","start":4435,"end":4450,"inode":{"change":3,"pos":7915}}},"contents":[{"Add":" \"bs58 0.5.0\","}]}}],"owner":"kim","repo":"yapma","token":"9edjeXqa467drgOL6/CIg5SbsjDFiljcE8Py08H3+wY=","login":null}

…

Dependencies

Change contents