add to simple wisp client

simple-wisp-client/Cargo.toml

@@ -8,12 +8,14 @@ atomic-counter = "1.0.1"
 bytes = "1.7.1"
 clap = { version = "4.5.16", features = ["cargo", "derive"] }
 console-subscriber = { version = "0.4.0", optional = true }
+ed25519-dalek = { version = "2.1.1", features = ["pem"] }
 fastwebsockets = { version = "0.8.0", features = ["unstable-split", "upgrade"] }
 futures = "0.3.30"
 http-body-util = "0.1.2"
 humantime = "2.1.0"
 hyper = { version = "1.4.1", features = ["http1", "client"] }
 hyper-util = { version = "0.1.7", features = ["tokio"] }
+sha2 = "0.10.8"
 simple_moving_average = "1.0.2"
 tokio = { version = "1.39.3", features = ["full"] }
 wisp-mux = { path = "../wisp", features = ["fastwebsockets"]}

simple-wisp-client/src/main.rs

@@ -1,6 +1,7 @@
 use atomic_counter::{AtomicCounter, RelaxedCounter};
 use bytes::Bytes;
 use clap::Parser;
+use ed25519_dalek::pkcs8::DecodePrivateKey;
 use fastwebsockets::handshake;
 use futures::future::select_all;
 use http_body_util::Empty;
@@ -10,12 +11,14 @@ use hyper::{
 	Request, Uri,
 };
 use hyper_util::rt::TokioIo;
+use sha2::{Digest, Sha512};
 use simple_moving_average::{SingleSumSMA, SMA};
 use std::{
 	error::Error,
 	future::Future,
 	io::{stdout, Cursor, IsTerminal, Write},
 	net::SocketAddr,
+	path::PathBuf,
 	process::{abort, exit},
 	sync::Arc,
 	time::{Duration, Instant},
@@ -29,6 +32,8 @@ use tokio::{
 };
 use wisp_mux::{
 	extensions::{
+		cert::{CertAuthProtocolExtension, CertAuthProtocolExtensionBuilder, SigningKey},
+		motd::{MotdProtocolExtension, MotdProtocolExtensionBuilder},
 		password::{PasswordProtocolExtension, PasswordProtocolExtensionBuilder},
 		udp::{UdpProtocolExtension, UdpProtocolExtensionBuilder},
 		ProtocolExtensionBuilder,
@@ -92,11 +97,28 @@ struct Cli {
 	/// Usernames and passwords are sent in plaintext!!
 	#[arg(long)]
 	auth: Option<String>,
+	/// Enable certauth
+	#[arg(long)]
+	certauth: Option<PathBuf>,
+	/// Enable motd parsing
+	#[arg(long)]
+	motd: bool,
 	/// Make a Wisp V2 connection
 	#[arg(long)]
 	wisp_v2: bool,
 }
 
+async fn get_cert(path: PathBuf) -> Result<SigningKey, Box<dyn Error + Sync + Send>> {
+	let data = tokio::fs::read_to_string(path).await?;
+	let signer = ed25519_dalek::SigningKey::from_pkcs8_pem(&data)?;
+	let binary_key = signer.verifying_key().to_bytes();
+
+	let mut hasher = Sha512::new();
+	hasher.update(binary_key);
+	let hash: [u8; 64] = hasher.finalize().into();
+	Ok(SigningKey::new_ed25519(Arc::new(signer), hash))
+}
+
 #[tokio::main(flavor = "multi_thread")]
 async fn main() -> Result<(), Box<dyn Error + Send + Sync>> {
 	#[cfg(feature = "tokio-console")]
@@ -153,10 +175,19 @@ async fn main() -> Result<(), Box<dyn Error + Send + Sync>> {
 		extensions.push(Box::new(UdpProtocolExtensionBuilder));
 		extension_ids.push(UdpProtocolExtension::ID);
 	}
+	if opts.motd {
+		extensions.push(Box::new(MotdProtocolExtensionBuilder::Client));
+	}
 	if let Some(auth) = auth {
 		extensions.push(Box::new(auth));
 		extension_ids.push(PasswordProtocolExtension::ID);
 	}
+	if let Some(certauth) = opts.certauth {
+		let key = get_cert(certauth).await?;
+		let extension = CertAuthProtocolExtensionBuilder::new_client(key);
+		extensions.push(Box::new(extension));
+		extension_ids.push(CertAuthProtocolExtension::ID);
+	}
 
 	let (mux, fut) = if !opts.wisp_v2 {
 		ClientMux::create(rx, tx, None)
@@ -169,9 +200,19 @@ async fn main() -> Result<(), Box<dyn Error + Send + Sync>> {
 			.await?
 	};
 
+	let motd_extension = mux
+		.supported_extensions
+		.iter()
+		.find_map(|x| x.downcast_ref::<MotdProtocolExtension>());
+
 	println!(
-		"connected and created ClientMux, was downgraded {}, extensions supported {:?}\n",
-		mux.downgraded, mux.supported_extension_ids
+		"connected and created ClientMux, was downgraded {}, extensions supported {:?}, motd {:?}\n\n",
+		mux.downgraded,
+		mux.supported_extensions
+			.iter()
+			.map(|x| x.get_id())
+			.collect::<Vec<_>>(),
+		motd_extension.map(|x| x.motd.clone())
 	);
 
 	let mut threads = Vec::with_capacity((opts.streams * 2) + 3);