This commit is contained in:
hexlocation 2025-08-07 20:08:42 +02:00
parent 985b1d3810
commit 7757ef32f4
5 changed files with 796 additions and 30 deletions

701
Cargo.lock generated

File diff suppressed because it is too large Load diff

View file

@ -25,4 +25,9 @@ ansi_colours = "1.2.3"
colour = "2.1.0"
async-trait = "0.1.88"
http = "1.3.1"
instant-acme = "0.8.2"
rustls = "0.23.31"
safe-path = "0.1.0"
rustls-pemfile = "2.2.0"
tokio-rustls = "0.26.2"

View file

@ -5,6 +5,7 @@ mod matchers;
mod routes;
mod server;
mod services;
mod tls;
use std::{env, process::exit, sync::Arc, time::Duration};
@ -15,6 +16,7 @@ use log::{debug, error, info};
use matchers::api::ApiMatcher;
use server::Server;
use services::{controller::ControllerService, matcher::Matcher};
use tls::TlsOption;
use tokio::{
sync::Mutex,
time::{self},
@ -81,11 +83,11 @@ async fn main() -> Result<(), Box<dyn std::error::Error + Send + Sync>> {
database: database_shared.clone(),
};
let api_server = Server::new(api_matcher.service(), (config.api.listen, config.api.port))
let api_server = Server::new(api_matcher.service(), (config.api.listen, config.api.port), TlsOption::NoTls)
.await
.unwrap();
let proxy_server = Server::new(svc, (config.proxy.listen, config.proxy.port))
let proxy_server = Server::new(svc, (config.proxy.listen, config.proxy.port), TlsOption::NoTls)
.await
.unwrap();

View file

@ -1,16 +1,21 @@
use std::{any::type_name_of_val, error::Error};
use std::{any::type_name_of_val, collections::HashMap, error::Error, sync::Arc};
use http_body_util::{Either, Full};
use hyper::{
Request, Response, StatusCode,
body::{Body, Bytes, Incoming},
rt::{Read, Write},
server::conn::http1,
service::{HttpService, Service},
};
use hyper_util::rt::TokioIo;
use json::JsonValue;
use log::{error, info};
use rustls::server::Acceptor;
use tokio::net::{TcpListener, TcpStream};
use tokio_rustls::{LazyConfigAcceptor, StartHandshake};
use crate::tls::TlsOption;
pub type GeneralResponse = Response<GeneralBody>;
pub type GeneralBody = Either<Incoming, Full<Bytes>>;
@ -23,6 +28,7 @@ pub fn to_general_response(res: Response<Incoming>) -> GeneralResponse {
pub struct Server<S> {
listener: TcpListener,
service: S,
tls: TlsOption,
}
pub trait TcpIntercept {
@ -59,7 +65,7 @@ pub async fn json_to_vec(v: JsonValue) -> Option<Vec<String>> {
impl<S> Server<S>
where
S: TcpIntercept,
S: TcpIntercept + Sync,
S: Service<Request<Incoming>> + Clone + Send + 'static,
S: HttpService<Incoming> + Clone + Send,
<S::ResBody as Body>::Error: Into<Box<dyn Error + Send + Sync>>,
@ -75,31 +81,63 @@ where
);
loop {
let (stream, _) = self.listener.accept().await.unwrap();
let (tcp_stream, _) = self.listener.accept().await.unwrap();
let mut svc_clone = self.service.clone();
svc_clone.stream(&stream);
let io = TokioIo::new(stream);
let tls = self.tls.clone();
tokio::task::spawn(async move {
if let Err(err) = http1::Builder::new()
.writev(false)
.serve_connection(io, svc_clone)
.await
{
error!("Error while trying to serve connection: {err}")
svc_clone.stream(&tcp_stream);
match tls {
TlsOption::NoTls => {
if let Err(err) = http1::Builder::new()
.writev(false)
.serve_connection(TokioIo::new(tcp_stream), svc_clone)
.await
{
error!("Error while trying to serve connection: {err}")
};
}
TlsOption::Tls(x) => {
let acceptor = LazyConfigAcceptor::new(Acceptor::default(), tcp_stream);
match acceptor.await {
Ok(y) => {
let hello = y.client_hello();
let hostname = hello.server_name().clone().unwrap();
let config = Arc::new(x.matcher(hostname).unwrap());
let stream = y
.into_stream(config)
.await
.unwrap();
if let Err(err) = http1::Builder::new()
.writev(false)
.serve_connection(TokioIo::new(stream), svc_clone)
.await
{
error!("Error while trying to serve connection: {err}")
}
}
Err(e) => {
error!("Error while initiating handshake: {e}");
return;
}
}
}
};
});
}
}
pub async fn new(service: S, a: (String, u16)) -> Result<Self, Box<dyn Error>> {
pub async fn new(service: S, a: (String, u16), tls: TlsOption) -> Result<Self, Box<dyn Error>> {
Ok(Self {
listener: TcpListener::bind(&a).await?,
service,
tls,
})
}
}
/*
*/

48
src/tls.rs Normal file
View file

@ -0,0 +1,48 @@
use std::{
error::{self, Error},
fs::File,
io,
path::{self, Path},
sync::Arc,
};
use rustls::{
ServerConfig, crypto,
pki_types::{CertificateDer, PrivateKeyDer, pem::PemObject},
sign::CertifiedKey,
};
#[derive(Clone)]
pub enum TlsOption {
NoTls,
Tls(FileTls),
}
#[derive(Clone)]
pub struct FileTls {
pub certs_path: String,
}
impl FileTls {
pub fn matcher(&self, hostname: &str) -> Result<ServerConfig, Box<dyn Error>> {
let path_to_pem =
safe_path::scoped_join(self.certs_path.clone(), format!("{hostname}.pem"))?;
let path_to_key =
safe_path::scoped_join(self.certs_path.clone(), format!("{hostname}.key"))?;
let certfile = File::open(path_to_pem)?;
let mut cert_reader = io::BufReader::new(certfile);
let certs = rustls_pemfile::certs(&mut cert_reader)
.map(|x| x.unwrap())
.collect();
let keyfile = File::open(path_to_key)?;
let mut key_reader = io::BufReader::new(keyfile);
let key = rustls_pemfile::private_key(&mut key_reader).map(|key| key.unwrap())?;
Ok(ServerConfig::builder()
.with_no_client_auth()
.with_single_cert(certs, key)
.map_err(|e| e)?)
}
}