split router::serve units.
Signed-off-by: Jason Volk <jason@zemos.net>
This commit is contained in:
Jason Volk
June 🍓🦴
parent
0baa57f5d9
commit
2e45cb281a
7 changed files with 245 additions and 218 deletions
|
|
@ -1,8 +1,8 @@
|
|||
pub(crate) mod layers;
|
||||
pub(crate) mod request;
|
||||
pub(crate) mod router;
|
||||
pub(crate) mod run;
|
||||
pub(crate) mod serve;
|
||||
mod layers;
|
||||
mod request;
|
||||
mod router;
|
||||
mod run;
|
||||
mod serve;
|
||||
|
||||
extern crate conduit_core as conduit;
|
||||
|
||||
|
|
|
|||
|
|
@ -24,9 +24,7 @@ use crate::{layers, serve};
|
|||
#[tracing::instrument(skip_all)]
|
||||
#[allow(clippy::let_underscore_must_use)] // various of these are intended
|
||||
pub(crate) async fn run(server: Arc<Server>) -> Result<(), Error> {
|
||||
let config = &server.config;
|
||||
let app = layers::build(&server)?;
|
||||
let addrs = config.get_bind_addrs();
|
||||
|
||||
// Install the admin room callback here for now
|
||||
_ = services().admin.handle.lock().await.insert(admin::handle);
|
||||
|
|
@ -45,16 +43,8 @@ pub(crate) async fn run(server: Arc<Server>) -> Result<(), Error> {
|
|||
.runtime()
|
||||
.spawn(sighandle(server.clone(), tx.clone()));
|
||||
|
||||
// Prepare to serve http clients
|
||||
let res;
|
||||
// Serve clients
|
||||
if cfg!(unix) && config.unix_socket_path.is_some() {
|
||||
res = serve::unix_socket(&server, app, tx.subscribe()).await;
|
||||
} else if config.tls.is_some() {
|
||||
res = serve::tls(&server, app, handle.clone(), addrs).await;
|
||||
} else {
|
||||
res = serve::plain(&server, app, handle.clone(), addrs).await;
|
||||
}
|
||||
let res = serve::serve(&server, app, handle, tx.subscribe()).await;
|
||||
|
||||
// Join the signal handler before we leave.
|
||||
sigs.abort();
|
||||
|
|
|
|||
|
|
@ -1,202 +0,0 @@
|
|||
use std::{
|
||||
net::SocketAddr,
|
||||
path::Path,
|
||||
sync::{atomic::Ordering, Arc},
|
||||
};
|
||||
|
||||
use axum::{extract::Request, routing::IntoMakeService, Router};
|
||||
use axum_server::{bind, bind_rustls, tls_rustls::RustlsConfig, Handle as ServerHandle};
|
||||
#[cfg(feature = "axum_dual_protocol")]
|
||||
use axum_server_dual_protocol::ServerExt;
|
||||
use conduit::{debug_error, debug_info, utils, Error, Result, Server};
|
||||
use hyper::{body::Incoming, service::service_fn};
|
||||
use hyper_util::{
|
||||
rt::{TokioExecutor, TokioIo},
|
||||
server,
|
||||
};
|
||||
use tokio::{
|
||||
fs,
|
||||
sync::broadcast::{self},
|
||||
task::JoinSet,
|
||||
};
|
||||
use tower::{Service, ServiceExt};
|
||||
use tracing::{debug, info, warn};
|
||||
use utils::unwrap_infallible;
|
||||
|
||||
pub(crate) async fn plain(
|
||||
server: &Arc<Server>, app: IntoMakeService<Router>, handle: ServerHandle, addrs: Vec<SocketAddr>,
|
||||
) -> Result<()> {
|
||||
let mut join_set = JoinSet::new();
|
||||
for addr in &addrs {
|
||||
join_set.spawn_on(bind(*addr).handle(handle.clone()).serve(app.clone()), server.runtime());
|
||||
}
|
||||
|
||||
info!("Listening on {addrs:?}");
|
||||
while join_set.join_next().await.is_some() {}
|
||||
|
||||
let spawn_active = server.requests_spawn_active.load(Ordering::Relaxed);
|
||||
let handle_active = server.requests_handle_active.load(Ordering::Relaxed);
|
||||
debug_info!(
|
||||
spawn_finished = server.requests_spawn_finished.load(Ordering::Relaxed),
|
||||
handle_finished = server.requests_handle_finished.load(Ordering::Relaxed),
|
||||
panics = server.requests_panic.load(Ordering::Relaxed),
|
||||
spawn_active,
|
||||
handle_active,
|
||||
"Stopped listening on {addrs:?}",
|
||||
);
|
||||
|
||||
debug_assert!(spawn_active == 0, "active request tasks are not joined");
|
||||
debug_assert!(handle_active == 0, "active request handles still pending");
|
||||
|
||||
Ok(())
|
||||
}
|
||||
|
||||
pub(crate) async fn tls(
|
||||
server: &Arc<Server>, app: IntoMakeService<Router>, handle: ServerHandle, addrs: Vec<SocketAddr>,
|
||||
) -> Result<()> {
|
||||
let config = &server.config;
|
||||
let tls = config.tls.as_ref().expect("TLS configuration");
|
||||
|
||||
debug!(
|
||||
"Using direct TLS. Certificate path {} and certificate private key path {}",
|
||||
&tls.certs, &tls.key
|
||||
);
|
||||
info!(
|
||||
"Note: It is strongly recommended that you use a reverse proxy instead of running conduwuit directly with TLS."
|
||||
);
|
||||
let conf = RustlsConfig::from_pem_file(&tls.certs, &tls.key).await?;
|
||||
|
||||
if cfg!(feature = "axum_dual_protocol") {
|
||||
info!(
|
||||
"conduwuit was built with axum_dual_protocol feature to listen on both HTTP and HTTPS. This will only \
|
||||
take effect if `dual_protocol` is enabled in `[global.tls]`"
|
||||
);
|
||||
}
|
||||
|
||||
let mut join_set = JoinSet::new();
|
||||
if cfg!(feature = "axum_dual_protocol") && tls.dual_protocol {
|
||||
#[cfg(feature = "axum_dual_protocol")]
|
||||
for addr in &addrs {
|
||||
join_set.spawn_on(
|
||||
axum_server_dual_protocol::bind_dual_protocol(*addr, conf.clone())
|
||||
.set_upgrade(false)
|
||||
.handle(handle.clone())
|
||||
.serve(app.clone()),
|
||||
server.runtime(),
|
||||
);
|
||||
}
|
||||
} else {
|
||||
for addr in &addrs {
|
||||
join_set.spawn_on(
|
||||
bind_rustls(*addr, conf.clone())
|
||||
.handle(handle.clone())
|
||||
.serve(app.clone()),
|
||||
server.runtime(),
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
if cfg!(feature = "axum_dual_protocol") && tls.dual_protocol {
|
||||
warn!(
|
||||
"Listening on {:?} with TLS certificate {} and supporting plain text (HTTP) connections too (insecure!)",
|
||||
addrs, &tls.certs
|
||||
);
|
||||
} else {
|
||||
info!("Listening on {:?} with TLS certificate {}", addrs, &tls.certs);
|
||||
}
|
||||
|
||||
while join_set.join_next().await.is_some() {}
|
||||
|
||||
Ok(())
|
||||
}
|
||||
|
||||
#[cfg(unix)]
|
||||
pub(crate) async fn unix_socket(
|
||||
server: &Arc<Server>, app: IntoMakeService<Router>, mut shutdown: broadcast::Receiver<()>,
|
||||
) -> Result<()> {
|
||||
let mut tasks = JoinSet::<()>::new();
|
||||
let executor = TokioExecutor::new();
|
||||
let builder = server::conn::auto::Builder::new(executor);
|
||||
let listener = unix_socket_init(server).await?;
|
||||
loop {
|
||||
let app = app.clone();
|
||||
let builder = builder.clone();
|
||||
tokio::select! {
|
||||
_sig = shutdown.recv() => break,
|
||||
accept = listener.accept() => match accept {
|
||||
Ok(conn) => unix_socket_accept(server, &listener, &mut tasks, app, builder, conn).await,
|
||||
Err(err) => debug_error!(?listener, "accept error: {err}"),
|
||||
},
|
||||
}
|
||||
}
|
||||
|
||||
drop(listener);
|
||||
tasks.shutdown().await;
|
||||
|
||||
Ok(())
|
||||
}
|
||||
|
||||
#[cfg(unix)]
|
||||
async fn unix_socket_accept(
|
||||
server: &Arc<Server>, listener: &tokio::net::UnixListener, tasks: &mut JoinSet<()>,
|
||||
mut app: IntoMakeService<Router>, builder: server::conn::auto::Builder<TokioExecutor>,
|
||||
conn: (tokio::net::UnixStream, tokio::net::unix::SocketAddr),
|
||||
) {
|
||||
let (socket, remote) = conn;
|
||||
let socket = TokioIo::new(socket);
|
||||
debug!(?listener, ?socket, ?remote, "accepted");
|
||||
|
||||
let called = unwrap_infallible(app.call(()).await);
|
||||
let handler = service_fn(move |req: Request<Incoming>| called.clone().oneshot(req));
|
||||
|
||||
let task = async move {
|
||||
builder
|
||||
.serve_connection(socket, handler)
|
||||
.await
|
||||
.map_err(|e| debug_error!(?remote, "connection error: {e}"))
|
||||
.expect("connection error");
|
||||
};
|
||||
|
||||
_ = tasks.spawn_on(task, server.runtime());
|
||||
while tasks.try_join_next().is_some() {}
|
||||
}
|
||||
|
||||
#[cfg(unix)]
|
||||
async fn unix_socket_init(server: &Arc<Server>) -> Result<tokio::net::UnixListener> {
|
||||
use std::os::unix::fs::PermissionsExt;
|
||||
|
||||
let config = &server.config;
|
||||
let path = config
|
||||
.unix_socket_path
|
||||
.as_ref()
|
||||
.expect("failed to extract configured unix socket path");
|
||||
|
||||
if path.exists() {
|
||||
warn!("Removing existing UNIX socket {:#?} (unclean shutdown?)...", path.display());
|
||||
fs::remove_file(&path)
|
||||
.await
|
||||
.map_err(|e| warn!("Failed to remove existing UNIX socket: {e}"))
|
||||
.unwrap();
|
||||
}
|
||||
|
||||
let dir = path.parent().unwrap_or_else(|| Path::new("/"));
|
||||
if let Err(e) = fs::create_dir_all(dir).await {
|
||||
return Err(Error::Err(format!("Failed to create {dir:?} for socket {path:?}: {e}")));
|
||||
}
|
||||
|
||||
let listener = tokio::net::UnixListener::bind(path);
|
||||
if let Err(e) = listener {
|
||||
return Err(Error::Err(format!("Failed to bind listener {path:?}: {e}")));
|
||||
}
|
||||
|
||||
let socket_perms = config.unix_socket_perms.to_string();
|
||||
let octal_perms = u32::from_str_radix(&socket_perms, 8).expect("failed to convert octal permissions");
|
||||
let perms = std::fs::Permissions::from_mode(octal_perms);
|
||||
if let Err(e) = fs::set_permissions(&path, perms).await {
|
||||
return Err(Error::Err(format!("Failed to set socket {path:?} permissions: {e}")));
|
||||
}
|
||||
|
||||
info!("Listening at {:?}", path);
|
||||
|
||||
Ok(listener.unwrap())
|
||||
}
|
||||
26
src/router/serve/mod.rs
Normal file
26
src/router/serve/mod.rs
Normal file
|
|
@ -0,0 +1,26 @@
|
|||
mod plain;
|
||||
mod tls;
|
||||
mod unix;
|
||||
|
||||
use std::sync::Arc;
|
||||
|
||||
use axum::{routing::IntoMakeService, Router};
|
||||
use axum_server::Handle as ServerHandle;
|
||||
use conduit::{Error, Result, Server};
|
||||
use tokio::sync::broadcast;
|
||||
|
||||
/// Serve clients
|
||||
pub(super) async fn serve(
|
||||
server: &Arc<Server>, app: IntoMakeService<Router>, handle: ServerHandle, shutdown: broadcast::Receiver<()>,
|
||||
) -> Result<(), Error> {
|
||||
let config = &server.config;
|
||||
let addrs = config.get_bind_addrs();
|
||||
|
||||
if cfg!(unix) && config.unix_socket_path.is_some() {
|
||||
unix::serve(server, app, shutdown).await
|
||||
} else if config.tls.is_some() {
|
||||
tls::serve(server, app, handle, addrs).await
|
||||
} else {
|
||||
plain::serve(server, app, handle, addrs).await
|
||||
}
|
||||
}
|
||||
38
src/router/serve/plain.rs
Normal file
38
src/router/serve/plain.rs
Normal file
|
|
@ -0,0 +1,38 @@
|
|||
use std::{
|
||||
net::SocketAddr,
|
||||
sync::{atomic::Ordering, Arc},
|
||||
};
|
||||
|
||||
use axum::{routing::IntoMakeService, Router};
|
||||
use axum_server::{bind, Handle as ServerHandle};
|
||||
use conduit::{debug_info, Result, Server};
|
||||
use tokio::task::JoinSet;
|
||||
use tracing::info;
|
||||
|
||||
pub(super) async fn serve(
|
||||
server: &Arc<Server>, app: IntoMakeService<Router>, handle: ServerHandle, addrs: Vec<SocketAddr>,
|
||||
) -> Result<()> {
|
||||
let mut join_set = JoinSet::new();
|
||||
for addr in &addrs {
|
||||
join_set.spawn_on(bind(*addr).handle(handle.clone()).serve(app.clone()), server.runtime());
|
||||
}
|
||||
|
||||
info!("Listening on {addrs:?}");
|
||||
while join_set.join_next().await.is_some() {}
|
||||
|
||||
let spawn_active = server.requests_spawn_active.load(Ordering::Relaxed);
|
||||
let handle_active = server.requests_handle_active.load(Ordering::Relaxed);
|
||||
debug_info!(
|
||||
spawn_finished = server.requests_spawn_finished.load(Ordering::Relaxed),
|
||||
handle_finished = server.requests_handle_finished.load(Ordering::Relaxed),
|
||||
panics = server.requests_panic.load(Ordering::Relaxed),
|
||||
spawn_active,
|
||||
handle_active,
|
||||
"Stopped listening on {addrs:?}",
|
||||
);
|
||||
|
||||
debug_assert!(spawn_active == 0, "active request tasks are not joined");
|
||||
debug_assert!(handle_active == 0, "active request handles still pending");
|
||||
|
||||
Ok(())
|
||||
}
|
||||
68
src/router/serve/tls.rs
Normal file
68
src/router/serve/tls.rs
Normal file
|
|
@ -0,0 +1,68 @@
|
|||
use std::{net::SocketAddr, sync::Arc};
|
||||
|
||||
use axum::{routing::IntoMakeService, Router};
|
||||
use axum_server::{bind_rustls, tls_rustls::RustlsConfig, Handle as ServerHandle};
|
||||
#[cfg(feature = "axum_dual_protocol")]
|
||||
use axum_server_dual_protocol::ServerExt;
|
||||
use conduit::{Result, Server};
|
||||
use tokio::task::JoinSet;
|
||||
use tracing::{debug, info, warn};
|
||||
|
||||
pub(super) async fn serve(
|
||||
server: &Arc<Server>, app: IntoMakeService<Router>, handle: ServerHandle, addrs: Vec<SocketAddr>,
|
||||
) -> Result<()> {
|
||||
let config = &server.config;
|
||||
let tls = config.tls.as_ref().expect("TLS configuration");
|
||||
|
||||
debug!(
|
||||
"Using direct TLS. Certificate path {} and certificate private key path {}",
|
||||
&tls.certs, &tls.key
|
||||
);
|
||||
info!(
|
||||
"Note: It is strongly recommended that you use a reverse proxy instead of running conduwuit directly with TLS."
|
||||
);
|
||||
let conf = RustlsConfig::from_pem_file(&tls.certs, &tls.key).await?;
|
||||
|
||||
if cfg!(feature = "axum_dual_protocol") {
|
||||
info!(
|
||||
"conduwuit was built with axum_dual_protocol feature to listen on both HTTP and HTTPS. This will only \
|
||||
take effect if `dual_protocol` is enabled in `[global.tls]`"
|
||||
);
|
||||
}
|
||||
|
||||
let mut join_set = JoinSet::new();
|
||||
if cfg!(feature = "axum_dual_protocol") && tls.dual_protocol {
|
||||
#[cfg(feature = "axum_dual_protocol")]
|
||||
for addr in &addrs {
|
||||
join_set.spawn_on(
|
||||
axum_server_dual_protocol::bind_dual_protocol(*addr, conf.clone())
|
||||
.set_upgrade(false)
|
||||
.handle(handle.clone())
|
||||
.serve(app.clone()),
|
||||
server.runtime(),
|
||||
);
|
||||
}
|
||||
} else {
|
||||
for addr in &addrs {
|
||||
join_set.spawn_on(
|
||||
bind_rustls(*addr, conf.clone())
|
||||
.handle(handle.clone())
|
||||
.serve(app.clone()),
|
||||
server.runtime(),
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
if cfg!(feature = "axum_dual_protocol") && tls.dual_protocol {
|
||||
warn!(
|
||||
"Listening on {:?} with TLS certificate {} and supporting plain text (HTTP) connections too (insecure!)",
|
||||
addrs, &tls.certs
|
||||
);
|
||||
} else {
|
||||
info!("Listening on {:?} with TLS certificate {}", addrs, &tls.certs);
|
||||
}
|
||||
|
||||
while join_set.join_next().await.is_some() {}
|
||||
|
||||
Ok(())
|
||||
}
|
||||
107
src/router/serve/unix.rs
Normal file
107
src/router/serve/unix.rs
Normal file
|
|
@ -0,0 +1,107 @@
|
|||
#![cfg(unix)]
|
||||
|
||||
use std::{path::Path, sync::Arc};
|
||||
|
||||
use axum::{extract::Request, routing::IntoMakeService, Router};
|
||||
use conduit::{debug_error, utils, Error, Result, Server};
|
||||
use hyper::{body::Incoming, service::service_fn};
|
||||
use hyper_util::{
|
||||
rt::{TokioExecutor, TokioIo},
|
||||
server,
|
||||
};
|
||||
use tokio::{
|
||||
fs,
|
||||
sync::broadcast::{self},
|
||||
task::JoinSet,
|
||||
};
|
||||
use tower::{Service, ServiceExt};
|
||||
use tracing::{debug, info, warn};
|
||||
use utils::unwrap_infallible;
|
||||
|
||||
pub(super) async fn serve(
|
||||
server: &Arc<Server>, app: IntoMakeService<Router>, mut shutdown: broadcast::Receiver<()>,
|
||||
) -> Result<()> {
|
||||
let mut tasks = JoinSet::<()>::new();
|
||||
let executor = TokioExecutor::new();
|
||||
let builder = server::conn::auto::Builder::new(executor);
|
||||
let listener = init(server).await?;
|
||||
loop {
|
||||
let app = app.clone();
|
||||
let builder = builder.clone();
|
||||
tokio::select! {
|
||||
_sig = shutdown.recv() => break,
|
||||
conn = listener.accept() => match conn {
|
||||
Ok(conn) => accept(server, &listener, &mut tasks, app, builder, conn).await,
|
||||
Err(err) => debug_error!(?listener, "accept error: {err}"),
|
||||
},
|
||||
}
|
||||
}
|
||||
|
||||
drop(listener);
|
||||
tasks.shutdown().await;
|
||||
|
||||
Ok(())
|
||||
}
|
||||
|
||||
async fn accept(
|
||||
server: &Arc<Server>, listener: &tokio::net::UnixListener, tasks: &mut JoinSet<()>,
|
||||
mut app: IntoMakeService<Router>, builder: server::conn::auto::Builder<TokioExecutor>,
|
||||
conn: (tokio::net::UnixStream, tokio::net::unix::SocketAddr),
|
||||
) {
|
||||
let (socket, remote) = conn;
|
||||
let socket = TokioIo::new(socket);
|
||||
debug!(?listener, ?socket, ?remote, "accepted");
|
||||
|
||||
let called = unwrap_infallible(app.call(()).await);
|
||||
let handler = service_fn(move |req: Request<Incoming>| called.clone().oneshot(req));
|
||||
|
||||
let task = async move {
|
||||
builder
|
||||
.serve_connection(socket, handler)
|
||||
.await
|
||||
.map_err(|e| debug_error!(?remote, "connection error: {e}"))
|
||||
.expect("connection error");
|
||||
};
|
||||
|
||||
_ = tasks.spawn_on(task, server.runtime());
|
||||
while tasks.try_join_next().is_some() {}
|
||||
}
|
||||
|
||||
async fn init(server: &Arc<Server>) -> Result<tokio::net::UnixListener> {
|
||||
use std::os::unix::fs::PermissionsExt;
|
||||
|
||||
let config = &server.config;
|
||||
let path = config
|
||||
.unix_socket_path
|
||||
.as_ref()
|
||||
.expect("failed to extract configured unix socket path");
|
||||
|
||||
if path.exists() {
|
||||
warn!("Removing existing UNIX socket {:#?} (unclean shutdown?)...", path.display());
|
||||
fs::remove_file(&path)
|
||||
.await
|
||||
.map_err(|e| warn!("Failed to remove existing UNIX socket: {e}"))
|
||||
.unwrap();
|
||||
}
|
||||
|
||||
let dir = path.parent().unwrap_or_else(|| Path::new("/"));
|
||||
if let Err(e) = fs::create_dir_all(dir).await {
|
||||
return Err(Error::Err(format!("Failed to create {dir:?} for socket {path:?}: {e}")));
|
||||
}
|
||||
|
||||
let listener = tokio::net::UnixListener::bind(path);
|
||||
if let Err(e) = listener {
|
||||
return Err(Error::Err(format!("Failed to bind listener {path:?}: {e}")));
|
||||
}
|
||||
|
||||
let socket_perms = config.unix_socket_perms.to_string();
|
||||
let octal_perms = u32::from_str_radix(&socket_perms, 8).expect("failed to convert octal permissions");
|
||||
let perms = std::fs::Permissions::from_mode(octal_perms);
|
||||
if let Err(e) = fs::set_permissions(&path, perms).await {
|
||||
return Err(Error::Err(format!("Failed to set socket {path:?} permissions: {e}")));
|
||||
}
|
||||
|
||||
info!("Listening at {:?}", path);
|
||||
|
||||
Ok(listener.unwrap())
|
||||
}
|
||||
Loading…
Add table
Reference in a new issue