WS-I: native TLS (optional, default off) with SIGHUP cert reload
server.tls.{enabled,cert_file,key_file}; rustls (ring, explicit provider) via
tokio-rustls + hyper-util; https:// MCP origins when enabled; non-loopback
plain-HTTP startup warning; tests/tls.rs; README TLS section.
Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com>
This commit is contained in:
1 parent
c83a5fa1ac
commit
c5972b762f
11 files changed
+835
-15
No files matched your search
+23
-2
@@ -12,7 +12,7 @@ use tokio_util::sync::CancellationToken;
|
||||
use skyg_linux_tracker::auth::tokens::{self, TokenCmd};
|
||||
use skyg_linux_tracker::config::{CliOverrides, Config};
|
||||
use skyg_linux_tracker::state::AppState;
|
||||
use skyg_linux_tracker::{db, server, telemetry};
|
||||
use skyg_linux_tracker::{db, server, telemetry, tls};
|
||||
|
||||
#[derive(Debug, Parser)]
|
||||
#[command(name = "slinuxm", version, about = "Read-only Linux system monitor")]
|
||||
@@ -113,6 +113,20 @@ async fn serve(config: Config) -> Result<()> {
|
||||
None
|
||||
};
|
||||
let addr = SocketAddr::new(config.server.bind, config.server.port);
|
||||
// TLS is optional: nothing from the tls module runs unless enabled.
|
||||
let tls = if config.server.tls.enabled {
|
||||
let cert = tls::ReloadableCert::load(&config.server.tls)
|
||||
.context("loading TLS certificate and key")?;
|
||||
Some((tls::acceptor(cert.clone())?, cert))
|
||||
} else {
|
||||
if !config.server.bind.is_loopback() {
|
||||
tracing::warn!(
|
||||
bind = %config.server.bind,
|
||||
"listening on a non-loopback address without TLS: bearer tokens travel in cleartext (set server.tls.enabled or terminate TLS in front)"
|
||||
);
|
||||
}
|
||||
None
|
||||
};
|
||||
let listener = tokio::net::TcpListener::bind(addr)
|
||||
.await
|
||||
.with_context(|| format!("binding {addr}"))?;
|
||||
@@ -122,6 +136,9 @@ async fn serve(config: Config) -> Result<()> {
|
||||
let exporters = telemetry::spawn_exporters(state.clone());
|
||||
let pool = state.db.clone();
|
||||
let app = server::build_router(state);
|
||||
if let Some((_, cert)) = &tls {
|
||||
tls::spawn_sighup_reload(cert.clone(), shutdown.clone());
|
||||
}
|
||||
|
||||
let signal_token = shutdown.clone();
|
||||
tokio::spawn(async move {
|
||||
@@ -133,7 +150,11 @@ async fn serve(config: Config) -> Result<()> {
|
||||
// `serve_listener` returns once the shutdown token fires and connections
|
||||
// drain. If the token has not fired it is a server error, so return
|
||||
// immediately. Bound the drain so a stuck client cannot hang SIGTERM.
|
||||
let serving = server::serve_listener(listener, app, shutdown.clone());
|
||||
let serving: std::pin::Pin<Box<dyn std::future::Future<Output = Result<()>> + Send>> = match tls
|
||||
{
|
||||
Some((acceptor, _)) => Box::pin(tls::serve_tls(listener, acceptor, app, shutdown.clone())),
|
||||
None => Box::pin(server::serve_listener(listener, app, shutdown.clone())),
|
||||
};
|
||||
tokio::pin!(serving);
|
||||
let result = tokio::select! {
|
||||
r = &mut serving => r,
|
||||
|
||||
Reference in new issue
Block a user