Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
73 changes: 69 additions & 4 deletions crates/smallclaims/src/store/fabric_rekey.rs
Original file line number Diff line number Diff line change
Expand Up @@ -42,10 +42,14 @@ fn node_id(node: &str) -> bool {
impl Store {
fn own_endpoint_fields(&self) -> Result<Value> {
let key = self.member_public_key().context("this node has no fleet member key")?;
Ok(self.latest_claim(&format!("host/{}", self.origin), Some("fleet.member-endpoints"))?
.map(|claim| claim.body["fields"].clone())
.filter(|fields| fields["member_key"] == key)
.unwrap_or_else(|| json!({"endpoints":[]})))
// Reuse the membership fold's writer, signature and incarnation-window checks.
// A public member_key copied into another writer's claim is not authority.
let membership = self.fleet_membership()?;
Ok(match membership.state(&self.origin) {
crate::fleet::MemberState::Current(own) if own.member_key == key =>
json!({"mode": own.mode, "endpoints": own.endpoints}),
_ => json!({"endpoints":[]}),
})
}

pub(super) fn preserve_fabric_rekey(&self, mode: &str, endpoints: &[Value], clear: bool) -> Result<Vec<Value>> {
Expand Down Expand Up @@ -199,6 +203,67 @@ mod tests {
view.members.iter().find(|member| member.name == "anchor").unwrap().endpoints.clone()
}

fn append_fields(store: &Store, subject: &str, kind: &str, fields: Value) {
store.append_claim(&ClaimInput {
subject: subject.into(), kind: kind.into(), actor: None,
fields: serde_json::from_value(fields).unwrap(), evidence: Vec::new(),
expected_subject: None, idempotency_key: None,
}).unwrap();
}

fn exchange(source: &Store, target: &Store) {
let exchange = source.export_replication_exchange(
"rekey-test", &target.replication_inventory().unwrap()).unwrap();
target.receive_replication_exchange(&source.origin, "rekey-test", &exchange).unwrap();
let admission = target.validate_replication_backlog().unwrap();
assert_eq!(admission.held, 0, "{admission:?}");
target.project_replication_backlog().unwrap();
}

#[test]
fn another_members_signed_rekey_metadata_is_not_preserved_or_republished() {
let store = Store::open_memory("anchor", Arc::new(Plain)).unwrap();
let own_key = configure(&store);
let peer = Store::open_memory("peer", Arc::new(Plain)).unwrap();
let peer_key = Arc::new(MemberKey::generate().unwrap().0);
peer.bind_fleet("rekey-test").unwrap();
peer.pin_fleet_anchor(own_key.public()).unwrap();
peer.set_member_key(Some(peer_key.clone())).unwrap();
append_fields(&store, "host/peer", "fleet.member-admitted", json!({
"member_key":peer_key.public(), "via":"member", "sponsor":"anchor",
"writer_floor":0, "mode":"listening"
}));
exchange(&store, &peer);
for legitimate in [false, true] {
if legitimate {
assert!(store.fabric_rekey_at(&request(FabricRekeyAction::Prepare), "test", 1000).unwrap());
}
let authenticated = current_endpoints(&store);
append_fields(&peer, "host/anchor", "fleet.member-endpoints", json!({
"member_key":own_key.public(), "mode":"listening",
"endpoints":[
{"transport":"fabric", "node":"d".repeat(64)},
{"transport":"fabric-rekey", "state":"committed",
"old_node":"a".repeat(64), "next_node":"d".repeat(64), "deadline":1600},
{"transport":"fabric-rekey-receipt", "member_key":peer_key.public(),
"old_node":"a".repeat(64), "next_node":"d".repeat(64), "deadline":1600,
"state":"committed"}
]
}));
exchange(&peer, &store);
let latest = store.latest_claim("host/anchor", Some("fleet.member-endpoints")).unwrap().unwrap();
assert_eq!(latest.origin, "peer", "the unauthenticated latest lookup accepts the forgery");
assert_eq!(current_endpoints(&store), authenticated, "membership rejects the forgery");
store.publish_fleet_endpoints("listening", &[json!({
"transport":"fabric", "node":"a".repeat(64), "protocol":"fractal/fleet/rekey-test"
})], "test").unwrap();
let published = store.latest_claim("host/anchor", Some("fleet.member-endpoints")).unwrap().unwrap();
assert_eq!(published.origin, "anchor");
assert_eq!(published.body["fields"]["endpoints"], json!(authenticated));
assert_eq!(current_endpoints(&store), authenticated);
}
}

#[test]
fn signed_transition_survives_worker_refresh_and_abort_from_committed() {
let store = Store::open_memory("anchor", Arc::new(Plain)).unwrap();
Expand Down
11 changes: 11 additions & 0 deletions release-notes/fabric-rekey-authenticated-own-metadata.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
{
"version": 1,
"summary": "Preserve Fabric re-key metadata only from the authenticated current local fleet incarnation",
"replay": {"status": "none", "detail": "No graph replay."},
"schema": {"status": "none", "detail": "No database or claim schema change."},
"rules": {"status": "none", "detail": "No checkpoint rule change."},
"compatibility": {"status": "changed", "detail": "Endpoint refreshes and re-key operations read local metadata through the existing membership writer, signature and incarnation-window checks; another member cannot supply local rotation metadata by copying the public member key."},
"downtime": {"status": "none", "detail": "No additional downtime."},
"manual": {"status": "none", "detail": "No manual step."},
"recovery": {"status": "none", "detail": "Authenticated local transitions and receipts retain their existing refresh and recovery behavior."}
}
Loading