From 1dcf40f06c27f4deff73df204dc05fbf999234f5 Mon Sep 17 00:00:00 2001 From: tv Date: Thu, 22 Oct 2026 20:37:34 +0200 Subject: introduce pre-shared swarm key --- src/transport/mod.rs | 4 ++++ src/transport/mycelium.rs | 8 ++++++++ 2 files changed, 12 insertions(+) (limited to 'src/transport') diff --git a/src/transport/mod.rs b/src/transport/mod.rs index 0afb5ee..58db611 100644 --- a/src/transport/mod.rs +++ b/src/transport/mod.rs @@ -43,6 +43,8 @@ impl ParsedMessage { #[derive(Debug, Clone)] pub struct HelloRequest { pub epoch: Epoch, + /// Proof of the swarm key (`swarm::auth`); empty without one. + pub auth: Vec, } #[derive(Debug, Clone)] @@ -50,6 +52,8 @@ pub struct HelloReply { pub swarm_id: String, pub peers: Vec, pub epoch: Epoch, + /// Proof of the swarm key (`swarm::auth`); empty without one. + pub auth: Vec, } #[derive(Debug, Clone)] diff --git a/src/transport/mycelium.rs b/src/transport/mycelium.rs index 194f998..057916f 100644 --- a/src/transport/mycelium.rs +++ b/src/transport/mycelium.rs @@ -851,6 +851,8 @@ fn bytes_to_keepalive(bytes: &[u8]) -> Result { pub struct HelloRequestShadow { #[serde(default)] epoch: EpochShadow, + #[serde(default)] + auth: ByteBuf, } #[derive(Serialize, Deserialize)] @@ -861,6 +863,8 @@ pub struct HelloReplyShadow<'a> { pub peers: Vec, #[serde(default)] epoch: EpochShadow, + #[serde(default)] + auth: ByteBuf, } #[derive(Serialize, Deserialize)] @@ -905,12 +909,14 @@ mod automerge_msg_codec { pub fn hello_request_to_bytes(msg: &HelloRequest) -> Result, rmp_serde::encode::Error> { rmp_serde::to_vec(&HelloRequestShadow { epoch: epoch_to_shadow(&msg.epoch), + auth: ByteBuf::from(msg.auth.clone()), }) } pub fn bytes_to_hello_request(bytes: &[u8]) -> Result { let shadow: HelloRequestShadow = rmp_serde::from_slice(bytes)?; Ok(HelloRequest { epoch: epoch_from_shadow(shadow.epoch)?, + auth: shadow.auth.into_vec(), }) } @@ -920,6 +926,7 @@ pub fn hello_reply_to_bytes(msg: &HelloReply) -> Result, rmp_serde::enco swarm_id: Cow::Borrowed(&msg.swarm_id), peers: msg.peers.clone(), // Vec must be cloned for serialization wrapper matching epoch: epoch_to_shadow(&msg.epoch), + auth: ByteBuf::from(msg.auth.clone()), }; rmp_serde::to_vec(&shadow) } @@ -929,6 +936,7 @@ pub fn bytes_to_hello_reply(bytes: &[u8]) -> Result swarm_id: shadow.swarm_id.into_owned(), peers: shadow.peers, epoch: epoch_from_shadow(shadow.epoch)?, + auth: shadow.auth.into_vec(), }) } -- cgit v1.3.1