mewo

Cargo.toml

@@ -2,7 +2,7 @@
 name = "hai"
 version = "0.1.0"
 authors = ["April Faye John <april.john@denic.de>"]
-edition = "2021"
+edition = "2024"
 publish = false
 license = "AGPL-3.0-or-later"
 

rustfmt.toml

@@ -0,0 +1 @@
+style_edition = "2024"

src/gui.rs

@@ -6,7 +6,6 @@
 use egui::{TextureOptions, Vec2};
 
 pub fn gui_main() -> eframe::Result {
-    env_logger::init(); // Log to stderr (if you run with `RUST_LOG=debug`).
     let options = eframe::NativeOptions {
         viewport: egui::ViewportBuilder::default().with_inner_size([600.0, 540.0]),
         ..Default::default()

src/main.rs

@@ -10,10 +10,13 @@ mod gui;
 mod pman;
 mod quic;
 
+use std::fs::File;
+use std::net::SocketAddr;
+use std::str::FromStr;
 use bunt::println;
 use clap::{Parser, Subcommand};
-use config::{Config, Source};
-use log::info;
+use config::{Config, FileFormat, Source};
+use log::{debug, info};
 use pman::{init_process_manager, ProcessCommand, ProcessManager};
 use shadow_rs::shadow;
 use std::sync::{Arc, Mutex, OnceLock};
@@ -41,7 +44,7 @@ struct Args {
 
 #[derive(Debug, Subcommand)]
 enum Commands {
-    #[command(arg_required_else_help = true, about = "Start client without GUI")]
+    #[command(about = "Start client without GUI")]
     CliClient,
     #[command(about = "List compile time backed info to audit binary")]
     Shadow,
@@ -66,11 +69,14 @@ static CONFIG_FILE: OnceLock<Option<String>> = OnceLock::new();
 fn get_config_file_source() -> impl Source {
     let file = CONFIG_FILE.get();
     let default_dir = dirs::config_dir().unwrap();
-    config::File::from_str(s, format)
+    let file_buf = default_dir.join("hai").join("config.toml");
+    println!("{}", file_buf.to_string_lossy());
+    let file_content = std::fs::read_to_string(file_buf).unwrap();
+    config::File::from_str(&*file_content, FileFormat::Toml)
 }
 
 #[tokio::main]
-async fn main() {
+async fn main() -> anyhow::Result<()> {
 
     env_logger::init();
     let args = Args::parse();
@@ -81,11 +87,17 @@ async fn main() {
     let _ = init_process_manager();
 
     match args.command {
-        Commands::CliClient => {}
+        Commands::CliClient => {
+            let ip_addr_str = config().get_string("remote_endpoint")?;
+            let ip_sock = SocketAddr::from_str(&ip_addr_str)?;
+            let client_endpoint = quic::client::make_client_endpoint(ip_sock.clone(), None)?;
+            let client = client_endpoint.connect(ip_sock, "localhost")?.await?;
+            println!("[client] connected: addr={}", client.remote_address());
+        }
 
         Commands::Shadow => {
             bininfo::print_info();
-            return;
+            return Ok(());
         }
 
         Commands::GuiClient => {
@@ -93,7 +105,7 @@ async fn main() {
             if let Err(e) = res {
                 println!("{}", e);
             }
-            return;
+            return Ok(());
         }
 
         Commands::Devtest => {
@@ -112,4 +124,5 @@ async fn main() {
 
     //handling anything here for gui wont work
     println!("exit");
+    Ok(())
 }

src/quic/client.rs

@@ -10,14 +10,18 @@ use rustls::pki_types::CertificateDer;
 ///
 /// - server_certs: a list of trusted certificates in DER format.
 fn configure_client(
-    server_certs: &[&[u8]],
+    server_certs: Option<&[&[u8]]>,
 ) -> Result<ClientConfig, Box<dyn Error + Send + Sync + 'static>> {
+    if let Some(server_certs) = server_certs {
         let mut certs = rustls::RootCertStore::empty();
         for cert in server_certs {
             certs.add(CertificateDer::from(*cert))?;
         }
 
         Ok(ClientConfig::with_root_certificates(Arc::new(certs))?)
+    } else {
+        Ok(ClientConfig::with_platform_verifier())
+    }
 }
 
 /// Constructs a QUIC endpoint configured for use a client only.
@@ -28,7 +32,7 @@ fn configure_client(
 #[allow(unused)]
 pub fn make_client_endpoint(
     bind_addr: SocketAddr,
-    server_certs: &[&[u8]],
+    server_certs: Option<&[&[u8]]>,
 ) -> Result<Endpoint, Box<dyn Error + Send + Sync + 'static>> {
     let client_cfg = configure_client(server_certs)?;
     let mut endpoint = Endpoint::client(bind_addr)?;

src/quic/mod.rs

@@ -1,2 +1,2 @@
-mod server;
-mod client;
+pub(crate) mod server;
+pub(crate) mod client;