{"header":{"message":"New approval system","description":null,"timestamp":"2026-07-18T15:40:14.094680004Z","authors":[{}]},"hash":"AH4IBU3TU6SQEJHUA3RNI2RFXZSSIC4NAWX72WVS6X3LLG5LQMXAC","authors":[{"login":"pmeunier","key":"AAAAC3NzaC1lZDI1NTE5AAAAILagOJFgwaMNhBWQINinKOXmqS4Gh5NgxgriXwdOoINJ"}],"deps":{"hashes":[["AH4IBU3TU6SQEJHUA3RNI2RFXZSSIC4NAWX72WVS6X3LLG5LQMXAC","New approval system"],["AA",null],["D4SBRY6KHEAMGUEVWSUYHNCRYXCOC5JJ3N3DQ47ZXOXQGT73VERAC","Initial patch"],["PCR2LDLTK6XVSBXJL6IMGQP7GSE5UNFCT6WRM2H5EPQ2AZWFRCFAC","update + CI"],["AX7NN2MQXFV32SW32M2NKYGSLA775AWFIWUWX3R5YAMPG32HMZMQC","Redesign (fat change)"],["APRMGSDR2JE5AXXTIF7LZ7K5N54YDSQR4DJWKILZET45B6ODZPPAC","SSH: approve"],["EG3MNPQXLNF62UQAP3342JC4OL47MAUCYJM6Q4G7BVVBM2VXMDCAC","Patch reviews"]],"deps":["D4SBRY6KHEAMGUEVWSUYHNCRYXCOC5JJ3N3DQ47ZXOXQGT73VERAC","PCR2LDLTK6XVSBXJL6IMGQP7GSE5UNFCT6WRM2H5EPQ2AZWFRCFAC","AX7NN2MQXFV32SW32M2NKYGSLA775AWFIWUWX3R5YAMPG32HMZMQC","APRMGSDR2JE5AXXTIF7LZ7K5N54YDSQR4DJWKILZET45B6ODZPPAC","EG3MNPQXLNF62UQAP3342JC4OL47MAUCYJM6Q4G7BVVBM2VXMDCAC"],"known":[]},"hunks":[{"FileAdd":{"meta":{"basename":"2026-07-16-000000_patch_approvals","metadata":576},"context":[{"change":2,"pos":297727}],"contents":[]}},{"FileAdd":{"meta":{"basename":"up.sql","metadata":0},"context":[{"change":0,"pos":45}],"contents":[{"Add":"-- Repurpose `approvals` from channel-state signatures to per-change (patch)"},{"Add":"-- signatures. A patch approval is a signature over a change's hash; the same"},{"Add":"-- signature is meaningful on every channel the change belongs to, so the"},{"Add":"-- channel/state columns go away and the row is keyed by the change hash."},{"Add":"--"},{"Add":"-- Existing state-approval rows are a different concept under the new model and"},{"Add":"-- are discarded."},{"Add":""},{"Add":"DROP INDEX IF EXISTS approvals_repo_channel_state;"},{"Add":""},{"Add":"DELETE FROM public.approvals;"},{"Add":""},{"Add":"ALTER TABLE public.approvals DROP COLUMN channel CASCADE;"},{"Add":"ALTER TABLE public.approvals DROP COLUMN state CASCADE;"},{"Add":""},{"Add":"ALTER TABLE public.approvals ADD COLUMN hash text NOT NULL;"},{"Add":""},{"Add":"ALTER TABLE public.approvals"},{"Add":" ADD CONSTRAINT approvals_repo_hash_key UNIQUE (repo_id, hash, public_key);"},{"Add":""},{"Add":"CREATE INDEX approvals_repo_hash ON public.approvals (repo_id, hash);"}]}},{"FileAdd":{"meta":{"basename":"down.sql","metadata":0},"context":[{"change":0,"pos":45}],"contents":[{"Add":"-- Revert to channel-state approvals. Existing patch-approval rows are dropped."},{"Add":""},{"Add":"DROP INDEX IF EXISTS approvals_repo_hash;"},{"Add":""},{"Add":"DELETE FROM public.approvals;"},{"Add":""},{"Add":"ALTER TABLE public.approvals DROP CONSTRAINT IF EXISTS approvals_repo_hash_key;"},{"Add":"ALTER TABLE public.approvals DROP COLUMN hash CASCADE;"},{"Add":""},{"Add":"ALTER TABLE public.approvals ADD COLUMN channel text NOT NULL;"},{"Add":"ALTER TABLE public.approvals ADD COLUMN state text NOT NULL;"},{"Add":""},{"Add":"ALTER TABLE public.approvals"},{"Add":" ADD CONSTRAINT approvals_repo_id_channel_state_public_key_key"},{"Add":" UNIQUE (repo_id, channel, state, public_key);"},{"Add":""},{"Add":"CREATE INDEX approvals_repo_channel_state ON public.approvals (repo_id, channel, state);"}]}},{"Replacement":{"inode":{"change":2,"pos":319304},"path":"api/src/ssh.rs","line":610,"ins":{"up_context":[{"change":2,"pos":342414}],"down_context":[{"change":2,"pos":342414}],"flag":"BLOCK","start":1609,"end":1700,"inode":{"change":2,"pos":319304}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":2,"pos":342414},"to":{"change":5,"start":0,"end":121},"introduced_by":5}],"inode":{"change":2,"pos":319304}},"ins_contents":[{"Add":" static ref SIGN: Regex = Regex::new(r#\"^sign\\s+(\\S+)\\s+(\\S+)\\s*\\n\"#).unwrap();"}],"del_contents":[{"Del":" static ref APPROVE: Regex =\n Regex::new(r#\"^approve\\s+(\\S+)\\s+(\\S+)\\s+(\\S+)\\s*\\n\"#).unwrap();\n"}]}},{"Replacement":{"inode":{"change":2,"pos":319304},"path":"api/src/ssh.rs","line":668,"ins":{"up_context":[{"change":5,"pos":178}],"down_context":[{"change":2,"pos":345363}],"flag":"BLOCK","start":1701,"end":1823,"inode":{"change":2,"pos":319304}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":178},"to":{"change":5,"start":178,"end":306},"introduced_by":5}],"inode":{"change":2,"pos":319304}},"ins_contents":[{"Add":" } else if let Some(cap) = SIGN.captures(data) {"},{"Add":" self.sign(cap, chan, session).await?;"}],"del_contents":[{"Del":" } else if let Some(cap) = APPROVE.captures(data) {\n self.approve(cap, chan, session).await?;\n"}]}},{"Replacement":{"inode":{"change":2,"pos":319304},"path":"api/src/ssh.rs","line":818,"ins":{"up_context":[{"change":5,"pos":339}],"down_context":[{"change":5,"pos":518}],"flag":"BLOCK","start":1824,"end":2008,"inode":{"change":2,"pos":319304}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":339},"to":{"change":5,"start":339,"end":518},"introduced_by":5}],"inode":{"change":2,"pos":319304}},"ins_contents":[{"Add":" /// `sign

`: record a cryptographic approval of a"},{"Add":" /// patch (change). The SSHSIG over the change hash is the authorization."},{"Add":" async fn sign<'a>("}],"del_contents":[{"Del":" /// `approve

`: record a cryptographic\n /// approval of a channel state. The SSHSIG is the authorization.\n async fn approve<'a>(\n"}]}},{"Replacement":{"inode":{"change":2,"pos":319304},"path":"api/src/ssh.rs","line":831,"ins":{"up_context":[{"change":5,"pos":795}],"down_context":[{"change":5,"pos":959}],"flag":"BLOCK","start":2009,"end":2130,"inode":{"change":2,"pos":319304}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":795},"to":{"change":5,"start":795,"end":959},"introduced_by":5}],"inode":{"change":2,"pos":319304}},"ins_contents":[{"Add":" let hash = cap[1].to_string();"},{"Add":" let bytes = match data_encoding::BASE64_NOPAD.decode(cap[2].as_bytes()) {"}],"del_contents":[{"Del":" let channel = cap[1].to_string();\n let state = cap[2].to_string();\n let bytes = match data_encoding::BASE64_NOPAD.decode(cap[3].as_bytes()) {\n"}]}},{"Replacement":{"inode":{"change":2,"pos":319304},"path":"api/src/ssh.rs","line":845,"ins":{"up_context":[{"change":5,"pos":1342}],"down_context":[{"change":5,"pos":1435}],"flag":"BLOCK","start":2131,"end":2283,"inode":{"change":2,"pos":319304}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":1342},"to":{"change":5,"start":1342,"end":1435},"introduced_by":5}],"inode":{"change":2,"pos":319304}},"ins_contents":[{"Add":" session.data("},{"Add":" chan,"},{"Add":" thrussh::CryptoVec::from_slice(b\"Invalid signature.\\n\"),"},{"Add":" );"}],"del_contents":[{"Del":" session.data(chan, thrussh::CryptoVec::from_slice(b\"Invalid signature.\\n\"));\n"}]}},{"Replacement":{"inode":{"change":2,"pos":319304},"path":"api/src/ssh.rs","line":856,"ins":{"up_context":[{"change":5,"pos":1616}],"down_context":[{"change":5,"pos":1658}],"flag":"BLOCK","start":2284,"end":2303,"inode":{"change":2,"pos":319304}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":1616},"to":{"change":5,"start":1616,"end":1658},"introduced_by":5}],"inode":{"change":2,"pos":319304}},"ins_contents":[{"Add":" &hash,"}],"del_contents":[{"Del":" &channel,\n &state,\n"}]}},{"Replacement":{"inode":{"change":2,"pos":319304},"path":"api/src/ssh.rs","line":1249,"ins":{"up_context":[{"change":2,"pos":362820}],"down_context":[{"change":2,"pos":362923}],"flag":"BLOCK","start":2304,"end":2381,"inode":{"change":2,"pos":319304}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":2,"pos":362820},"to":{"change":2,"start":362820,"end":362849},"introduced_by":2},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":2,"pos":362849},"to":{"change":3,"start":20628,"end":20675},"introduced_by":3}],"inode":{"change":2,"pos":319304}},"ins_contents":[{"Add":" match &self.channel {"},{"Add":" Some(ChannelSpec::Channel(c)) => {"}],"del_contents":[{"Del":" match self.channel {\n"},{"Del":" Some(ChannelSpec::Channel(_)) => {\n"}]}},{"Edit":{"inode":{"change":2,"pos":319304},"path":"api/src/ssh.rs","line":1252,"atom":{"NewVertex":{"up_context":[{"change":2,"pos":362984}],"down_context":[{"change":2,"pos":362984}],"flag":"BLOCK","start":2382,"end":2461,"inode":{"change":2,"pos":319304}}},"contents":[{"Add":" info!(\"apply {:?} {:?}: {:?}\", hash, c, self.permissions);"}]}},{"Replacement":{"inode":{"change":2,"pos":319304},"path":"api/src/ssh.rs","line":1256,"ins":{"up_context":[{"change":2,"pos":363082}],"down_context":[{"change":2,"pos":363132}],"flag":"BLOCK","start":2462,"end":2512,"inode":{"change":2,"pos":319304}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":2,"pos":363082},"to":{"change":2,"start":363082,"end":363132},"introduced_by":2}],"inode":{"change":2,"pos":319304}},"ins_contents":[{"Add":" Some(ChannelSpec::Discussion(c)) => {"}],"del_contents":[{"Del":" Some(ChannelSpec::Discussion(_)) => {\n"}]}},{"Edit":{"inode":{"change":2,"pos":319304},"path":"api/src/ssh.rs","line":1258,"atom":{"NewVertex":{"up_context":[{"change":2,"pos":363205}],"down_context":[{"change":2,"pos":363205}],"flag":"BLOCK","start":2513,"end":2597,"inode":{"change":2,"pos":319304}}},"contents":[{"Add":" info!(\"apply disc {:?} {:?}: {:?}\", hash, c, self.permissions);"}]}},{"Edit":{"inode":{"change":2,"pos":319304},"path":"api/src/ssh.rs","line":1338,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":4862665},"to":{"change":4,"start":4862665,"end":4862796},"introduced_by":4}],"inode":{"change":2,"pos":319304}}},"contents":[{"Del":"\n #[derive(Debug, Deserialize)]\n struct Approval {\n key: String,\n signature: String,\n }\n"}]}},{"Edit":{"inode":{"change":2,"pos":319304},"path":"api/src/ssh.rs","line":1339,"atom":{"NewVertex":{"up_context":[{"change":4,"pos":4862797}],"down_context":[{"change":4,"pos":4862797}],"flag":"BLOCK","start":2598,"end":2806,"inode":{"change":2,"pos":319304}}},"contents":[{"Add":" // The author's mandatory signature rides with the change in its"},{"Add":" // `unhashed` field; additional approvals are detached and live in the"},{"Add":" // `approvals` table, keyed by the change hash."}]}},{"Replacement":{"inode":{"change":2,"pos":319304},"path":"api/src/ssh.rs","line":1343,"ins":{"up_context":[{"change":4,"pos":4862835}],"down_context":[{"change":4,"pos":4862862}],"flag":"BLOCK","start":2807,"end":2833,"inode":{"change":2,"pos":319304}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":4862835},"to":{"change":4,"start":4862835,"end":4862862},"introduced_by":4}],"inode":{"change":2,"pos":319304}},"ins_contents":[{"Add":" struct Unhashed {"}],"del_contents":[{"Del":" struct Approvals {\n"}]}},{"Edit":{"inode":{"change":2,"pos":319304},"path":"api/src/ssh.rs","line":1345,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":4862892},"to":{"change":4,"start":4862892,"end":4862961},"introduced_by":4}],"inode":{"change":2,"pos":319304}}},"contents":[{"Del":" approvals: Vec,\n\n #[serde(default)]\n"}]}},{"Replacement":{"inode":{"change":2,"pos":319304},"path":"api/src/ssh.rs","line":1348,"ins":{"up_context":[{"change":4,"pos":4863003}],"down_context":[{"change":4,"pos":4863101}],"flag":"BLOCK","start":2834,"end":2932,"inode":{"change":2,"pos":319304}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":4863003},"to":{"change":4,"start":4863003,"end":4863101},"introduced_by":4}],"inode":{"change":2,"pos":319304}},"ins_contents":[{"Add":" let author_sig: Option = unhashed.and_then(|x| serde_json::from_value(x).ok());"}],"del_contents":[{"Del":" let approvals: Option = unhashed.and_then(|x| serde_json::from_value(x).ok());\n"}]}},{"Replacement":{"inode":{"change":2,"pos":319304},"path":"api/src/ssh.rs","line":1363,"ins":{"up_context":[{"change":4,"pos":4863558}],"down_context":[{"change":4,"pos":4863598}],"flag":"BLOCK","start":2933,"end":2965,"inode":{"change":2,"pos":319304}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":4863558},"to":{"change":4,"start":4863558,"end":4863598},"introduced_by":4}],"inode":{"change":2,"pos":319304}},"ins_contents":[{"Add":" if min_signatures > 0 {"}],"del_contents":[{"Del":" if true || min_signatures > 0 {\n"}]}},{"Edit":{"inode":{"change":2,"pos":319304},"path":"api/src/ssh.rs","line":1366,"atom":{"NewVertex":{"up_context":[{"change":4,"pos":4863693}],"down_context":[{"change":4,"pos":4863693}],"flag":"BLOCK","start":2966,"end":3021,"inode":{"change":2,"pos":319304}}},"contents":[{"Add":" use diesel::{ExpressionMethods, QueryDsl};"}]}},{"Replacement":{"inode":{"change":2,"pos":319304},"path":"api/src/ssh.rs","line":1369,"ins":{"up_context":[{"change":2,"pos":365599}],"down_context":[{"change":4,"pos":4864003}],"flag":"BLOCK","start":3022,"end":3341,"inode":{"change":2,"pos":319304}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":2,"pos":365599},"to":{"change":4,"start":4863746,"end":4864003},"introduced_by":4}],"inode":{"change":2,"pos":319304}},"ins_contents":[{"Add":" // The author's own signature, carried in `unhashed`."},{"Add":" if let Some(au) = author_sig {"},{"Add":" if let Ok(sshsig) = thrussh_keys::SshSig::from_pem(&au.signature) {"},{"Add":" if sshsig.verify(&hash.to_bytes()).unwrap_or(false) {"},{"Add":" if let Some(uid) = u::users"}],"del_contents":[{"Del":" if let Some(approvals) = approvals {\n if let Ok(sshsig) = thrussh_keys::SshSig::from_pem(&approvals.signature) {\n if sshsig.verify(&hash.to_bytes()).unwrap() {\n if let Some(id) = u::users\n"}]}},{"Replacement":{"inode":{"change":2,"pos":319304},"path":"api/src/ssh.rs","line":1382,"ins":{"up_context":[{"change":4,"pos":4864430}],"down_context":[{"change":4,"pos":4864484}],"flag":"BLOCK","start":3342,"end":3397,"inode":{"change":2,"pos":319304}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":4864430},"to":{"change":4,"start":4864430,"end":4864484},"introduced_by":4}],"inode":{"change":2,"pos":319304}},"ins_contents":[{"Add":" valid_signers.insert(uid);"}],"del_contents":[{"Del":" valid_signers.insert(id);\n"}]}},{"Replacement":{"inode":{"change":2,"pos":319304},"path":"api/src/ssh.rs","line":1386,"ins":{"up_context":[{"change":4,"pos":4864550}],"down_context":[{"change":4,"pos":4864789}],"flag":"BLOCK","start":3398,"end":3412,"inode":{"change":2,"pos":319304}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":4864550},"to":{"change":4,"start":4864550,"end":4864789},"introduced_by":4}],"inode":{"change":2,"pos":319304}},"ins_contents":[{"Add":" }"}],"del_contents":[{"Del":"\n for sig in approvals.approvals.iter() {\n let key_ssh = data_encoding::BASE64_NOPAD\n .decode(sig.key.as_bytes())\n .map_err(|_| crate::Error::ProtocolError)?;\n"}]}},{"Replacement":{"inode":{"change":2,"pos":319304},"path":"api/src/ssh.rs","line":1388,"ins":{"up_context":[{"change":4,"pos":4864790}],"down_context":[{"change":4,"pos":4865497}],"flag":"BLOCK","start":3413,"end":4094,"inode":{"change":2,"pos":319304}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":4864790},"to":{"change":4,"start":4864790,"end":4865497},"introduced_by":4}],"inode":{"change":2,"pos":319304}},"ins_contents":[{"Add":" // Detached approvals recorded via the `sign` verb; each was verified"},{"Add":" // and resolved to a signer when stored."},{"Add":" {"},{"Add":" use crate::db::approvals::dsl as ap;"},{"Add":" let approvers: Vec = ap::approvals"},{"Add":" .inner_join(u::users)"},{"Add":" .filter(ap::repo_id.eq(id.repo_id))"},{"Add":" .filter(ap::hash.eq(hash.to_base32()))"},{"Add":" .filter(u::is_active)"},{"Add":" .select(u::id)"},{"Add":" .load::(&mut self.db.get().await?)"},{"Add":" .await?;"},{"Add":" for uid in approvers {"},{"Add":" valid_signers.insert(uid);"}],"del_contents":[{"Del":" let sshsig = thrussh_keys::SshSig::from_pem(&sig.signature).unwrap();\n if sshsig.verify(&hash.to_bytes()).unwrap() {\n if let Some(id) = u::users\n .inner_join(sk::signingkeys)\n .filter(sk::public_key.eq(&key_ssh))\n .filter(u::is_active)\n .select(u::id)\n .get_result::(&mut self.db.get().await?)\n .await\n .optional()?\n {\n valid_signers.insert(id);\n }\n }\n"}]}},{"Edit":{"inode":{"change":2,"pos":319304},"path":"api/src/ssh.rs","line":1406,"atom":{"NewVertex":{"up_context":[{"change":4,"pos":4865640}],"down_context":[{"change":4,"pos":4865640}],"flag":"BLOCK","start":4095,"end":4295,"inode":{"change":2,"pos":319304}}},"contents":[{"Add":" info!("},{"Add":" \"apply signatures {:?} {:?}: {:?}\","},{"Add":" hash,"},{"Add":" valid_signers.len(),"},{"Add":" min_signatures"},{"Add":" );"}]}},{"Edit":{"inode":{"change":2,"pos":391778},"path":"api/src/repository/router.rs","line":10,"atom":{"NewVertex":{"up_context":[{"change":2,"pos":391983}],"down_context":[{"change":3,"pos":21062}],"flag":"BLOCK","start":4296,"end":4359,"inode":{"change":2,"pos":391778}}},"contents":[{"Add":"use percent_encoding::{NON_ALPHANUMERIC, utf8_percent_encode};"}]}},{"Edit":{"inode":{"change":2,"pos":391778},"path":"api/src/repository/router.rs","line":251,"atom":{"NewVertex":{"up_context":[{"change":4,"pos":4882999}],"down_context":[{"change":4,"pos":4882999}],"flag":"BLOCK","start":4360,"end":5861,"inode":{"change":2,"pos":391778}}},"contents":[{"Add":""},{"Add":" // Derive Content-Type and disposition from the file extension."},{"Add":" //"},{"Add":" // These files are user-committed content served from our own origin, so"},{"Add":" // anything that a browser might execute (HTML, and crucially SVG, which can"},{"Add":" // carry

…

Dependencies

Change contents