From 6c6f978189eafa15add0df865f713dc946dfc5cb Mon Sep 17 00:00:00 2001 From: tv Date: Thu, 19 Nov 2026 03:52:49 +0000 Subject: federation: merge events, the first revision What builds on many heads merges them, but only an event a party writes: in a quiet federation, heads beside each other stay so, and past 64 no event is above them all. Revision 1 (`merge-events`) adds merge events: `{"merge": true}`, signed with a node's own key, the `key` its Ed25519 key, for the party whose node list names it. One counts for nothing, and only gathers what it builds on into the history of what builds on it. Under the base revision, signed by a node its party doesn't list, or by a party's key, it is refused; the model alike. Generated federations begin at either revision, and their nodes merge. A node voting by itself backs no version changing the revision, on any version neither: its party's operators vote on that one, once their nodes run a continuum that knows it. `federation.md` lists the revisions, says what a merge event is, and row 71 is tested (`federation_attack_71`). --- src/federation/attacks.rs | 42 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 42 insertions(+) (limited to 'src/federation/attacks.rs') diff --git a/src/federation/attacks.rs b/src/federation/attacks.rs index 2043c19..215a860 100644 --- a/src/federation/attacks.rs +++ b/src/federation/attacks.rs @@ -1359,3 +1359,45 @@ fn federation_attack_64() { fed.take(lass.vote(&[no], on, bad.hash(), false)); } } + +/// Merge events: under the base revision, signed by a node its party doesn't list, by a +/// party's key, or spelled otherwise. Taken only under a revision with merge events, +/// signed by a node its party lists; and they count for nothing. +#[test] +fn federation_attack_71() { + use super::event; + use super::revision::Feature; + let (tv, lass, makefu) = (tv(), lass(), makefu()); + let mut fed = three(); + let root = fed.root(); + let on = fed.first.hash(); + let write = fed.take(tv.write(&[root], "home/tv/a", s("1"))); + // tv lists node 0 (`Spec::first`). + fed.judged(harness::merge("tv", 0, &[write])); + let mut revised = fed.first.after(on); + revised.revision = Feature::MergeEvents.revision(); + let (_, written) = fed.pass(&[write], &lass, &revised, on, &[&lass, &makefu]); + let before = (fed.store.state().values(), fed.store.state().members()); + let merged = fed.take(harness::merge("tv", 0, &[written])); + fed.judged(harness::merge("tv", 5, &[merged])); + fed.judged(harness::merge("lass", 0, &[merged])); + fed.judged(tv.sign(&[merged], event::merge())); + let otherwise = harness::node_key(0); + let line = crate::access::sshsig::PublicKey(otherwise.verifying_key().to_bytes()).line(); + assert_eq!( + fed.refused(event::signed( + &otherwise, + "tv", + &line, + &[merged], + ("merge", Json::Bool(false)) + )), + Refusal::None + ); + // Nothing it builds on counts otherwise. + assert_eq!( + (fed.store.state().values(), fed.store.state().members()), + before + ); + assert_eq!(fed.store.heads(), vec![merged]); +} -- cgit v1.3.1