forked from trinitrix/core
refactor(cbs): added responses and dumped the dummy cbs code
This commit is contained in:
parent
4519fe5db6
commit
f6a1b5200a
|
@ -1441,16 +1441,33 @@ dependencies = [
|
||||||
"tokio",
|
"tokio",
|
||||||
]
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "triba"
|
||||||
|
version = "0.1.0"
|
||||||
|
dependencies = [
|
||||||
|
"aes-gcm-siv",
|
||||||
|
"interprocess",
|
||||||
|
"rand",
|
||||||
|
"rmp-serde",
|
||||||
|
"serde",
|
||||||
|
"thiserror",
|
||||||
|
"tokio",
|
||||||
|
"tokio-util",
|
||||||
|
"triba-packet",
|
||||||
|
"uuid",
|
||||||
|
"x25519-dalek",
|
||||||
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "triba-packet"
|
name = "triba-packet"
|
||||||
version = "0.1.0"
|
version = "0.1.0"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"aes-gcm-siv",
|
"aes-gcm-siv",
|
||||||
"anyhow",
|
|
||||||
"interprocess",
|
"interprocess",
|
||||||
"rmp-serde",
|
"rmp-serde",
|
||||||
"serde",
|
"serde",
|
||||||
"strum",
|
"strum",
|
||||||
|
"thiserror",
|
||||||
"tokio",
|
"tokio",
|
||||||
"uuid",
|
"uuid",
|
||||||
"x25519-dalek",
|
"x25519-dalek",
|
||||||
|
@ -1479,6 +1496,7 @@ dependencies = [
|
||||||
"strum",
|
"strum",
|
||||||
"tokio",
|
"tokio",
|
||||||
"tokio-util",
|
"tokio-util",
|
||||||
|
"triba",
|
||||||
"triba-packet",
|
"triba-packet",
|
||||||
"trinitry",
|
"trinitry",
|
||||||
"trixy",
|
"trixy",
|
||||||
|
|
|
@ -70,6 +70,7 @@ crossterm = { version = "0.25" }
|
||||||
# Trinitrx Backend API specific
|
# Trinitrx Backend API specific
|
||||||
interprocess = { version = "2.1.0", features = ["tokio"] }
|
interprocess = { version = "2.1.0", features = ["tokio"] }
|
||||||
triba-packet = { path = "../triba-packet" }
|
triba-packet = { path = "../triba-packet" }
|
||||||
|
triba = { path = "../triba" }
|
||||||
|
|
||||||
[dev-dependencies]
|
[dev-dependencies]
|
||||||
pretty_assertions = "1.4.0"
|
pretty_assertions = "1.4.0"
|
||||||
|
|
|
@ -6,22 +6,29 @@ use tokio::{
|
||||||
sync::mpsc,
|
sync::mpsc,
|
||||||
};
|
};
|
||||||
use tokio_util::sync::CancellationToken;
|
use tokio_util::sync::CancellationToken;
|
||||||
use triba_packet::{self as packet, IdPool, Packet};
|
use triba_packet::{IdPool, Packet, Request, Response};
|
||||||
use uuid::Uuid;
|
use uuid::Uuid;
|
||||||
|
|
||||||
pub struct Connection {
|
pub struct Connection {
|
||||||
tx: mpsc::UnboundedSender<packet::Body>,
|
req_tx: mpsc::UnboundedSender<Request>,
|
||||||
|
resp_tx: mpsc::UnboundedSender<(Response, u64)>,
|
||||||
}
|
}
|
||||||
|
|
||||||
impl Connection {
|
impl Connection {
|
||||||
pub async fn send_packet(&self, body: packet::Body) -> Result<()> {
|
pub async fn send_request(&self, body: Request) -> Result<()> {
|
||||||
self.tx.send(body)?;
|
self.req_tx.send(body)?;
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
|
|
||||||
|
pub async fn send_response(&self, body: Response, receiver: u64) -> Result<()> {
|
||||||
|
self.resp_tx.send((body, receiver))?;
|
||||||
Ok(())
|
Ok(())
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
enum Event {
|
enum Event {
|
||||||
ToCBS(Packet),
|
ToCBSReq(Request),
|
||||||
|
ToCBSResp(Response, u64),
|
||||||
FromCBS(Packet),
|
FromCBS(Packet),
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -46,9 +53,13 @@ impl UnstableConnection {
|
||||||
|
|
||||||
let mut id_pool = IdPool::new();
|
let mut id_pool = IdPool::new();
|
||||||
|
|
||||||
let packet = Packet::recv(&mut sock_rx, &cipher, &nonce).await.unwrap();
|
let packet = Packet::recv(&mut sock_rx, &cipher, &nonce).await?;
|
||||||
match packet.body() {
|
match packet {
|
||||||
packet::Body::HandshakeUpgradeConnection => {
|
Packet::Request { id, body } => {
|
||||||
|
Packet::response(id_pool.acquire(), id, Response::Success)
|
||||||
|
.send(&mut sock_tx, &cipher, &nonce)
|
||||||
|
.await?;
|
||||||
|
|
||||||
cli_log::info!(
|
cli_log::info!(
|
||||||
"CBS {id}: upgraded connection to encrypted messagepack",
|
"CBS {id}: upgraded connection to encrypted messagepack",
|
||||||
id = self.id
|
id = self.id
|
||||||
|
@ -56,16 +67,11 @@ impl UnstableConnection {
|
||||||
}
|
}
|
||||||
body => {
|
body => {
|
||||||
return Err(anyhow!(
|
return Err(anyhow!(
|
||||||
"expected cbs to send HandshakeUpgradeConnection but got {body}"
|
"expected cbs to send: Request::HandshakeUpgradeConnection, but got: {body}"
|
||||||
))
|
))
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
Packet::new(&mut id_pool, packet::Body::HandshakeSuccess)
|
|
||||||
.send(&mut sock_tx, &cipher, &nonce)
|
|
||||||
.await
|
|
||||||
.unwrap();
|
|
||||||
|
|
||||||
// Poll packets from socket
|
// Poll packets from socket
|
||||||
{
|
{
|
||||||
let cipher = cipher.clone();
|
let cipher = cipher.clone();
|
||||||
|
@ -80,15 +86,26 @@ impl UnstableConnection {
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
let (core_tx, mut core_rx) = mpsc::unbounded_channel();
|
let (core_req_tx, mut core_req_rx) = mpsc::unbounded_channel();
|
||||||
|
|
||||||
// Poll packets from core
|
// Poll requests from core
|
||||||
|
{
|
||||||
|
let tx = tx.clone();
|
||||||
tokio::spawn(async move {
|
tokio::spawn(async move {
|
||||||
loop {
|
loop {
|
||||||
let body = core_rx.recv().await.unwrap();
|
let body = core_req_rx.recv().await.unwrap();
|
||||||
|
tx.send(Event::ToCBSReq(body)).unwrap();
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
tx.send(Event::ToCBS(Packet::new(&mut id_pool, body)))
|
let (core_resp_tx, mut core_resp_rx) = mpsc::unbounded_channel();
|
||||||
.unwrap();
|
|
||||||
|
// Poll responses from core
|
||||||
|
tokio::spawn(async move {
|
||||||
|
loop {
|
||||||
|
let (body, req) = core_resp_rx.recv().await.unwrap();
|
||||||
|
tx.send(Event::ToCBSResp(body, req)).unwrap();
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
|
@ -106,20 +123,29 @@ impl UnstableConnection {
|
||||||
};
|
};
|
||||||
|
|
||||||
match event {
|
match event {
|
||||||
Event::ToCBS(packet) => {
|
Event::ToCBSReq(req) => {
|
||||||
sock_tx
|
Packet::request(id_pool.acquire(), req)
|
||||||
.write(packet.pack(&cipher, &nonce).unwrap().as_slice())
|
.send(&mut sock_tx, &cipher, &nonce)
|
||||||
|
.await
|
||||||
|
.unwrap();
|
||||||
|
}
|
||||||
|
Event::ToCBSResp(resp, req) => {
|
||||||
|
Packet::response(id_pool.acquire(), req, resp)
|
||||||
|
.send(&mut sock_tx, &cipher, &nonce)
|
||||||
.await
|
.await
|
||||||
.unwrap();
|
.unwrap();
|
||||||
}
|
}
|
||||||
Event::FromCBS(packet) => {
|
Event::FromCBS(packet) => {
|
||||||
cli_log::info!("Core received CBS packet: {packet:?}")
|
cli_log::info!("Core received CBS packet: {packet:?}");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
Ok(Connection { tx: core_tx })
|
Ok(Connection {
|
||||||
|
req_tx: core_req_tx,
|
||||||
|
resp_tx: core_resp_tx,
|
||||||
|
})
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,72 +1,8 @@
|
||||||
use aes_gcm_siv::{Aes256GcmSiv, KeyInit, Nonce};
|
use interprocess::local_socket::Name;
|
||||||
use interprocess::local_socket::{
|
|
||||||
self,
|
|
||||||
tokio::{prelude::*, Stream},
|
|
||||||
};
|
|
||||||
use rand::thread_rng;
|
|
||||||
use tokio::io::{AsyncReadExt, AsyncWriteExt, BufReader};
|
|
||||||
use triba_packet::{self as packet, IdPool, Packet};
|
|
||||||
use uuid::Uuid;
|
use uuid::Uuid;
|
||||||
use x25519_dalek::{EphemeralSecret, PublicKey};
|
|
||||||
|
|
||||||
pub async fn cbs(sock_name: local_socket::Name<'_>, id: Uuid) {
|
pub async fn cbs(sock_name: Name<'_>, id: Uuid) {
|
||||||
let stream = Stream::connect(sock_name).await.unwrap();
|
let (session, rx) = triba::Session::new(id, sock_name).await.unwrap();
|
||||||
|
|
||||||
let (rx, mut tx) = stream.split();
|
|
||||||
let mut rx = BufReader::new(rx);
|
|
||||||
|
|
||||||
tx.write(id.as_bytes()).await.unwrap();
|
|
||||||
|
|
||||||
let dh_core_public = {
|
|
||||||
let mut buffer = [0u8; 32];
|
|
||||||
rx.read(&mut buffer).await.unwrap();
|
|
||||||
PublicKey::from(buffer)
|
|
||||||
};
|
|
||||||
|
|
||||||
let dh_own_secret = EphemeralSecret::random_from_rng(thread_rng());
|
|
||||||
let dh_own_public = PublicKey::from(&dh_own_secret);
|
|
||||||
|
|
||||||
tx.write(dh_own_public.as_bytes()).await.unwrap();
|
|
||||||
|
|
||||||
let shared_secret = dh_own_secret.diffie_hellman(&dh_core_public);
|
|
||||||
|
|
||||||
let nonce = {
|
|
||||||
let mut buffer = [0u8; 12];
|
|
||||||
rx.read(&mut buffer).await.unwrap();
|
|
||||||
Nonce::from(buffer)
|
|
||||||
};
|
|
||||||
|
|
||||||
let cipher = Aes256GcmSiv::new(shared_secret.as_bytes().into());
|
|
||||||
|
|
||||||
let mut id_pool = IdPool::new();
|
|
||||||
|
|
||||||
tx.write(
|
|
||||||
Packet::new(&mut id_pool, packet::Body::HandshakeUpgradeConnection)
|
|
||||||
.pack(&cipher, &nonce)
|
|
||||||
.unwrap()
|
|
||||||
.as_slice(),
|
|
||||||
)
|
|
||||||
.await
|
|
||||||
.unwrap();
|
|
||||||
|
|
||||||
let packet = Packet::recv(&mut rx, &cipher, &nonce).await.unwrap();
|
|
||||||
match packet.body() {
|
|
||||||
packet::Body::HandshakeSuccess => {
|
|
||||||
cli_log::info!("[DUMMY CBS] Connection to core stabilized");
|
|
||||||
}
|
|
||||||
_ => {
|
|
||||||
cli_log::info!("[DUMMY CBS] Connection to core failed");
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
Packet::new(
|
|
||||||
&mut id_pool,
|
|
||||||
packet::Body::Exit(packet::Error::Fatal("This is a test".to_string())),
|
|
||||||
)
|
|
||||||
.send(&mut tx, &cipher, &nonce)
|
|
||||||
.await
|
|
||||||
.unwrap();
|
|
||||||
|
|
||||||
loop {}
|
loop {}
|
||||||
}
|
}
|
||||||
|
|
|
@ -17,14 +17,15 @@ use tokio::{
|
||||||
sync::{mpsc, oneshot},
|
sync::{mpsc, oneshot},
|
||||||
};
|
};
|
||||||
use tokio_util::sync::CancellationToken;
|
use tokio_util::sync::CancellationToken;
|
||||||
use triba_packet as packet;
|
use triba_packet::{Request, Response};
|
||||||
use uuid::Uuid;
|
use uuid::Uuid;
|
||||||
use x25519_dalek::{EphemeralSecret, PublicKey};
|
use x25519_dalek::{EphemeralSecret, PublicKey};
|
||||||
|
|
||||||
enum Event {
|
enum Event {
|
||||||
IncomingConnection(Stream),
|
IncomingConnection(Stream),
|
||||||
SpawnCBS(oneshot::Sender<Result<Uuid>>),
|
SpawnCBS(oneshot::Sender<Result<Uuid>>),
|
||||||
SendPacket(Uuid, packet::Body),
|
SendRequest(Uuid, Request),
|
||||||
|
SendResponse(Uuid, Response, u64),
|
||||||
}
|
}
|
||||||
|
|
||||||
async fn poll_socket(
|
async fn poll_socket(
|
||||||
|
@ -152,9 +153,13 @@ impl Manager {
|
||||||
let sock_name = sock_name.clone();
|
let sock_name = sock_name.clone();
|
||||||
tokio::spawn(super::dummy::cbs(sock_name.clone(), id));
|
tokio::spawn(super::dummy::cbs(sock_name.clone(), id));
|
||||||
}
|
}
|
||||||
Event::SendPacket(id, body) => {
|
Event::SendRequest(id, body) => {
|
||||||
let conn = connections.get(&id).unwrap();
|
let conn = connections.get(&id).unwrap();
|
||||||
conn.send_packet(body).await.unwrap();
|
conn.send_request(body).await.unwrap();
|
||||||
|
}
|
||||||
|
Event::SendResponse(id, body, req) => {
|
||||||
|
let conn = connections.get(&id).unwrap();
|
||||||
|
conn.send_response(body, req).await.unwrap();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -170,8 +175,13 @@ impl Manager {
|
||||||
rx.await?
|
rx.await?
|
||||||
}
|
}
|
||||||
|
|
||||||
pub fn send_packet(&self, cbs: Uuid, body: packet::Body) -> Result<()> {
|
pub fn send_request(&self, cbs: Uuid, body: Request) -> Result<()> {
|
||||||
self.tx.send(Event::SendPacket(cbs, body))?;
|
self.tx.send(Event::SendRequest(cbs, body))?;
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn send_response(&self, cbs: Uuid, body: Response, receiver: u64) -> Result<()> {
|
||||||
|
self.tx.send(Event::SendResponse(cbs, body, receiver))?;
|
||||||
Ok(())
|
Ok(())
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue