GRIN/nym
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

rename smolmix - mixtcp

Browse Source
This commit is contained in:
mfahampshire
2025-10-17 14:51:25 +01:00
parent 7f8b7eea8c
commit 348e93dd70
12 changed files with 83 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Cargo.lock
Generated
+20 -20
View File
@@ -4613,6 +4613,26 @@ dependencies = [
"tracing",
]
[[package]]
name = "mixtcp"
version = "0.0.1"
dependencies = [
"bytes",
"dirs 5.0.1",
"nym-bin-common 0.6.0",
"nym-ip-packet-requests",
"nym-sdk",
"reqwest 0.12.24",
"rustls 0.23.32",
"serde_json",
"smoltcp",
"thiserror 2.0.17",
"tokio",
"tracing",
"tracing-subscriber",
"webpki-roots 1.0.3",
]
[[package]]
name = "mock_instant"
version = "0.6.0"
@@ -10620,26 +10640,6 @@ version = "0.3.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b7c388c1b5e93756d0c740965c41e8822f866621d41acbdf6336a6a168f8840c"
[[package]]
name = "smolmix"
version = "0.0.1"
dependencies = [
"bytes",
"dirs 5.0.1",
"nym-bin-common 0.6.0",
"nym-ip-packet-requests",
"nym-sdk",
"reqwest 0.12.24",
"rustls 0.23.32",
"serde_json",
"smoltcp",
"thiserror 2.0.17",
"tokio",
"tracing",
"tracing-subscriber",
"webpki-roots 1.0.3",
]
[[package]]
name = "smoltcp"
version = "0.12.0"
Cargo.toml
+1 -1
View File
@@ -147,7 +147,7 @@ members = [
"sdk/ffi/go",
"sdk/ffi/shared",
"sdk/rust/nym-sdk",
"smolmix",
"mixtcp",
# "service-providers/authenticator",
"service-providers/common",
"service-providers/ip-packet-router",
smolmix/Cargo.toml → mixtcp/Cargo.toml
+1 -1
View File
@@ -1,5 +1,5 @@
[package]
name = "smolmix"
name = "mixtcp"
version = "0.0.1"
edition = "2021"
mixtcp/README.md
+3
View File
@@ -0,0 +1,3 @@
# mixtcp poc
Test TLS conn + mixtcp device HTTPS req/res via IPRs with `cargo test`. More to come.
smolmix/examples/cloudflare_ping.rs → mixtcp/examples/cloudflare_ping.rs
+11 -11
View File
@@ -1,5 +1,5 @@
use mixtcp::{create_device, MixtcpError};
use rustls::{pki_types::ServerName, ClientConfig, ClientConnection};
use smolmix::{create_device, SmolmixError};
use std::{
io::{self, Read, Write},
sync::Arc,
@@ -23,7 +23,7 @@ pub struct TlsOverTcp {
}
impl TlsOverTcp {
pub fn new(domain: &str) -> Result<Self, SmolmixError> {
pub fn new(domain: &str) -> Result<Self, MixtcpError> {
let mut root_store = rustls::RootCertStore::empty();
root_store.extend(webpki_roots::TLS_SERVER_ROOTS.iter().cloned());
@@ -32,24 +32,24 @@ impl TlsOverTcp {
.with_no_client_auth();
let server_name = ServerName::try_from(domain)
.map_err(|_| SmolmixError::InvalidDnsName)?
.map_err(|_| MixtcpError::InvalidDnsName)?
.to_owned();
let conn = ClientConnection::new(Arc::new(config), server_name)
.map_err(|_| SmolmixError::TlsHandshakeFailed)?;
.map_err(|_| MixtcpError::TlsHandshakeFailed)?;
Ok(Self { conn })
}
/// Move data from TLS connection to TCP socket
pub fn write_tls(&mut self, socket: &mut tcp::Socket) -> Result<(), SmolmixError> {
pub fn write_tls(&mut self, socket: &mut tcp::Socket) -> Result<(), MixtcpError> {
let mut buf = [0u8; 4096];
while self.conn.wants_write() {
match self.conn.write_tls(&mut buf.as_mut_slice()) {
Ok(n) if n > 0 => {
socket
.send_slice(&buf[..n])
.map_err(|_| SmolmixError::TlsHandshakeFailed)?;
.map_err(|_| MixtcpError::TlsHandshakeFailed)?;
}
_ => break,
}
@@ -58,7 +58,7 @@ impl TlsOverTcp {
}
/// Move data from TCP socket to TLS connection
pub fn read_tls(&mut self, socket: &mut tcp::Socket) -> Result<(), SmolmixError> {
pub fn read_tls(&mut self, socket: &mut tcp::Socket) -> Result<(), MixtcpError> {
if socket.can_recv() {
let _ = socket.recv(|chunk| {
if !chunk.is_empty() {
@@ -72,15 +72,15 @@ impl TlsOverTcp {
Ok(())
}
pub fn send(&mut self, data: &[u8], socket: &mut tcp::Socket) -> Result<(), SmolmixError> {
pub fn send(&mut self, data: &[u8], socket: &mut tcp::Socket) -> Result<(), MixtcpError> {
self.conn
.writer()
.write_all(data)
.map_err(|_| SmolmixError::TlsHandshakeFailed)?;
.map_err(|_| MixtcpError::TlsHandshakeFailed)?;
self.write_tls(socket)
}
pub fn recv(&mut self, socket: &mut tcp::Socket) -> Result<Vec<u8>, SmolmixError> {
pub fn recv(&mut self, socket: &mut tcp::Socket) -> Result<Vec<u8>, MixtcpError> {
self.read_tls(socket)?;
let mut result = Vec::new();
let mut buf = vec![0u8; 4096];
@@ -223,7 +223,7 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
info!("TLS handshake completed - ready for HTTPS");
// Send simple HTTP request
let request = b"GET /cdn-cgi/trace HTTP/1.1\r\nHost: cloudflare.com\r\nUser-Agent: smolmix-test/1.0\r\nAccept: */*\r\nConnection: close\r\n\r\n";
let request = b"GET /cdn-cgi/trace HTTP/1.1\r\nHost: cloudflare.com\r\nUser-Agent: mixtcp-test/1.0\r\nAccept: */*\r\nConnection: close\r\n\r\n";
match tls_conn.send(request, socket) {
Ok(_) => {
info!("HTTPS request sent");
smolmix/examples/https_client.rs → mixtcp/examples/https_client.rs
+30 -30
View File
@@ -1,7 +1,7 @@
use mixtcp::{create_device, MixtcpError, NymIprDevice};
use nym_sdk::stream_wrapper::IpMixStream;
use reqwest::StatusCode;
use rustls::{pki_types::ServerName, ClientConfig, ClientConnection};
use smolmix::{create_device, NymIprDevice, SmolmixError};
use smoltcp::{
iface::{Config, Interface, SocketSet},
socket::tcp,
@@ -23,7 +23,7 @@ pub struct TlsOverTcp {
}
impl TlsOverTcp {
pub fn new(domain: &str) -> Result<Self, SmolmixError> {
pub fn new(domain: &str) -> Result<Self, MixtcpError> {
let mut root_store = rustls::RootCertStore::empty();
root_store.extend(webpki_roots::TLS_SERVER_ROOTS.iter().cloned());
@@ -32,23 +32,23 @@ impl TlsOverTcp {
.with_no_client_auth();
let server_name = ServerName::try_from(domain)
.map_err(|_| SmolmixError::InvalidDnsName)?
.map_err(|_| MixtcpError::InvalidDnsName)?
.to_owned();
let conn = ClientConnection::new(Arc::new(config), server_name)
.map_err(|_| SmolmixError::TlsHandshakeFailed)?;
.map_err(|_| MixtcpError::TlsHandshakeFailed)?;
Ok(Self { conn })
}
pub fn write_tls(&mut self, socket: &mut tcp::Socket) -> Result<(), SmolmixError> {
pub fn write_tls(&mut self, socket: &mut tcp::Socket) -> Result<(), MixtcpError> {
let mut buf = [0u8; 4096];
while self.conn.wants_write() {
match self.conn.write_tls(&mut buf.as_mut_slice()) {
Ok(n) if n > 0 => {
socket
.send_slice(&buf[..n])
.map_err(|_| SmolmixError::TlsHandshakeFailed)?;
.map_err(|_| MixtcpError::TlsHandshakeFailed)?;
}
_ => break,
}
@@ -56,7 +56,7 @@ impl TlsOverTcp {
Ok(())
}
pub fn read_tls(&mut self, socket: &mut tcp::Socket) -> Result<(), SmolmixError> {
pub fn read_tls(&mut self, socket: &mut tcp::Socket) -> Result<(), MixtcpError> {
if socket.can_recv() {
let _ = socket.recv(|chunk| {
if !chunk.is_empty() {
@@ -69,27 +69,27 @@ impl TlsOverTcp {
Ok(())
}
pub fn send(&mut self, data: &[u8], socket: &mut tcp::Socket) -> Result<(), SmolmixError> {
pub fn send(&mut self, data: &[u8], socket: &mut tcp::Socket) -> Result<(), MixtcpError> {
self.conn
.writer()
.write_all(data)
.map_err(|_| SmolmixError::TlsHandshakeFailed)?;
.map_err(|_| MixtcpError::TlsHandshakeFailed)?;
self.write_tls(socket)
}
}
/// Reqwest-ish client right now, just a handrolled GET request for the example
pub struct SmolmixReqwestClient {
pub struct MixtcpReqwestClient {
device: Arc<tokio::sync::Mutex<(smoltcp::iface::Interface, NymIprDevice)>>,
_bridge: tokio::task::JoinHandle<()>,
_allocated_ip: Ipv4Address,
}
impl SmolmixReqwestClient {
pub async fn new() -> Result<Self, SmolmixError> {
impl MixtcpReqwestClient {
pub async fn new() -> Result<Self, MixtcpError> {
let ipr_stream = IpMixStream::new()
.await
.map_err(|_| SmolmixError::MixnetConnectionFailed)?;
.map_err(|_| MixtcpError::MixnetConnectionFailed)?;
let (mut device, bridge, allocated_ips) = create_device(ipr_stream).await?;
info!("Allocated IP: {}", allocated_ips.ipv4);
@@ -121,18 +121,18 @@ impl SmolmixReqwestClient {
})
}
pub async fn get(&self, url: &str) -> Result<SmolmixResponse, SmolmixError> {
let parsed_url = reqwest::Url::parse(url).map_err(|_| SmolmixError::InvalidUrl)?;
let host = parsed_url.host_str().ok_or(SmolmixError::InvalidUrl)?;
pub async fn get(&self, url: &str) -> Result<MixtcpResponse, MixtcpError> {
let parsed_url = reqwest::Url::parse(url).map_err(|_| MixtcpError::InvalidUrl)?;
let host = parsed_url.host_str().ok_or(MixtcpError::InvalidUrl)?;
let path = parsed_url.path();
let response_bytes = self.simple_get_request(host, path).await?;
let (status, body) = self.parse_simple_response(&response_bytes)?;
Ok(SmolmixResponse { status, body })
Ok(MixtcpResponse { status, body })
}
async fn simple_get_request(&self, domain: &str, path: &str) -> Result<Vec<u8>, SmolmixError> {
async fn simple_get_request(&self, domain: &str, path: &str) -> Result<Vec<u8>, MixtcpError> {
let tcp_rx_buffer = tcp::SocketBuffer::new(vec![0; 16384]);
let tcp_tx_buffer = tcp::SocketBuffer::new(vec![0; 4096]);
let tcp_socket = tcp::Socket::new(tcp_rx_buffer, tcp_tx_buffer);
@@ -155,7 +155,7 @@ impl SmolmixReqwestClient {
loop {
if start.elapsed() > Duration::from_secs(60) {
return Err(SmolmixError::Timeout);
return Err(MixtcpError::Timeout);
}
iface.poll(timestamp, device, &mut sockets);
@@ -170,7 +170,7 @@ impl SmolmixReqwestClient {
}
Err(e) => {
info!("TCP connect failed: {}", e);
return Err(SmolmixError::TcpConnectionFailed);
return Err(MixtcpError::TcpConnectionFailed);
}
}
}
@@ -181,7 +181,7 @@ impl SmolmixReqwestClient {
Ok(t) => tls = Some(t),
Err(e) => {
info!("TLS create failed: {}", e);
return Err(SmolmixError::TlsHandshakeFailed);
return Err(MixtcpError::TlsHandshakeFailed);
}
}
}
@@ -195,7 +195,7 @@ impl SmolmixReqwestClient {
info!("TLS handshake completed - ready for HTTPS");
let request = format!(
"GET {} HTTP/1.1\r\nHost: {}\r\nUser-Agent: smolmix/1.0\r\nAccept: */*\r\nConnection: close\r\n\r\n",
"GET {} HTTP/1.1\r\nHost: {}\r\nUser-Agent: mixtcp/1.0\r\nAccept: */*\r\nConnection: close\r\n\r\n",
path, domain
);
tls_conn.send(request.as_bytes(), socket)?;
@@ -221,7 +221,7 @@ impl SmolmixReqwestClient {
Err(e) if e.kind() == std::io::ErrorKind::WouldBlock => {}
Err(e) => {
info!("Read error: {}", e);
return Err(SmolmixError::ResponseReadFailed);
return Err(MixtcpError::ResponseReadFailed);
}
Ok(_) => continue,
}
@@ -230,17 +230,17 @@ impl SmolmixReqwestClient {
tokio::time::sleep(Duration::from_millis(10)).await;
}
Err(SmolmixError::NoResponseReceived)
Err(MixtcpError::NoResponseReceived)
}
/// Simple response - just extract status and body
fn parse_simple_response(&self, response_bytes: &[u8]) -> Result<(u16, String), SmolmixError> {
fn parse_simple_response(&self, response_bytes: &[u8]) -> Result<(u16, String), MixtcpError> {
let response_str = String::from_utf8_lossy(response_bytes);
let status_line = response_str
.lines()
.next()
.ok_or(SmolmixError::InvalidHttpResponse)?;
.ok_or(MixtcpError::InvalidHttpResponse)?;
let status: u16 = status_line
.split_whitespace()
@@ -252,17 +252,17 @@ impl SmolmixReqwestClient {
let body = response_str[body_start + 4..].to_string();
Ok((status, body))
} else {
Err(SmolmixError::InvalidHttpResponse)
Err(MixtcpError::InvalidHttpResponse)
}
}
}
pub struct SmolmixResponse {
pub struct MixtcpResponse {
status: u16,
body: String,
}
impl SmolmixResponse {
impl MixtcpResponse {
pub fn status(&self) -> StatusCode {
StatusCode::from_u16(self.status).unwrap_or(StatusCode::INTERNAL_SERVER_ERROR)
}
@@ -300,7 +300,7 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
);
info!("Setting up mixnet client...");
let client = SmolmixReqwestClient::new().await?;
let client = MixtcpReqwestClient::new().await?;
let start = tokio::time::Instant::now();
let mixnet_response = client.get(test_url).await?;
let mixnet_status = mixnet_response.status();
smolmix/examples/tls.rs → mixtcp/examples/tls.rs
+10 -10
View File
@@ -1,5 +1,5 @@
use mixtcp::{create_device, MixtcpError};
use rustls::{pki_types::ServerName, ClientConfig, ClientConnection};
use smolmix::{create_device, SmolmixError};
use std::{
io::{self, Read, Write},
sync::Arc,
@@ -23,7 +23,7 @@ pub struct TlsOverTcp {
}
impl TlsOverTcp {
pub fn new(domain: &str) -> Result<Self, SmolmixError> {
pub fn new(domain: &str) -> Result<Self, MixtcpError> {
let mut root_store = rustls::RootCertStore::empty();
root_store.extend(webpki_roots::TLS_SERVER_ROOTS.iter().cloned());
@@ -32,24 +32,24 @@ impl TlsOverTcp {
.with_no_client_auth();
let server_name = ServerName::try_from(domain)
.map_err(|_| SmolmixError::InvalidDnsName)?
.map_err(|_| MixtcpError::InvalidDnsName)?
.to_owned();
let conn = ClientConnection::new(Arc::new(config), server_name)
.map_err(|_| SmolmixError::TlsHandshakeFailed)?;
.map_err(|_| MixtcpError::TlsHandshakeFailed)?;
Ok(Self { conn })
}
/// Move data from TLS connection to TCP socket
pub fn write_tls(&mut self, socket: &mut tcp::Socket) -> Result<(), SmolmixError> {
pub fn write_tls(&mut self, socket: &mut tcp::Socket) -> Result<(), MixtcpError> {
let mut buf = [0u8; 4096];
while self.conn.wants_write() {
match self.conn.write_tls(&mut buf.as_mut_slice()) {
Ok(n) if n > 0 => {
socket
.send_slice(&buf[..n])
.map_err(|_| SmolmixError::TlsHandshakeFailed)?;
.map_err(|_| MixtcpError::TlsHandshakeFailed)?;
}
_ => break,
}
@@ -58,7 +58,7 @@ impl TlsOverTcp {
}
/// Move data from TCP socket to TLS connection
pub fn read_tls(&mut self, socket: &mut tcp::Socket) -> Result<(), SmolmixError> {
pub fn read_tls(&mut self, socket: &mut tcp::Socket) -> Result<(), MixtcpError> {
if socket.can_recv() {
let _ = socket.recv(|chunk| {
if !chunk.is_empty() {
@@ -72,15 +72,15 @@ impl TlsOverTcp {
Ok(())
}
pub fn send(&mut self, data: &[u8], socket: &mut tcp::Socket) -> Result<(), SmolmixError> {
pub fn send(&mut self, data: &[u8], socket: &mut tcp::Socket) -> Result<(), MixtcpError> {
self.conn
.writer()
.write_all(data)
.map_err(|_| SmolmixError::TlsHandshakeFailed)?;
.map_err(|_| MixtcpError::TlsHandshakeFailed)?;
self.write_tls(socket)
}
pub fn recv(&mut self, socket: &mut tcp::Socket) -> Result<Vec<u8>, SmolmixError> {
pub fn recv(&mut self, socket: &mut tcp::Socket) -> Result<Vec<u8>, MixtcpError> {
self.read_tls(socket)?;
let mut result = Vec::new();
let mut buf = vec![0u8; 4096];
smolmix/src/bridge.rs → mixtcp/src/bridge.rs
+3 -3
View File
@@ -1,7 +1,7 @@
// Copyright 2024 - Nym Technologies SA <contact@nymtech.net>
// SPDX-License-Identifier: GPL-2.0-only
use crate::error::SmolmixError;
use crate::error::MixtcpError;
use nym_ip_packet_requests::codec::MultiIpPacketCodec;
use nym_sdk::stream_wrapper::IpMixStream;
use tokio::sync::mpsc;
@@ -55,7 +55,7 @@ impl NymIprBridge {
/// - Maintains packet statistics
///
/// The loop exits when channels are closed or an error occurs.
pub async fn run(mut self) -> Result<(), SmolmixError> {
pub async fn run(mut self) -> Result<(), MixtcpError> {
info!("Starting Nym IPR bridge");
let mut packets_sent = 0;
let mut packets_received = 0;
@@ -100,7 +100,7 @@ impl NymIprBridge {
// Forward to device via channel
if let Err(_) = self.rx_sender.send(packet.to_vec()) {
error!("Failed to send packet to device - receiver dropped");
return Err(SmolmixError::ChannelClosed);
return Err(MixtcpError::ChannelClosed);
}
packets_received += 1;
info!("Total packets received: {}", packets_received);
smolmix/src/device.rs → mixtcp/src/device.rs
View File
smolmix/src/error.rs → mixtcp/src/error.rs
+1 -1
View File
@@ -4,7 +4,7 @@
use thiserror::Error;
#[derive(Error, Debug)]
pub enum SmolmixError {
pub enum MixtcpError {
#[error("Channel closed")]
ChannelClosed,
smolmix/src/lib.rs → mixtcp/src/lib.rs
+3 -3
View File
@@ -7,7 +7,7 @@ mod error;
pub use bridge::NymIprBridge;
pub use device::NymIprDevice;
pub use error::SmolmixError;
pub use error::MixtcpError;
use nym_ip_packet_requests::IpPair;
use nym_sdk::stream_wrapper::IpMixStream;
@@ -23,7 +23,7 @@ use tokio::sync::mpsc;
/// - Constructs the device and bridge components
pub async fn create_device(
mut ipr_stream: IpMixStream,
) -> Result<(NymIprDevice, NymIprBridge, IpPair), SmolmixError> {
) -> Result<(NymIprDevice, NymIprBridge, IpPair), MixtcpError> {
// Ensure the stream is connected
if !ipr_stream.is_connected() {
ipr_stream.connect_tunnel().await?;
@@ -33,7 +33,7 @@ pub async fn create_device(
// further 'up' the flow in the code calling this fn (see examples/tcp_connect.rs).
let allocated_ips = ipr_stream
.allocated_ips()
.ok_or(SmolmixError::NotConnected)?
.ok_or(MixtcpError::NotConnected)?
.clone();
// Create channels for device <-> bridge communication
smolmix/README.md
-3
View File
@@ -1,3 +0,0 @@
# smolmix poc
Test TLS conn + smolmix device HTTPS req/res via IPRs with `cargo test`. More to come.