build: split into multiple crates
Signed-off-by: NotAShelf <raf@notashelf.dev> Change-Id: I6757cc99a0a5bc0c78193487df1ef52b6a6a6964
This commit is contained in:
parent
ce55a66e9c
commit
2c5210aee7
22 changed files with 661 additions and 161 deletions
17
crates/mesh/Cargo.toml
Normal file
17
crates/mesh/Cargo.toml
Normal file
|
|
@ -0,0 +1,17 @@
|
|||
[package]
|
||||
name = "ncro-mesh"
|
||||
version.workspace = true
|
||||
edition.workspace = true
|
||||
license.workspace = true
|
||||
|
||||
[dependencies]
|
||||
chrono.workspace = true
|
||||
ed25519-dalek = { workspace = true, features = [ "rand_core" ] }
|
||||
hex.workspace = true
|
||||
ncro-db.workspace = true
|
||||
rand.workspace = true
|
||||
rmp-serde.workspace = true
|
||||
serde = { workspace = true, features = [ "derive" ] }
|
||||
thiserror.workspace = true
|
||||
tokio = { workspace = true, features = [ "fs", "net", "rt", "sync", "time" ] }
|
||||
tracing.workspace = true
|
||||
228
crates/mesh/src/lib.rs
Normal file
228
crates/mesh/src/lib.rs
Normal file
|
|
@ -0,0 +1,228 @@
|
|||
use std::{path::Path, sync::Arc};
|
||||
|
||||
use chrono::Utc;
|
||||
use ed25519_dalek::{Signature, Signer, SigningKey, Verifier, VerifyingKey};
|
||||
use ncro_db::{Db, RouteEntry};
|
||||
use rand::RngExt;
|
||||
use serde::{Deserialize, Serialize};
|
||||
use thiserror::Error;
|
||||
use tokio::{net::UdpSocket, time::Duration};
|
||||
|
||||
const MAX_PACKET_SIZE: usize = 65_536;
|
||||
const HEADER_SIZE: usize = 96;
|
||||
|
||||
type DecodedPacket<'a> = (&'a [u8], &'a [u8], &'a [u8], Message);
|
||||
|
||||
#[derive(Debug, Error)]
|
||||
pub enum MeshError {
|
||||
#[error("io: {0}")]
|
||||
Io(#[from] std::io::Error),
|
||||
#[error("msgpack: {0}")]
|
||||
Encode(#[from] rmp_serde::encode::Error),
|
||||
#[error("decode msgpack: {0}")]
|
||||
Decode(#[from] rmp_serde::decode::Error),
|
||||
#[error("packet too short: {0} bytes")]
|
||||
PacketTooShort(usize),
|
||||
#[error("invalid signature")]
|
||||
InvalidSignature,
|
||||
}
|
||||
|
||||
#[derive(Debug, Clone, Copy, Serialize, Deserialize, PartialEq, Eq)]
|
||||
pub enum MsgType {
|
||||
Announce = 1,
|
||||
}
|
||||
|
||||
#[derive(Debug, Clone, Serialize, Deserialize)]
|
||||
pub struct Message {
|
||||
pub r#type: MsgType,
|
||||
pub node_id: String,
|
||||
pub timestamp: i64,
|
||||
pub routes: Vec<RouteEntry>,
|
||||
}
|
||||
|
||||
#[derive(Clone)]
|
||||
pub struct Node {
|
||||
signing_key: Arc<SigningKey>,
|
||||
}
|
||||
|
||||
impl Node {
|
||||
pub async fn new(key_path: &str) -> Result<Self, MeshError> {
|
||||
if key_path.is_empty() {
|
||||
return Ok(Self {
|
||||
signing_key: Arc::new(SigningKey::from_bytes(&random_key_bytes())),
|
||||
});
|
||||
}
|
||||
if let Ok(data) = tokio::fs::read(key_path).await
|
||||
&& (data.len() == 32 || data.len() == 64)
|
||||
{
|
||||
let Ok(bytes) = <[u8; 32]>::try_from(&data[..32]) else {
|
||||
return Err(MeshError::InvalidSignature);
|
||||
};
|
||||
return Ok(Self {
|
||||
signing_key: Arc::new(SigningKey::from_bytes(&bytes)),
|
||||
});
|
||||
}
|
||||
if let Some(parent) = Path::new(key_path).parent() {
|
||||
tokio::fs::create_dir_all(parent).await?;
|
||||
}
|
||||
let key = SigningKey::from_bytes(&random_key_bytes());
|
||||
tokio::fs::write(key_path, key.to_bytes()).await?;
|
||||
Ok(Self {
|
||||
signing_key: Arc::new(key),
|
||||
})
|
||||
}
|
||||
|
||||
pub fn id(&self) -> String {
|
||||
hex::encode(&self.public_key()[..8])
|
||||
}
|
||||
pub fn public_key(&self) -> [u8; 32] {
|
||||
self.signing_key.verifying_key().to_bytes()
|
||||
}
|
||||
pub fn sign(&self, msg: &Message) -> Result<(Vec<u8>, Vec<u8>), MeshError> {
|
||||
let body = rmp_serde::to_vec(msg)?;
|
||||
Ok((
|
||||
body.clone(),
|
||||
self.signing_key.sign(&body).to_bytes().to_vec(),
|
||||
))
|
||||
}
|
||||
}
|
||||
|
||||
fn random_key_bytes() -> [u8; 32] {
|
||||
let mut bytes = [0_u8; 32];
|
||||
rand::rng().fill(&mut bytes);
|
||||
bytes
|
||||
}
|
||||
|
||||
pub fn verify(pubkey: &[u8], body: &[u8], sig: &[u8]) -> Result<(), MeshError> {
|
||||
let pubkey: [u8; 32] =
|
||||
pubkey.try_into().map_err(|_| MeshError::InvalidSignature)?;
|
||||
let sig: [u8; 64] =
|
||||
sig.try_into().map_err(|_| MeshError::InvalidSignature)?;
|
||||
VerifyingKey::from_bytes(&pubkey)
|
||||
.map_err(|_| MeshError::InvalidSignature)?
|
||||
.verify(body, &Signature::from_bytes(&sig))
|
||||
.map_err(|_| MeshError::InvalidSignature)
|
||||
}
|
||||
|
||||
pub async fn listen_and_serve(
|
||||
addr: &str,
|
||||
db: Db,
|
||||
allowed_keys: Vec<[u8; 32]>,
|
||||
stop: tokio::sync::watch::Receiver<bool>,
|
||||
) -> Result<(), MeshError> {
|
||||
let socket = UdpSocket::bind(addr).await?;
|
||||
tokio::spawn(async move {
|
||||
let mut stop = stop;
|
||||
let mut buf = vec![0; MAX_PACKET_SIZE];
|
||||
loop {
|
||||
tokio::select! {
|
||||
_ = stop.changed() => return,
|
||||
recv = socket.recv_from(&mut buf) => {
|
||||
let Ok((n, src)) = recv else { return; };
|
||||
match decode_packet(&buf[..n]) {
|
||||
Ok((pubkey, sig, body, msg)) => {
|
||||
if !allowed_keys.is_empty() && !allowed_keys.iter().any(|k| k.as_slice() == pubkey) {
|
||||
tracing::warn!(?src, "mesh: rejecting packet from unknown sender");
|
||||
continue;
|
||||
}
|
||||
if let Err(err) = verify(pubkey, body, sig) {
|
||||
tracing::warn!(?src, error = %err, "mesh: signature verification failed");
|
||||
continue;
|
||||
}
|
||||
if msg.r#type == MsgType::Announce && !msg.routes.is_empty() {
|
||||
merge_routes(&db, msg.routes).await;
|
||||
}
|
||||
}
|
||||
Err(err) => tracing::warn!(?src, error = %err, "mesh: malformed packet"),
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
});
|
||||
Ok(())
|
||||
}
|
||||
|
||||
async fn merge_routes(db: &Db, incoming: Vec<RouteEntry>) {
|
||||
let now = Utc::now();
|
||||
for route in incoming.into_iter().filter(|route| route.ttl > now) {
|
||||
let should_set = match db.get_route(&route.store_path).await {
|
||||
Ok(Some(existing)) if route.latency_ema > existing.latency_ema => false,
|
||||
Ok(Some(existing))
|
||||
if route.latency_ema.total_cmp(&existing.latency_ema).is_eq()
|
||||
&& route.last_verified <= existing.last_verified =>
|
||||
{
|
||||
false
|
||||
},
|
||||
Ok(_) => true,
|
||||
Err(err) => {
|
||||
tracing::warn!(error = %err, store = route.store_path, "mesh: route lookup failed");
|
||||
false
|
||||
},
|
||||
};
|
||||
if should_set && let Err(err) = db.set_route(&route).await {
|
||||
tracing::warn!(error = %err, store = route.store_path, "mesh: route merge failed");
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
pub async fn announce(
|
||||
peer_addr: &str,
|
||||
node: &Node,
|
||||
routes: Vec<RouteEntry>,
|
||||
) -> Result<(), MeshError> {
|
||||
let msg = Message {
|
||||
r#type: MsgType::Announce,
|
||||
node_id: node.id(),
|
||||
timestamp: Utc::now().timestamp_nanos_opt().unwrap_or_default(),
|
||||
routes,
|
||||
};
|
||||
let packet = encode_packet(node, &msg)?;
|
||||
let socket = UdpSocket::bind("0.0.0.0:0").await?;
|
||||
socket.send_to(&packet, peer_addr).await?;
|
||||
Ok(())
|
||||
}
|
||||
|
||||
pub async fn run_gossip_loop(
|
||||
node: Node,
|
||||
db: Db,
|
||||
peers: Vec<String>,
|
||||
interval: Duration,
|
||||
mut stop: tokio::sync::watch::Receiver<bool>,
|
||||
) {
|
||||
let mut ticker = tokio::time::interval(interval);
|
||||
loop {
|
||||
tokio::select! {
|
||||
_ = stop.changed() => return,
|
||||
_ = ticker.tick() => {
|
||||
let Ok(routes) = db.list_recent_routes(100).await else { continue; };
|
||||
if routes.is_empty() { continue; }
|
||||
for peer in &peers {
|
||||
let peer = peer.clone();
|
||||
let node = node.clone();
|
||||
let routes = routes.clone();
|
||||
tokio::spawn(async move { let _ = announce(&peer, &node, routes).await; });
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
fn encode_packet(node: &Node, msg: &Message) -> Result<Vec<u8>, MeshError> {
|
||||
let (body, sig) = node.sign(msg)?;
|
||||
let mut packet = Vec::with_capacity(HEADER_SIZE + body.len());
|
||||
packet.extend_from_slice(&node.public_key());
|
||||
packet.extend_from_slice(&sig);
|
||||
packet.extend_from_slice(&body);
|
||||
Ok(packet)
|
||||
}
|
||||
|
||||
fn decode_packet(packet: &[u8]) -> Result<DecodedPacket<'_>, MeshError> {
|
||||
if packet.len() < HEADER_SIZE {
|
||||
return Err(MeshError::PacketTooShort(packet.len()));
|
||||
}
|
||||
let pubkey = &packet[..32];
|
||||
let sig = &packet[32..HEADER_SIZE];
|
||||
let body = &packet[HEADER_SIZE..];
|
||||
let msg = rmp_serde::from_slice(body)?;
|
||||
Ok((pubkey, sig, body, msg))
|
||||
}
|
||||
Loading…
Add table
Add a link
Reference in a new issue