tcp -> unixsocket

feature/configv2
prplV 2025-03-27 10:46:22 -04:00
parent 35a21da431
commit 163887d42c
3 changed files with 32 additions and 26 deletions

1
.gitignore vendored
View File

@ -4,3 +4,4 @@
Cargo.lock Cargo.lock
hagent_test.sock hagent_test.sock
release release
*.sock

View File

@ -36,9 +36,13 @@ async fn main() -> anyhow::Result<()>{
preboot.clone() preboot.clone()
).await; ).await;
}); });
handler.push(config_module); handler.push(config_module);
let cli_module = tokio::spawn(async move {
let _ = init_cli_pipeline().await;
});
handler.push(cli_module);
for i in handler { for i in handler {
let _ = i.await; let _ = i.await;
} }

View File

@ -1,8 +1,8 @@
use log::{error, info, warn}; use log::{error, info, warn};
use tokio::net::{TcpListener, TcpStream}; use tokio::net::{TcpListener, TcpStream, UnixStream};
use anyhow::{Result as DynResult, Error}; use anyhow::{Result as DynResult, Error};
use tokio::time::{sleep, Duration}; use tokio::time::{sleep, Duration};
use std::{borrow::BorrowMut, net::{IpAddr, Ipv4Addr}}; use std::{borrow::BorrowMut, fs, net::{IpAddr, Ipv4Addr}};
// use std::io::BufReader; // use std::io::BufReader;
use tokio::io::{BufReader, AsyncWriteExt, AsyncBufReadExt}; use tokio::io::{BufReader, AsyncWriteExt, AsyncBufReadExt};
use tokio::{io::AsyncReadExt, net::UnixListener}; use tokio::{io::AsyncReadExt, net::UnixListener};
@ -24,21 +24,20 @@ use serde_json::from_str;
/// ///
pub async fn init_cli_pipeline() -> DynResult<()> { pub async fn init_cli_pipeline() -> DynResult<()> {
match init_listener().await { match init_listener().await {
Some(list) => { Ok(list) => {
info!("Successfully opened UnixListener for CLI");
loop { loop {
if let Ok((socket, addr)) = list.accept().await { if let Ok((socket, _)) = list.accept().await {
// isolation
if IpAddr::V4(Ipv4Addr::new(127, 0, 0, 1)) != addr.ip() {
warn!("Declined attempt to connect TCP-socket from {}", addr);
continue;
}
process_connection(socket).await; process_connection(socket).await;
} }
sleep(Duration::from_millis(500)).await; sleep(Duration::from_millis(500)).await;
} }
// Ok(()) // Ok(())
}, },
None => Err(Error::msg("Addr 127.0.0.1:7753 is already in use")) Err(er) => {
error!("Failed to open UnixListener for CLI");
Err(er)
},
} }
} }
@ -55,17 +54,20 @@ pub async fn init_cli_pipeline() -> DynResult<()> {
/// ///
/// *depends on* : `tokio::net::TcpListener` /// *depends on* : `tokio::net::TcpListener`
/// ///
async fn init_listener() -> Option<TcpListener> { async fn init_listener() -> anyhow::Result<UnixListener> {
match TcpListener::bind("127.0.0.1:7753").await { // match TcpListener::bind("127.0.0.1:7753").await {
Ok(listener) => { // Ok(listener) => {
info!("Runner is listening localhost:7753"); // info!("Runner is listening localhost:7753");
Some(listener) // Some(listener)
}, // },
Err(_) => { // Err(_) => {
error!("Cannot create TCP listener for CLI"); // error!("Cannot create TCP listener for CLI");
None // None
} // }
} // }
let socket_path = "noxis-rs";
let _ = fs::remove_file(socket_path);
Ok(UnixListener::bind(socket_path)?)
} }
/// # Fn `process_connection` /// # Fn `process_connection`
@ -81,11 +83,10 @@ async fn init_listener() -> Option<TcpListener> {
/// ///
/// *depends on* : `tokio::net::TcpStream` /// *depends on* : `tokio::net::TcpStream`
/// ///
async fn process_connection(mut stream: TcpStream) { async fn process_connection(mut stream: UnixStream) {
let buf_reader = BufReader::new(stream.borrow_mut()); let buf_reader = BufReader::new(stream.borrow_mut());
let mut rqst = buf_reader.lines(); let mut rqst = buf_reader.lines();
while let Ok(Some(line)) = rqst.next_line().await { while let Ok(Some(line)) = rqst.next_line().await {
if line.is_empty() { if line.is_empty() {
break break
@ -102,6 +103,6 @@ async fn process_connection(mut stream: TcpStream) {
println!("{}", line); println!("{}", line);
} }
let response = "HTTP/1.1 200 OK\r\nContent-Length: 13\r\nContent-Type: text/plain\r\n\r\nHello, World!"; let response = "OK";
stream.write_all(response.as_bytes()).await.unwrap(); stream.write_all(response.as_bytes()).await.unwrap();
} }