{"header":{"message":"Remove pijul-approve (let the serve handle it)","description":null,"timestamp":"2026-07-29T06:52:49.313471417Z","authors":[{}]},"hash":"KDRE3RGR4ITABIWXTHL37FH7EDQ6YSD6INNE4YTWIZDV6C6SKQZAC","authors":[{"login":"pmeunier","key":"AAAAC3NzaC1lZDI1NTE5AAAAILagOJFgwaMNhBWQINinKOXmqS4Gh5NgxgriXwdOoINJ"}],"deps":{"hashes":[["KDRE3RGR4ITABIWXTHL37FH7EDQ6YSD6INNE4YTWIZDV6C6SKQZAC","Remove pijul-approve (let the serve handle it)"],["AA",null],["SXEYMYF7P4RZMZ46WPL4IZUTSQ2ATBWYZX7QNVMS3SGOYXYOHAGQC","Fixing the bad changes in history (unfortunately, by rebooting)."],["5HF7C67M4DZMYTCIG32XEQQ662AHQMIHTHUK7TAVSO52XLMFBZPAC","push/pull: fixed \"changes\" arguments"],["62XVBWPYCBULZ2IUWF36JVHAPMKCGQC53PQQ53AAGZGC2KT7VQRQC","remove redundant Clap attributes"],["SZWBLWZ4LUJZHTSYOIGJMXM7KPCGWJFPKLHYA5MHY7UTPNLZV5KQC","Reading ~/.ssh/config"],["A3RM526Y7LUXNYW4TL56YKQ5GVOK2R5D7JJVTSQ6TT5MEXIR6YAAC","Integrating identity malleability"],["IVLLXQ5ZWZDKHO4TNQG3TPXN34H6Y2WXPAGSO4PWCYNSKUZWOEJQC","Improved push/pull reporting"],["3OW3YNZXF6DR2EI5XS7PDHUUZMARDU2JUJFJKIEWXQNSMCIBVAOQC","Dependencies completion in push and pull, updated after stabilisation of remote caches"],["DO2Y5TY5JQISUHCVNPI2FXO7WWZVJQ3LGPWF4DNADMGZRIO6PT2QC","Tag synchronisation"],["SU3JX6SEW6MLREX6CCM4V3353YC3IQD4JOZW2KEIHYTHOI2AJKPQC","Create `pijul-identity` crate"],["OYN2YVPAN6L3X6HZXJI6B2GYGL2W5AXRK6CVDJRWALS5OENNB5UAC","Create `pijul_remote` crate"],["D6N5JWOHB6IB6A74NDSWCFYTC5SGOR2D3REAOAVQKCX4YXOJQAHAC","Sort `members` in workspace `Cargo.toml`"],["YW6NICQV5LF4V2G77F2RG2ICODTQ2CKIEVBFIQEDATL5I5PFVRKQC","Migrate codebase to refactored `pijul_config` crate"],["FIMDS32ZN6OCZUBWYNKDHZJ6FNKUC7NRUC37Q45HXQRBSTDM4YSQC","Use subcommand-specific repository config paths"],["GSIAZENZ52K65JIIJBGFTLC4F6PODA6JO5PN47Y4XPZMDGGAV2LAC","Adding an \"approve\" command to review changes"],["6M4XSZ2BKS26JA4P2E4IK6I5YCT7FM62UL2CLZZI7DEK5WHD3ZAQC","An approve command to sign states (double-signed states in ISO27001)"],["TQZG3SLWOZ63WMM43DM2DCFA7F6KX3FQQ5ONHAG4ZEDXV7LA7KMQC","Version bumps"],["JVGYT2RPYZ7J3ZFXCMMN34BPRZT66Q2CO7VEBWDU7OFIF6EBIZXQC","Adding client.html"],["LKLEIPWEEQBJWJKAJLWII2TFUNUOVY75HHDNOJU5MZR54YTMGINAC","Add reusable options for repository path and channel"],["FBXYP7QM7SG6P2JDJVQPPCRKJE3GVYXNQ5GVV4GRDUNG6Q4ZRDJQC","Forgot to add remote::http"],["G65S7FAW4OHBGC6ROVPPZ6PPACKOFEM4KSMAWMYKNQF5OLVDJR2QC","Version bump and cleanup"],["UBCBQ5FGH2KASHEUPDLIKGLVVX3GSRQ4F4P2JEJZL2NX2DUSYARAC","Removing pijul/src/commands/checkout.rs (unused file), as well as litorg comments"],["X243Z3Y54ULINQMMRIKLHRV5T237B7VUOAHVJ7DMPOQ6A6GQXY2AC","Recording only the required metadata (can even be changed later!)"],["EEBKW7VTILH6AGGV57ZIJ3DJGYHDSYBWGU3C7Q4WWAKSVNUGIYMQC","Keys and identities"],["LZOGKBJXRQJKXHYNNENJFGNLP5SHIXGSV6HDB7UVOP7FSA5EUNCQC","new command `pijul client` for authenticating to a HTTP server"],["IBLJI7IAS7KNEHONURYUFRAINAMUC65HODM4G7XCRSGVIWJ7O5OQC","✨ Add `pijul status` subcommand"],["JN34NIMJ6H5QCFANKBPXIO5XUHUCZUNU6EODA2UVW4L6UXROXFOQC","More specific error for unrecognized subcommands"],["2YT6EDEKTXD5UCLXQ4IZAZLBWTJLORPYC7UZ3QO2TG7GRW3GMNHAC","Clean error types"],["PYELFYSLMEQA3CP4LNAUSQINXPZ3IKYKEIGIHWDCRTYXZWHY5AGQC","Replacing custom identities with sshsig, and removing keyring/password auth"],["JWTT77WJIGJOZVLLZBADUDZIMSEAR7ZLYLWISOXFJJCNWJGJPWQQC","Add help on subcommands"],["MU5GSJAW65PEG3BRYUKZ7O37BPHW3MOX3S5E2RFOXKGUOJEEDQ5AC","Partial push and pull (WARNING: breaks the existing protocol)"],["CCLLB7OIFNFYJZTG3UCI7536TOCWSCSXR67VELSB466R24WLJSDAC","Upgrading to Sanakirja 0.15 + version bump"],["JL4WKA5PBKXRNAMETYO4I52QKASQ3COYHH2JKGA7W5YLIRZZH53AC","Implement the Sanakirja concurrency model in a cross-process way"],["YTQS4ES362EJ27OE45CE5HLY7ZU57YLVKRMDRJ2OXT623VM5WOBQC","Fixing a parsing problem (related to permissions), and the associated permissions"],["5UAATYXA332LIWGVH2LZNU5GAKWB4G7LC6BOL6S6OCQHCWOT7I5QC","Conflict resolution"],["4USQK3IWRHVI67CTRX2WDEDEYDBB3BADVECKNAX3XNCEPTQS5MDQC","Big rename: libpijul => pijul-core, to match all other crates in the ecosystem"],["Y6EOUH4WHALBFJ3J73MLB7TNKQRVUX4QI434KEIJLYAAHJGOW2PQC","Removing the tags commands, and dependencies upgrade"],["UDHP4ZVBQZT2VBURB2MDCU2IZDNMCAFSIUKWRBDQ5BWMFKSN2LYQC","Fixing SSH asynchronicity issues"],["MSDTZGZIGP6JBTOZDLX5NWVSDRXRFH4BU4PW6ORSW3FYTOBCMY5QC","A replay command to debug the remaining issues in unrecord"],["QQZNSB26UHFC4EFFREJX2J7SWAKCB3UAI6OKKIOZ4BLXBK6M54VAC","Permission update (after #X243)"],["HDGRZISM2SS4TK5BMNGDIYG22SOXAZRTTC6YFIOPY4LSO53QDWZQC","Version updates"],["GMXEZ4MF6ZC6FYC4YXXPSYO3EPA3OJM5TNVZ72DFDUIGP5AQL2UAC","Fixing a bug when pushing to an empty repository"],["OKE6SXPP34GKAXKZTWLNHRJRQQN32T3SQCSOWWC3GTV425ZF5Q6QC","improve docs, feedback for pijul key"],["QL6K2ZM35B3NIXEMMCJWUSFXOBQHAGXRDMO7ID5DCKTJH4QJVY7QC","Tags"],["76PCXGML77EZWTRI5E6KHLVRAFTJ2AB5YRN5EKOYNAPKTWY2KCGAC","Pushing to, and pulling from the local repository"],["LJFJEX43HDS33O5HCRXH7AR3GTQZDHNWHEQBOERDNPNXR3B3XZ3QC","Fixing newline issues in the protocol over OpenSSH"],["4KJ45IJLTIE35KQZUSFMFS67RNENG4P2FZMKMULJLGGYMKJUVRSQC","Implement new identity management"],["TEDGMEHFZK6QKSXVOHM3Z4MYZC26EDCWRURHWKOU2JLETWJIJPLQC","Introduce subcommand for completion-script generation."],["MEK57BADGFCCZDNPUPUZGOJGNNS5R7UWRWCNJELKONGKOLLAQDDAC","Optional user in ssh_remote, allows to fix the key proof in `pijul id ed`"],["VWJ2JL63I5OYZ2HS3N4EKM5TW7HRAF5U3OAHDQIVZINIO73IAE7AC","Adding a `pijul dependents` command to list the transitive closure of the reverse dependency relation"],["55TYT57OX65MER3BIBP34S6TSTDPNYW7APRGF37TTITJEWMUGWIQC","Correctly loading the local config"]],"deps":["SXEYMYF7P4RZMZ46WPL4IZUTSQ2ATBWYZX7QNVMS3SGOYXYOHAGQC","5HF7C67M4DZMYTCIG32XEQQ662AHQMIHTHUK7TAVSO52XLMFBZPAC","62XVBWPYCBULZ2IUWF36JVHAPMKCGQC53PQQ53AAGZGC2KT7VQRQC","SZWBLWZ4LUJZHTSYOIGJMXM7KPCGWJFPKLHYA5MHY7UTPNLZV5KQC","A3RM526Y7LUXNYW4TL56YKQ5GVOK2R5D7JJVTSQ6TT5MEXIR6YAAC","IVLLXQ5ZWZDKHO4TNQG3TPXN34H6Y2WXPAGSO4PWCYNSKUZWOEJQC","3OW3YNZXF6DR2EI5XS7PDHUUZMARDU2JUJFJKIEWXQNSMCIBVAOQC","DO2Y5TY5JQISUHCVNPI2FXO7WWZVJQ3LGPWF4DNADMGZRIO6PT2QC","SU3JX6SEW6MLREX6CCM4V3353YC3IQD4JOZW2KEIHYTHOI2AJKPQC","OYN2YVPAN6L3X6HZXJI6B2GYGL2W5AXRK6CVDJRWALS5OENNB5UAC","D6N5JWOHB6IB6A74NDSWCFYTC5SGOR2D3REAOAVQKCX4YXOJQAHAC","YW6NICQV5LF4V2G77F2RG2ICODTQ2CKIEVBFIQEDATL5I5PFVRKQC","FIMDS32ZN6OCZUBWYNKDHZJ6FNKUC7NRUC37Q45HXQRBSTDM4YSQC","GSIAZENZ52K65JIIJBGFTLC4F6PODA6JO5PN47Y4XPZMDGGAV2LAC","6M4XSZ2BKS26JA4P2E4IK6I5YCT7FM62UL2CLZZI7DEK5WHD3ZAQC","TQZG3SLWOZ63WMM43DM2DCFA7F6KX3FQQ5ONHAG4ZEDXV7LA7KMQC"],"known":["76PCXGML77EZWTRI5E6KHLVRAFTJ2AB5YRN5EKOYNAPKTWY2KCGAC","JWTT77WJIGJOZVLLZBADUDZIMSEAR7ZLYLWISOXFJJCNWJGJPWQQC","UBCBQ5FGH2KASHEUPDLIKGLVVX3GSRQ4F4P2JEJZL2NX2DUSYARAC","UDHP4ZVBQZT2VBURB2MDCU2IZDNMCAFSIUKWRBDQ5BWMFKSN2LYQC","FBXYP7QM7SG6P2JDJVQPPCRKJE3GVYXNQ5GVV4GRDUNG6Q4ZRDJQC","MU5GSJAW65PEG3BRYUKZ7O37BPHW3MOX3S5E2RFOXKGUOJEEDQ5AC","CCLLB7OIFNFYJZTG3UCI7536TOCWSCSXR67VELSB466R24WLJSDAC","JN34NIMJ6H5QCFANKBPXIO5XUHUCZUNU6EODA2UVW4L6UXROXFOQC","JL4WKA5PBKXRNAMETYO4I52QKASQ3COYHH2JKGA7W5YLIRZZH53AC","G65S7FAW4OHBGC6ROVPPZ6PPACKOFEM4KSMAWMYKNQF5OLVDJR2QC","X243Z3Y54ULINQMMRIKLHRV5T237B7VUOAHVJ7DMPOQ6A6GQXY2AC","QQZNSB26UHFC4EFFREJX2J7SWAKCB3UAI6OKKIOZ4BLXBK6M54VAC","HDGRZISM2SS4TK5BMNGDIYG22SOXAZRTTC6YFIOPY4LSO53QDWZQC","YTQS4ES362EJ27OE45CE5HLY7ZU57YLVKRMDRJ2OXT623VM5WOBQC","QL6K2ZM35B3NIXEMMCJWUSFXOBQHAGXRDMO7ID5DCKTJH4QJVY7QC","EEBKW7VTILH6AGGV57ZIJ3DJGYHDSYBWGU3C7Q4WWAKSVNUGIYMQC","LJFJEX43HDS33O5HCRXH7AR3GTQZDHNWHEQBOERDNPNXR3B3XZ3QC","OKE6SXPP34GKAXKZTWLNHRJRQQN32T3SQCSOWWC3GTV425ZF5Q6QC","4KJ45IJLTIE35KQZUSFMFS67RNENG4P2FZMKMULJLGGYMKJUVRSQC","TEDGMEHFZK6QKSXVOHM3Z4MYZC26EDCWRURHWKOU2JLETWJIJPLQC","MEK57BADGFCCZDNPUPUZGOJGNNS5R7UWRWCNJELKONGKOLLAQDDAC","VWJ2JL63I5OYZ2HS3N4EKM5TW7HRAF5U3OAHDQIVZINIO73IAE7AC","LZOGKBJXRQJKXHYNNENJFGNLP5SHIXGSV6HDB7UVOP7FSA5EUNCQC","JVGYT2RPYZ7J3ZFXCMMN34BPRZT66Q2CO7VEBWDU7OFIF6EBIZXQC","IBLJI7IAS7KNEHONURYUFRAINAMUC65HODM4G7XCRSGVIWJ7O5OQC","LKLEIPWEEQBJWJKAJLWII2TFUNUOVY75HHDNOJU5MZR54YTMGINAC","4USQK3IWRHVI67CTRX2WDEDEYDBB3BADVECKNAX3XNCEPTQS5MDQC","GMXEZ4MF6ZC6FYC4YXXPSYO3EPA3OJM5TNVZ72DFDUIGP5AQL2UAC","Y6EOUH4WHALBFJ3J73MLB7TNKQRVUX4QI434KEIJLYAAHJGOW2PQC","PYELFYSLMEQA3CP4LNAUSQINXPZ3IKYKEIGIHWDCRTYXZWHY5AGQC","55TYT57OX65MER3BIBP34S6TSTDPNYW7APRGF37TTITJEWMUGWIQC","2YT6EDEKTXD5UCLXQ4IZAZLBWTJLORPYC7UZ3QO2TG7GRW3GMNHAC","5UAATYXA332LIWGVH2LZNU5GAKWB4G7LC6BOL6S6OCQHCWOT7I5QC","MSDTZGZIGP6JBTOZDLX5NWVSDRXRFH4BU4PW6ORSW3FYTOBCMY5QC"]},"hunks":[{"FileAdd":{"meta":{"basename":"ssh_config.rs","metadata":0},"context":[{"change":11,"pos":41}],"contents":[{"Add":"//! Resolving a host against the user's `~/.ssh/config`."},{"Add":"//!"},{"Add":"//! `thrussh_config`'s own parser only understands `Host` blocks with a"},{"Add":"//! single, literal name and space-separated `Key value` lines. Real"},{"Add":"//! configuration files routinely use several patterns on a `Host` line,"},{"Add":"//! `*`/`?` wildcards, negated patterns, a catch-all `Host *` block for"},{"Add":"//! global defaults and `Key = value` syntax. When `thrussh_config`"},{"Add":"//! fails to match, it falls back to defaults (in particular"},{"Add":"//! `whoami::username()` for the user), which is why SSH hosts were"},{"Add":"//! \"almost never parsed right\" unless an explicit `user@` was given."},{"Add":"//!"},{"Add":"//! This module resolves a host the way OpenSSH does: every `Host` block"},{"Add":"//! whose patterns match contributes, and for each key the *first* value"},{"Add":"//! seen wins."},{"Add":""},{"Add":"use log::debug;"},{"Add":"use thrussh_config::{AddKeysToAgent, Config};"},{"Add":""},{"Add":"/// Resolve `host` against `~/.ssh/config`, returning a [`Config`] whose"},{"Add":"/// fields have been filled following OpenSSH's precedence rules. Any"},{"Add":"/// field not mentioned by a matching block keeps its default"},{"Add":"/// (`whoami::username()` for the user, the host itself for the host"},{"Add":"/// name, `22` for the port)."},{"Add":"pub fn resolve(host: &str) -> Config {"},{"Add":" let mut config = Config::default(host);"},{"Add":" if let Some(home) = dirs_next::home_dir() {"},{"Add":" let path = home.join(\".ssh\").join(\"config\");"},{"Add":" match std::fs::read_to_string(&path) {"},{"Add":" Ok(contents) => apply(&mut config, &contents, host),"},{"Add":" Err(e) => debug!(\"could not read {:?}: {:?}\", path, e),"},{"Add":" }"},{"Add":" }"},{"Add":" config"},{"Add":"}"},{"Add":""},{"Add":"/// Apply every matching block of an already-loaded config file to"},{"Add":"/// `config`. Factored out of [`resolve`] so it can be unit-tested"},{"Add":"/// without touching the filesystem."},{"Add":"fn apply(config: &mut Config, contents: &str, host: &str) {"},{"Add":" // `Config::default` pre-fills `user`, `host_name` and `port`, so we"},{"Add":" // track separately whether a matching block has set them, in order"},{"Add":" // to honour OpenSSH's \"first value wins\" rule."},{"Add":" let mut seen_user = false;"},{"Add":" let mut seen_host_name = false;"},{"Add":" let mut seen_port = false;"},{"Add":" let mut seen_add_keys = false;"},{"Add":" let mut matching = false;"},{"Add":""},{"Add":" for line in contents.lines() {"},{"Add":" let Some((key, value)) = split_kv(line) else {"},{"Add":" continue;"},{"Add":" };"},{"Add":" if key == \"host\" {"},{"Add":" matching = host_matches(value, host);"},{"Add":" continue;"},{"Add":" }"},{"Add":" // `Match` blocks are not supported; treat them (and anything"},{"Add":" // until the next `Host`) as non-matching to stay on the safe"},{"Add":" // side rather than misapplying their settings."},{"Add":" if key == \"match\" {"},{"Add":" matching = false;"},{"Add":" continue;"},{"Add":" }"},{"Add":" if !matching {"},{"Add":" continue;"},{"Add":" }"},{"Add":" match key.as_str() {"},{"Add":" \"hostname\" if !seen_host_name => {"},{"Add":" config.host_name = value.to_string();"},{"Add":" seen_host_name = true;"},{"Add":" }"},{"Add":" \"user\" if !seen_user => {"},{"Add":" config.user = value.to_string();"},{"Add":" seen_user = true;"},{"Add":" }"},{"Add":" \"port\" if !seen_port => {"},{"Add":" if let Ok(port) = value.parse() {"},{"Add":" config.port = port;"},{"Add":" seen_port = true;"},{"Add":" }"},{"Add":" }"},{"Add":" \"identityfile\" if config.identity_file.is_none() => {"},{"Add":" config.identity_file = Some(expand_tilde(value));"},{"Add":" }"},{"Add":" \"proxycommand\" if config.proxy_command.is_none() => {"},{"Add":" config.proxy_command = Some(value.to_string());"},{"Add":" }"},{"Add":" \"addkeystoagent\" if !seen_add_keys => {"},{"Add":" config.add_keys_to_agent = match value.to_lowercase().as_str() {"},{"Add":" \"yes\" => AddKeysToAgent::Yes,"},{"Add":" \"confirm\" => AddKeysToAgent::Confirm,"},{"Add":" \"ask\" => AddKeysToAgent::Ask,"},{"Add":" _ => AddKeysToAgent::No,"},{"Add":" };"},{"Add":" seen_add_keys = true;"},{"Add":" }"},{"Add":" _ => {}"},{"Add":" }"},{"Add":" }"},{"Add":"}"},{"Add":""},{"Add":"/// Split a configuration line into a lower-cased keyword and its value."},{"Add":"/// Returns `None` for blank lines and comments. Keyword and value may"},{"Add":"/// be separated by whitespace, `=`, or both (`Key value`, `Key=value`,"},{"Add":"/// `Key = value`), as OpenSSH allows."},{"Add":"fn split_kv(line: &str) -> Option<(String, &str)> {"},{"Add":" let line = line.trim();"},{"Add":" if line.is_empty() || line.starts_with('#') {"},{"Add":" return None;"},{"Add":" }"},{"Add":" let key_end = line.find(|c: char| c.is_whitespace() || c == '=')?;"},{"Add":" let key = line[..key_end].to_lowercase();"},{"Add":" let mut rest = line[key_end..].trim_start();"},{"Add":" if let Some(after_eq) = rest.strip_prefix('=') {"},{"Add":" rest = after_eq.trim_start();"},{"Add":" }"},{"Add":" // Values may be double-quoted (e.g. paths containing spaces)."},{"Add":" let rest = rest"},{"Add":" .strip_prefix('\"')"},{"Add":" .and_then(|r| r.strip_suffix('\"'))"},{"Add":" .unwrap_or(rest);"},{"Add":" if rest.is_empty() {"},{"Add":" None"},{"Add":" } else {"},{"Add":" Some((key, rest))"},{"Add":" }"},{"Add":"}"},{"Add":""},{"Add":"/// Whether `host` matches a `Host` line's list of patterns, following"},{"Add":"/// OpenSSH semantics: the line matches if `host` matches at least one"},{"Add":"/// positive pattern and no negated (`!`) pattern."},{"Add":"fn host_matches(patterns: &str, host: &str) -> bool {"},{"Add":" let mut matched = false;"},{"Add":" for pat in patterns.split_whitespace() {"},{"Add":" if let Some(neg) = pat.strip_prefix('!') {"},{"Add":" if glob_matches(neg, host) {"},{"Add":" return false;"},{"Add":" }"},{"Add":" } else if glob_matches(pat, host) {"},{"Add":" matched = true;"},{"Add":" }"},{"Add":" }"},{"Add":" matched"},{"Add":"}"},{"Add":""},{"Add":"/// Match a single `Host` pattern (with `*` and `?` wildcards) against a"},{"Add":"/// host name."},{"Add":"fn glob_matches(pattern: &str, host: &str) -> bool {"},{"Add":" if !pattern.contains(['*', '?']) {"},{"Add":" return pattern == host;"},{"Add":" }"},{"Add":" match regex::Regex::new(&glob_to_regex(pattern)) {"},{"Add":" Ok(re) => re.is_match(host),"},{"Add":" Err(_) => false,"},{"Add":" }"},{"Add":"}"},{"Add":""},{"Add":"fn glob_to_regex(pattern: &str) -> String {"},{"Add":" let mut re = String::with_capacity(pattern.len() + 2);"},{"Add":" re.push('^');"},{"Add":" for c in pattern.chars() {"},{"Add":" match c {"},{"Add":" '*' => re.push_str(\".*\"),"},{"Add":" '?' => re.push('.'),"},{"Add":" '.' | '^' | '$' | '+' | '(' | ')' | '[' | ']' | '{' | '}' | '|' | '\\\\' => {"},{"Add":" re.push('\\\\');"},{"Add":" re.push(c);"},{"Add":" }"},{"Add":" c => re.push(c),"},{"Add":" }"},{"Add":" }"},{"Add":" re.push('$');"},{"Add":" re"},{"Add":"}"},{"Add":""},{"Add":"/// Expand a leading `~/` in an `IdentityFile` value to an absolute path"},{"Add":"/// under the home directory, matching what `thrussh_config` did."},{"Add":"fn expand_tilde(path: &str) -> String {"},{"Add":" if let Some(rest) = path.strip_prefix(\"~/\") {"},{"Add":" if let Some(home) = dirs_next::home_dir() {"},{"Add":" return home.join(rest).to_string_lossy().into_owned();"},{"Add":" }"},{"Add":" }"},{"Add":" path.to_string()"},{"Add":"}"},{"Add":""},{"Add":"#[cfg(test)]"},{"Add":"mod tests {"},{"Add":" use super::*;"},{"Add":""},{"Add":" fn user_of(contents: &str, host: &str) -> String {"},{"Add":" let mut c = Config::default(host);"},{"Add":" // Neutralise the whoami default so tests are deterministic."},{"Add":" c.user = \"\".to_string();"},{"Add":" apply(&mut c, contents, host);"},{"Add":" c.user"},{"Add":" }"},{"Add":""},{"Add":" #[test]"},{"Add":" fn single_name() {"},{"Add":" assert_eq!("},{"Add":" user_of("},{"Add":" \"Host foo\\n HostName foo.example.com\\n User alice\\n\","},{"Add":" \"foo\""},{"Add":" ),"},{"Add":" \"alice\""},{"Add":" );"},{"Add":" }"},{"Add":""},{"Add":" #[test]"},{"Add":" fn multiple_patterns_on_host_line() {"},{"Add":" let cfg = \"Host foo bar\\n HostName foo.example.com\\n User alice\\n\";"},{"Add":" assert_eq!(user_of(cfg, \"foo\"), \"alice\");"},{"Add":" assert_eq!(user_of(cfg, \"bar\"), \"alice\");"},{"Add":" assert_eq!(user_of(cfg, \"baz\"), \"\");"},{"Add":" }"},{"Add":""},{"Add":" #[test]"},{"Add":" fn wildcard_pattern() {"},{"Add":" let cfg = \"Host *.example.com\\n User alice\\n\";"},{"Add":" assert_eq!(user_of(cfg, \"srv.example.com\"), \"alice\");"},{"Add":" assert_eq!(user_of(cfg, \"example.org\"), \"\");"},{"Add":" }"},{"Add":""},{"Add":" #[test]"},{"Add":" fn question_mark_pattern() {"},{"Add":" let cfg = \"Host web?\\n User alice\\n\";"},{"Add":" assert_eq!(user_of(cfg, \"web1\"), \"alice\");"},{"Add":" assert_eq!(user_of(cfg, \"web12\"), \"\");"},{"Add":" }"},{"Add":""},{"Add":" #[test]"},{"Add":" fn negated_pattern() {"},{"Add":" let cfg = \"Host *.example.com !secret.example.com\\n User alice\\n\";"},{"Add":" assert_eq!(user_of(cfg, \"srv.example.com\"), \"alice\");"},{"Add":" assert_eq!(user_of(cfg, \"secret.example.com\"), \"\");"},{"Add":" }"},{"Add":""},{"Add":" #[test]"},{"Add":" fn global_then_host_first_value_wins() {"},{"Add":" // `Host *` comes first: its User applies to `foo`, and the"},{"Add":" // later block does not override it."},{"Add":" let cfg = \"Host *\\n User alice\\nHost foo\\n HostName foo.example.com\\n\";"},{"Add":" let mut c = Config::default(\"foo\");"},{"Add":" c.user = \"\".to_string();"},{"Add":" apply(&mut c, cfg, \"foo\");"},{"Add":" assert_eq!(c.user, \"alice\");"},{"Add":" assert_eq!(c.host_name, \"foo.example.com\");"},{"Add":" }"},{"Add":""},{"Add":" #[test]"},{"Add":" fn host_specific_wins_over_global_when_earlier() {"},{"Add":" let cfg = \"Host foo\\n User bob\\nHost *\\n User alice\\n\";"},{"Add":" assert_eq!(user_of(cfg, \"foo\"), \"bob\");"},{"Add":" }"},{"Add":""},{"Add":" #[test]"},{"Add":" fn equals_separated() {"},{"Add":" let cfg = \"Host foo\\n HostName=foo.example.com\\n User = alice\\n\";"},{"Add":" let mut c = Config::default(\"foo\");"},{"Add":" c.user = \"\".to_string();"},{"Add":" apply(&mut c, cfg, \"foo\");"},{"Add":" assert_eq!(c.user, \"alice\");"},{"Add":" assert_eq!(c.host_name, \"foo.example.com\");"},{"Add":" }"},{"Add":""},{"Add":" #[test]"},{"Add":" fn port_and_comments() {"},{"Add":" let cfg = \"# a comment\\nHost foo\\n Port 2222\\n User alice\\n\";"},{"Add":" let mut c = Config::default(\"foo\");"},{"Add":" apply(&mut c, cfg, \"foo\");"},{"Add":" assert_eq!(c.port, 2222);"},{"Add":" }"},{"Add":"}"}]}},{"Replacement":{"inode":{"change":2,"pos":25380},"path":"pijul-remote/src/ssh.rs","line":60,"ins":{"up_context":[{"change":5,"pos":58}],"down_context":[{"change":5,"pos":171}],"flag":"BLOCK","start":9449,"end":9504,"inode":{"change":2,"pos":25380}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":58},"to":{"change":5,"start":58,"end":171},"introduced_by":5}],"inode":{"change":2,"pos":25380}},"ins_contents":[{"Add":" let mut config = crate::ssh_config::resolve(host);"}],"del_contents":[{"Del":" let mut config =\n thrussh_config::parse_home(&host).unwrap_or(thrussh_config::Config::default(host));\n"}]}},{"Edit":{"inode":{"change":2,"pos":25380},"path":"pijul-remote/src/ssh.rs","line":311,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":822},"to":{"change":16,"start":0,"end":95},"introduced_by":16}],"inode":{"change":2,"pos":25380}}},"contents":[{"Del":" Approve {\n sender: Option>>,\n },\n"}]}},{"Edit":{"inode":{"change":2,"pos":25380},"path":"pijul-remote/src/ssh.rs","line":625,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":16,"pos":162},"to":{"change":16,"start":162,"end":773},"introduced_by":16},{"previous":"","flag":"DELETED","from":{"change":16,"pos":773},"to":{"change":6,"start":2668,"end":2734},"introduced_by":16},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":2668},"to":{"change":6,"start":2668,"end":2734},"introduced_by":6}],"inode":{"change":2,"pos":25380}}},"contents":[{"Del":" State::Approve { ref mut sender } => {\n // The server replies with a bare newline on success, or an\n // error message otherwise.\n if let Ok(s) = std::str::from_utf8(&data) {\n let s = s.trim();\n let result = if s.is_empty() {\n Ok(())\n } else {\n Err(s.to_string())\n };\n if let Some(sender) = sender.take() {\n sender.send(result).unwrap_or(());\n"},{"Del":" }\n }\n }\n"}]}},{"Replacement":{"inode":{"change":2,"pos":25380},"path":"pijul-remote/src/ssh.rs","line":757,"ins":{"up_context":[{"change":6,"pos":4879}],"down_context":[{"change":16,"pos":800}],"flag":"BLOCK","start":9505,"end":9803,"inode":{"change":2,"pos":25380}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":4879},"to":{"change":16,"start":774,"end":800},"introduced_by":16}],"inode":{"change":2,"pos":25380}},"ins_contents":[{"Add":" /// Send a push signature for `hash` on `channel`, signed over"},{"Add":" /// `(state, hash, timestamp)`. Fire-and-forget: a Nest records it, a plain"},{"Add":" /// `pijul protocol` peer ignores the unknown verb, and neither replies — so"},{"Add":" /// we do not wait for an ack."},{"Add":" pub async fn push_signature("}],"del_contents":[{"Del":" pub async fn approve(\n"}]}},{"Edit":{"inode":{"change":2,"pos":25380},"path":"pijul-remote/src/ssh.rs","line":764,"atom":{"NewVertex":{"up_context":[{"change":16,"pos":842}],"down_context":[{"change":16,"pos":842}],"flag":"BLOCK","start":9804,"end":9824,"inode":{"change":2,"pos":25380}}},"contents":[{"Add":" hash: Hash,"}]}},{"Replacement":{"inode":{"change":2,"pos":25380},"path":"pijul-remote/src/ssh.rs","line":766,"ins":{"up_context":[{"change":16,"pos":865}],"down_context":[{"change":16,"pos":901}],"flag":"BLOCK","start":9825,"end":9869,"inode":{"change":2,"pos":25380}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":16,"pos":865},"to":{"change":16,"start":865,"end":901},"introduced_by":16}],"inode":{"change":2,"pos":25380}},"ins_contents":[{"Add":" timestamp: i64,"},{"Add":" sig: &[u8],"}],"del_contents":[{"Del":" sig: &thrussh_keys::SshSig,\n"}]}},{"Edit":{"inode":{"change":2,"pos":25380},"path":"pijul-remote/src/ssh.rs","line":769,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":16,"pos":936},"to":{"change":16,"start":936,"end":1099},"introduced_by":16}],"inode":{"change":2,"pos":25380}}},"contents":[{"Del":" let (sender, receiver) = tokio::sync::oneshot::channel();\n *self.state.lock().await = State::Approve {\n sender: Some(sender),\n };\n"}]}},{"Replacement":{"inode":{"change":2,"pos":25380},"path":"pijul-remote/src/ssh.rs","line":770,"ins":{"up_context":[{"change":16,"pos":1135}],"down_context":[{"change":16,"pos":1211}],"flag":"BLOCK","start":9870,"end":9933,"inode":{"change":2,"pos":25380}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":16,"pos":1135},"to":{"change":16,"start":1135,"end":1211},"introduced_by":16}],"inode":{"change":2,"pos":25380}},"ins_contents":[{"Add":" let sig_b64 = data_encoding::BASE64_NOPAD.encode(sig);"}],"del_contents":[{"Del":" let sig_b64 = data_encoding::BASE64_NOPAD.encode(&sig.to_bytes()?);\n"}]}},{"Replacement":{"inode":{"change":2,"pos":25380},"path":"pijul-remote/src/ssh.rs","line":772,"ins":{"up_context":[{"change":16,"pos":1226}],"down_context":[{"change":16,"pos":1323}],"flag":"BLOCK","start":9934,"end":10252,"inode":{"change":2,"pos":25380}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":16,"pos":1226},"to":{"change":16,"start":1226,"end":1323},"introduced_by":16}],"inode":{"change":2,"pos":25380}},"ins_contents":[{"Add":" .data("},{"Add":" format!("},{"Add":" \"pushsig {} {} {} {} {}\\n\","},{"Add":" channel,"},{"Add":" hash.to_base32(),"},{"Add":" state.to_base32(),"},{"Add":" timestamp,"},{"Add":" sig_b64"},{"Add":" )"},{"Add":" .as_bytes(),"},{"Add":" )"}],"del_contents":[{"Del":" .data(format!(\"approve {} {} {}\\n\", channel, state.to_base32(), sig_b64).as_bytes())\n"}]}},{"Replacement":{"inode":{"change":2,"pos":25380},"path":"pijul-remote/src/ssh.rs","line":784,"ins":{"up_context":[{"change":16,"pos":1344}],"down_context":[{"change":16,"pos":1517}],"flag":"BLOCK","start":10253,"end":10268,"inode":{"change":2,"pos":25380}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":16,"pos":1344},"to":{"change":16,"start":1344,"end":1517},"introduced_by":16}],"inode":{"change":2,"pos":25380}},"ins_contents":[{"Add":" Ok(())"}],"del_contents":[{"Del":" match receiver.await.map_err(|_| RemoteError::Concurrency)? {\n Ok(()) => Ok(()),\n Err(msg) => Err(RemoteError::SshRemoteError(msg)),\n }\n"}]}},{"Edit":{"inode":{"change":2,"pos":52474},"path":"pijul-remote/src/lib.rs","line":24,"atom":{"NewVertex":{"up_context":[{"change":2,"pos":52737}],"down_context":[{"change":2,"pos":52737}],"flag":"BLOCK","start":10269,"end":10290,"inode":{"change":2,"pos":52474}}},"contents":[{"Add":""},{"Add":"pub mod ssh_config;"}]}},{"Edit":{"inode":{"change":2,"pos":52474},"path":"pijul-remote/src/lib.rs","line":295,"atom":{"NewVertex":{"up_context":[{"change":9,"pos":4733}],"down_context":[{"change":7,"pos":1449}],"flag":"BLOCK","start":10291,"end":10562,"inode":{"change":2,"pos":52474}}},"contents":[{"Add":" /// The remote channel's current head Merkle, taken from the local remote"},{"Add":" /// cache that the changelist exchange just refreshed — so push signatures"},{"Add":" /// can commit to the applied-onto state without an extra round-trip."},{"Add":" pub remote_state: Option,"}]}},{"Edit":{"inode":{"change":2,"pos":52474},"path":"pijul-remote/src/lib.rs","line":371,"atom":{"NewVertex":{"up_context":[{"change":7,"pos":4968}],"down_context":[{"change":7,"pos":4968}],"flag":"BLOCK","start":10563,"end":10669,"inode":{"change":2,"pos":52474}}},"contents":[{"Add":" // Local-channel push: no remote Nest, so no push signatures."},{"Add":" remote_state: None,"}]}},{"Edit":{"inode":{"change":2,"pos":52474},"path":"pijul-remote/src/lib.rs","line":539,"atom":{"NewVertex":{"up_context":[{"change":7,"pos":7232}],"down_context":[{"change":7,"pos":7232}],"flag":"BLOCK","start":10670,"end":11101,"inode":{"change":2,"pos":52474}}},"contents":[{"Add":" // The remote's head, straight from the just-synced remote cache — no"},{"Add":" // network round-trip (which would otherwise stall the push)."},{"Add":" let remote_state = if let Some(ref remote_ref) = self.remote_ref {"},{"Add":" txn.last_remote(&remote_ref.lock().remote)"},{"Add":" .map_err(crate::error::Error::TxnErrGraph)?"},{"Add":" .map(|(_, v)| (&v.b).into())"},{"Add":" } else {"},{"Add":" None"},{"Add":" };"},{"Add":""}]}},{"Edit":{"inode":{"change":2,"pos":52474},"path":"pijul-remote/src/lib.rs","line":553,"atom":{"NewVertex":{"up_context":[{"change":7,"pos":7434}],"down_context":[{"change":7,"pos":7434}],"flag":"BLOCK","start":11102,"end":11128,"inode":{"change":2,"pos":52474}}},"contents":[{"Add":" remote_state,"}]}},{"Replacement":{"inode":{"change":2,"pos":52474},"path":"pijul-remote/src/lib.rs","line":1101,"ins":{"up_context":[{"change":16,"pos":1590}],"down_context":[{"change":16,"pos":1747}],"flag":"BLOCK","start":11129,"end":11454,"inode":{"change":2,"pos":52474}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":16,"pos":1590},"to":{"change":16,"start":1590,"end":1747},"introduced_by":16}],"inode":{"change":2,"pos":52474}},"ins_contents":[{"Add":" /// Send a push signature — a non-author's SSHSIG over"},{"Add":" /// `(state, hash, timestamp)` — authorizing this patch onto `channel`. Only"},{"Add":" /// a Nest records it; other peers ignore the verb. Best-effort, so failures"},{"Add":" /// are the caller's to warn about rather than abort the push."},{"Add":" pub async fn push_signature("}],"del_contents":[{"Del":" /// Send a cryptographic approval of `state` on `channel` to the remote.\n /// Only meaningful against a Nest (ssh or http).\n pub async fn approve(\n"}]}},{"Edit":{"inode":{"change":2,"pos":52474},"path":"pijul-remote/src/lib.rs","line":1108,"atom":{"NewVertex":{"up_context":[{"change":16,"pos":1789}],"down_context":[{"change":16,"pos":1789}],"flag":"BLOCK","start":11455,"end":11475,"inode":{"change":2,"pos":52474}}},"contents":[{"Add":" hash: Hash,"}]}},{"Replacement":{"inode":{"change":2,"pos":52474},"path":"pijul-remote/src/lib.rs","line":1110,"ins":{"up_context":[{"change":16,"pos":1812}],"down_context":[{"change":16,"pos":1848}],"flag":"BLOCK","start":11476,"end":11520,"inode":{"change":2,"pos":52474}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":16,"pos":1812},"to":{"change":16,"start":1812,"end":1848},"introduced_by":16}],"inode":{"change":2,"pos":52474}},"ins_contents":[{"Add":" timestamp: i64,"},{"Add":" sig: &[u8],"}],"del_contents":[{"Del":" sig: &thrussh_keys::SshSig,\n"}]}},{"Replacement":{"inode":{"change":2,"pos":52474},"path":"pijul-remote/src/lib.rs","line":1114,"ins":{"up_context":[{"change":16,"pos":1905}],"down_context":[{"change":16,"pos":2243}],"flag":"BLOCK","start":11521,"end":11956,"inode":{"change":2,"pos":52474}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":16,"pos":1905},"to":{"change":16,"start":1905,"end":2242},"introduced_by":16},{"previous":"","flag":"DELETED","from":{"change":16,"pos":2242},"to":{"change":6,"start":6586,"end":6634},"introduced_by":16},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":6586},"to":{"change":6,"start":6586,"end":6634},"introduced_by":6}],"inode":{"change":2,"pos":52474}},"ins_contents":[{"Add":" RemoteRepo::Ssh(ref mut s) => {"},{"Add":" s.push_signature(channel, hash, state, timestamp, sig).await"},{"Add":" }"},{"Add":" // Push over HTTP is not an apply path on the Nest, and plain peers"},{"Add":" // have nowhere to put this, so it is a no-op elsewhere."},{"Add":" RemoteRepo::Http(_)"},{"Add":" | RemoteRepo::Local(_)"},{"Add":" | RemoteRepo::LocalChannel(_)"},{"Add":" | RemoteRepo::None => Ok(()),"}],"del_contents":[{"Del":" RemoteRepo::Ssh(ref mut s) => s.approve(channel, state, sig).await,\n RemoteRepo::Http(ref mut h) => h.approve(channel, state, sig).await,\n RemoteRepo::Local(_) | RemoteRepo::LocalChannel(_) => Err(\n RemoteError::UnsupportedScheme(\"approvals require a remote Nest\".into()),\n ),\n"},{"Del":" RemoteRepo::None => unreachable!(),\n"}]}},{"Edit":{"inode":{"change":18,"pos":10},"path":"pijul-remote/src/http.rs","line":590,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":16,"pos":2729},"to":{"change":16,"start":2729,"end":3886},"introduced_by":16}],"inode":{"change":18,"pos":10}}},"contents":[{"Del":" pub async fn approve(\n &mut self,\n channel: &str,\n state: pijul_core::Merkle,\n sig: &thrussh_keys::SshSig,\n ) -> Result<(), RemoteError> {\n let url = format!(\"{}/{}\", self.url, super::DOT_DIR);\n let state_b32 = state.to_base32();\n let sig_b64 = data_encoding::BASE64_NOPAD.encode(&sig.to_bytes()?);\n let q = [\n (\"approve\", state_b32.as_str()),\n (\"channel\", channel),\n (\"signature\", sig_b64.as_str()),\n ];\n let mut req = self\n .client\n .get(&url)\n .query(&q)\n .header(reqwest::header::USER_AGENT, USER_AGENT);\n for (k, v) in self.headers.iter() {\n req = req.header(k.as_str(), v.as_str());\n }\n let res = req.send().await?;\n let stat = res.status();\n if !stat.is_success() {\n let body = res.text().await.unwrap_or_default();\n if !body.is_empty() {\n return Err(RemoteError::HttpServerError(body));\n } else {\n return Err(RemoteError::HttpError(stat));\n }\n }\n Ok(())\n }\n\n"}]}},{"Edit":{"inode":{"change":2,"pos":83981},"path":"pijul/src/main.rs","line":51,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":43},"to":{"change":15,"start":0,"end":86},"introduced_by":15},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":15,"pos":86},"to":{"change":15,"start":86,"end":87},"introduced_by":15}],"inode":{"change":2,"pos":83981}}},"contents":[{"Del":" /// Adds your cryptographic signature to an existing change\n Approve(Approve),\n"},{"Del":"\n"}]}},{"Edit":{"inode":{"change":2,"pos":83981},"path":"pijul/src/main.rs","line":232,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":14,"pos":1502},"to":{"change":15,"start":88,"end":155},"introduced_by":15}],"inode":{"change":2,"pos":83981}}},"contents":[{"Del":" SubCommand::Approve(approve) => approve.repository_path(),\n"}]}},{"Edit":{"inode":{"change":2,"pos":83981},"path":"pijul/src/main.rs","line":273,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":13,"pos":8672},"to":{"change":15,"start":156,"end":224},"introduced_by":15}],"inode":{"change":2,"pos":83981}}},"contents":[{"Del":" SubCommand::Approve(approve) => approve.run(&config).await,\n"}]}},{"FileDel":{"deleted_names":[{"basename":"approve.rs","metadata":0}],"del":{"EdgeMap":{"edges":[{"previous":"BLOCK | FOLDER","flag":"BLOCK | FOLDER | DELETED","from":{"change":2,"pos":93386},"to":{"change":15,"start":266,"end":300},"introduced_by":15},{"previous":"BLOCK | FOLDER","flag":"BLOCK | FOLDER | DELETED","from":{"change":15,"pos":300},"to":{"change":15,"start":301,"end":301},"introduced_by":15}],"inode":{"change":15,"pos":301}}},"content_edges":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":15,"pos":301},"to":{"change":16,"start":7013,"end":7212},"introduced_by":16},{"previous":"","flag":"DELETED","from":{"change":16,"pos":7212},"to":{"change":15,"start":302,"end":324},"introduced_by":16},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":15,"pos":301},"to":{"change":15,"start":302,"end":324},"introduced_by":15},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":15,"pos":468},"to":{"change":15,"start":468,"end":535},"introduced_by":15},{"previous":"","flag":"DELETED","from":{"change":16,"pos":7568},"to":{"change":15,"start":682,"end":1059},"introduced_by":16},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":15,"pos":682},"to":{"change":15,"start":682,"end":1059},"introduced_by":15},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":15,"pos":1333},"to":{"change":15,"start":1333,"end":1389},"introduced_by":15},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":15,"pos":1389},"to":{"change":16,"start":7569,"end":7589},"introduced_by":16},{"previous":"","flag":"DELETED","from":{"change":16,"pos":7589},"to":{"change":15,"start":1389,"end":1576},"introduced_by":16},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":15,"pos":1389},"to":{"change":15,"start":1389,"end":1576},"introduced_by":15},{"previous":"","flag":"DELETED","from":{"change":16,"pos":8175},"to":{"change":15,"start":1634,"end":1635},"introduced_by":16},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":15,"pos":1634},"to":{"change":15,"start":1634,"end":1635},"introduced_by":15},{"previous":"","flag":"DELETED","from":{"change":16,"pos":8408},"to":{"change":15,"start":1713,"end":1714},"introduced_by":16},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":15,"pos":1713},"to":{"change":15,"start":1713,"end":1714},"introduced_by":15},{"previous":"","flag":"DELETED","from":{"change":16,"pos":8676},"to":{"change":15,"start":2252,"end":2253},"introduced_by":16},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":15,"pos":2252},"to":{"change":15,"start":2252,"end":2253},"introduced_by":15},{"previous":"","flag":"DELETED","from":{"change":16,"pos":8941},"to":{"change":15,"start":2377,"end":2378},"introduced_by":16},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":15,"pos":2377},"to":{"change":15,"start":2377,"end":2378},"introduced_by":15},{"previous":"","flag":"DELETED","from":{"change":16,"pos":9001},"to":{"change":15,"start":2515,"end":2516},"introduced_by":16},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":15,"pos":2515},"to":{"change":15,"start":2515,"end":2516},"introduced_by":15},{"previous":"","flag":"DELETED","from":{"change":16,"pos":9054},"to":{"change":15,"start":2649,"end":2664},"introduced_by":16},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":15,"pos":2649},"to":{"change":15,"start":2649,"end":2664},"introduced_by":15},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":15,"pos":2664},"to":{"change":16,"start":9055,"end":9601},"introduced_by":16},{"previous":"","flag":"DELETED","from":{"change":16,"pos":9601},"to":{"change":15,"start":2664,"end":2670},"introduced_by":16},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":15,"pos":2664},"to":{"change":15,"start":2664,"end":2670},"introduced_by":15},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":15,"pos":2670},"to":{"change":16,"start":9602,"end":9616},"introduced_by":16},{"previous":"","flag":"DELETED","from":{"change":16,"pos":9616},"to":{"change":15,"start":2670,"end":2672},"introduced_by":16},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":15,"pos":2670},"to":{"change":15,"start":2670,"end":2672},"introduced_by":15},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":15,"pos":2516},"to":{"change":16,"start":9002,"end":9054},"introduced_by":16},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":15,"pos":2378},"to":{"change":16,"start":8942,"end":9001},"introduced_by":16},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":15,"pos":2253},"to":{"change":16,"start":8677,"end":8941},"introduced_by":16},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":15,"pos":1714},"to":{"change":16,"start":8409,"end":8676},"introduced_by":16},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":15,"pos":1635},"to":{"change":16,"start":8176,"end":8408},"introduced_by":16},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":15,"pos":1576},"to":{"change":16,"start":7590,"end":8175},"introduced_by":16},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":15,"pos":535},"to":{"change":16,"start":7213,"end":7568},"introduced_by":16}],"inode":{"change":15,"pos":301}},"content":[{"Del":"use super::*;\nuse crate::commands::common_opts::RepoAndChannel;\nuse anyhow::bail;\nuse clap::Parser;\nuse pijul_core::{Base32, ChannelTxnT, Merkle, TxnT, pristine::TxnErr};\nuse pijul_remote as remote;\n"},{"Del":"use std::path::Path;\n\n"},{"Del":"#[derive(Parser, Debug)]\npub struct Approve {\n #[clap(flatten)]\n"},{"Del":" /// Identity to sign with (defaults to the configured identity)\n #[clap(long = \"identity\")]\n identity: Option,\n}\n\nimpl Approve {\n pub fn repository_path(&mut self) -> Option<&Path> {\n self.base.repo_path()\n }\n\n pub async fn run(mut self, config: &pijul_config::Config) -> Result<(), anyhow::Error> {\n let repo = self.base.find_root()?;\n"},{"Del":"\n let identity_name = self\n .identity\n"},{"Del":" .take()\n"},{"Del":" .unwrap_or(pijul_identity::choose_identity_name(config).await?);\n let complete = pijul_identity::Complete::load(&identity_name)?;\n let secret = complete.skey();\n"},{"Del":"\n"},{"Del":"\n"},{"Del":"\n"},{"Del":"\n"},{"Del":"\n"},{"Del":" Ok(())\n"},{"Del":" }\n}\n\nfn get_state(\n txn: &T,\n channel: &T::Channel,\n state: Option<&str>,\n) -> Result, TxnErr> {\n if let Some(state) = state {\n if let Ok((st, n)) = txn.state_from_prefix(&txn.states(channel), &state) {\n return Ok(Some((st.into(), n.into())));\n }\n } else if let Some(x) = txn\n .rev_cursor_revchangeset(txn.rev_changes(&channel), None)?\n .next()\n {\n let (n, p) = x?;\n return Ok(Some((p.b.into(), (*n).into())));\n"},{"Del":" }\n"},{"Del":"\n Ok(None)\n"},{"Del":"}\n"},{"Del":" println!(\"Approved {}\", state.to_base32());\n"},{"Del":" remote.approve(&channel_name, state, &sig).await?;\n"},{"Del":" let mut remote = remote::repository(\n config,\n Some(&repo.path),\n Some(&complete.config.author.username),\n &remote_name,\n &channel_name,\n false,\n true,\n )\n .await?;\n"},{"Del":" let remote_name = if let Some(ref to) = self.to {\n to.clone()\n } else if let Some(ref def) = config.default_remote {\n def.clone()\n } else {\n bail!(\"Missing remote: pass --to or set a default remote\");\n };\n"},{"Del":" // Sign the state Merkle: this pins the exact applied set, so no change\n // can be added or removed without invalidating the approval.\n let sig = pijul_identity::sign_sshsig(&secret, &state.to_bytes()).await?;\n"},{"Del":"\n // Compute the state to approve and its channel, then release the txn\n // before touching the network.\n let (state, channel_name) = {\n let txn = repo.pristine.txn_begin()?;\n let channel_name = get_channel(self.base.channel(), &txn).0.to_string();\n let (channel_ref, _) = load_channel(self.base.channel(), &txn)?;\n let Some((state, _)) = get_state(&txn, &*channel_ref.read(), self.state.as_deref())?\n else {\n bail!(\"No such state\");\n };\n (state, channel_name)\n };\n"},{"Del":" base: RepoAndChannel,\n /// The state to approve, or an unambiguous prefix thereof. Defaults to the\n /// latest state of the channel.\n #[clap(value_name = \"STATE\")]\n state: Option,\n /// The remote (Nest) to send the approval to. Defaults to the configured\n /// default remote.\n #[clap(long = \"to\")]\n to: Option,\n"}]}},{"Edit":{"inode":{"change":2,"pos":111631},"path":"pijul/src/commands/pushpull.rs","line":558,"atom":{"NewVertex":{"up_context":[{"change":7,"pos":20343}],"down_context":[{"change":8,"pos":0}],"flag":"BLOCK","start":11957,"end":11983,"inode":{"change":2,"pos":111631}}},"contents":[{"Add":" remote_state,"}]}},{"Edit":{"inode":{"change":2,"pos":111631},"path":"pijul/src/commands/pushpull.rs","line":675,"atom":{"NewVertex":{"up_context":[{"change":3,"pos":1257}],"down_context":[{"change":3,"pos":1257}],"flag":"BLOCK","start":11984,"end":12839,"inode":{"change":2,"pos":111631}}},"contents":[{"Add":" }"},{"Add":""},{"Add":" // Push signatures: sign (remote head, patch, now) for each change and"},{"Add":" // send them ahead of the applies. A Nest with `min_push_signatures > 0`"},{"Add":" // uses them as the second-actor authorization; other peers ignore them."},{"Add":" // The head comes from the just-synced remote cache (no round-trip)."},{"Add":" // Entirely best-effort — a missing identity or signing error must never"},{"Add":" // block a push, so every failure is a warning, not an abort."},{"Add":" let effective_channel = push_channel.unwrap_or(remote_channel).to_string();"},{"Add":" if let Err(e) = send_push_signatures("},{"Add":" config,"},{"Add":" &mut remote,"},{"Add":" &effective_channel,"},{"Add":" remote_state,"},{"Add":" &to_upload,"},{"Add":" )"},{"Add":" .await"},{"Add":" {"},{"Add":" writeln!(stderr, \"Warning: could not send push signatures: {}\", e)?;"}]}},{"Edit":{"inode":{"change":2,"pos":111631},"path":"pijul/src/commands/pushpull.rs","line":704,"atom":{"NewVertex":{"up_context":[{"change":2,"pos":117435}],"down_context":[{"change":2,"pos":117435}],"flag":"BLOCK","start":12840,"end":12841,"inode":{"change":2,"pos":111631}}},"contents":[{"Add":""}]}},{"Edit":{"inode":{"change":2,"pos":111631},"path":"pijul/src/commands/pushpull.rs","line":709,"atom":{"NewVertex":{"up_context":[{"change":2,"pos":117506}],"down_context":[{"change":2,"pos":117506}],"flag":"BLOCK","start":12842,"end":14019,"inode":{"change":2,"pos":111631}}},"contents":[{"Add":" }"},{"Add":"}"},{"Add":""},{"Add":"/// Sign `(remote head, patch, now)` for each change being pushed and stream the"},{"Add":"/// signatures to the remote ahead of the applies. `state` is the remote head the"},{"Add":"/// changelist exchange already cached — shared by the whole batch, so every"},{"Add":"/// signature commits to the position the pusher observed, with no extra"},{"Add":"/// round-trip (an in-band `state` query here stalls the push). No-op unless a"},{"Add":"/// remote head is known and an identity is available; all failures propagate to"},{"Add":"/// the caller as a single warning."},{"Add":"async fn send_push_signatures("},{"Add":" config: &pijul_config::Config,"},{"Add":" remote: &mut RemoteRepo,"},{"Add":" channel: &str,"},{"Add":" state: Option,"},{"Add":" to_upload: &[CS],"},{"Add":") -> Result<(), anyhow::Error> {"},{"Add":" // No known remote head (fresh/empty remote, or a non-Nest peer) ⇒ nothing to"},{"Add":" // bind a signature to."},{"Add":" let Some(state) = state else {"},{"Add":" return Ok(());"},{"Add":" };"},{"Add":""},{"Add":" // Best-effort identity: with none configured there is nothing to sign with,"},{"Add":" // and we must not trigger interactive identity setup during a push."},{"Add":" if pijul_identity::Complete::load_all()"},{"Add":" .map(|v| v.is_empty())"},{"Add":" .unwrap_or(true)"},{"Add":" {"},{"Add":" return Ok(());"}]}},{"Edit":{"inode":{"change":2,"pos":111631},"path":"pijul/src/commands/pushpull.rs","line":740,"atom":{"NewVertex":{"up_context":[{"change":2,"pos":117512}],"down_context":[{"change":2,"pos":117512}],"flag":"BLOCK","start":14020,"end":14694,"inode":{"change":2,"pos":111631}}},"contents":[{"Add":" let name = pijul_identity::choose_identity_name(config).await?;"},{"Add":" let skey = pijul_identity::Complete::load(&name)?.skey();"},{"Add":""},{"Add":" let timestamp = std::time::SystemTime::now()"},{"Add":" .duration_since(std::time::UNIX_EPOCH)?"},{"Add":" .as_secs() as i64;"},{"Add":""},{"Add":" for c in to_upload {"},{"Add":" let CS::Change(hash) = c else { continue };"},{"Add":" let msg = format!(\"{} {} {}\", state.to_base32(), hash.to_base32(), timestamp);"},{"Add":" let sig = pijul_identity::sign_sshsig_ns(&skey, \"pijul-push\", msg.as_bytes()).await?;"},{"Add":" let bytes = sig.to_bytes()?;"},{"Add":" remote"},{"Add":" .push_signature(channel, *hash, state, timestamp, &bytes)"},{"Add":" .await?;"},{"Add":" }"},{"Add":" Ok(())"}]}},{"Edit":{"inode":{"change":2,"pos":133619},"path":"pijul/src/commands/mod.rs","line":26,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":2,"pos":133860},"to":{"change":15,"start":225,"end":264},"introduced_by":15}],"inode":{"change":2,"pos":133619}}},"contents":[{"Del":"mod approve;\npub use approve::Approve;\n"}]}},{"Replacement":{"inode":{"change":2,"pos":1030188},"path":"Cargo.toml","line":10,"ins":{"up_context":[{"change":12,"pos":70}],"down_context":[{"change":10,"pos":1219}],"flag":"BLOCK","start":14695,"end":14708,"inode":{"change":2,"pos":1030188}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":12,"pos":70},"to":{"change":17,"start":1354,"end":1384},"introduced_by":17}],"inode":{"change":2,"pos":1030188}},"ins_contents":[{"Add":" \"pijul\","}],"del_contents":[{"Del":" \"pijul\", \"pijul-approve\",\n"}]}}],"owner":"pijul","repo":"pijul","token":"w7IonnJNuD9nyJUNDse/U4h+s7AoEvhJNpyqpXG5SsE=","login":null}

…

Dependencies

Change contents