mirror of
https://github.com/jmcorgan/fips.git
synced 2026-08-09 16:24:45 +00:00
In-memory time-series history on the daemon: fast ring (1s × 3600) plus slow ring (1m × 1440) per metric, covering node-level gauges (mesh size, tree depth, peer count, active sessions), counters (parent switches, aggregate bytes/packets in/out), loss rate, and seven per-peer metrics keyed by NodeAddr (srtt_ms, loss_rate, bytes_in/out, packets_in/out, ecn_ce). The slow ring is produced by downsampling the fast ring on minute boundaries with Last / Sum / Mean aggregation chosen per metric type. Missing data is first-class. New peers back-fill NaN so every ring shares a time axis with the node rings; peers absent from a tick sample NaN (keeps alignment, shows as a visible gap); counter metrics emit NaN on decrease (new link_stats baseline after reconnect) so deltas aren't polluted. Peers are evicted 24h after last contact. Downsampling is NaN-aware: mean skips NaN, all-NaN slow windows stay NaN. Each history window always returns its full span at the chosen density (1m / 10m / 1h / 24h), front-padded with NaN when the ring hasn't yet accumulated enough samples, so switching between windows feels like zooming in or out rather than clipping to whatever has arrived. NaN serializes to JSON null via a custom serializer. Control socket queries: - show_stats_list enumerates registered metrics plus scope field and peer_retention_seconds. - show_stats_history returns one metric's series for a given window and granularity; accepts optional peer (npub) for per-peer metrics. - show_stats_all_history returns every metric in a single round trip; accepts optional peer to fetch all seven per-peer metrics. - show_stats_peers enumerates tracked peers with lifecycle metadata. - show_stats_history_all_peers returns one metric across all peers for grid rendering. - show_status carries short sparkline windows for the dashboard so the client can render without extra fetches. fipsctl gains `stats list`, `stats peers`, and `stats history <metric>` with `--peer` (hostname or npub) and `--plot` for a Unicode block sparkline. Plot header reports sample count, granularity, window, and gap count; NaN renders as a blank cell. fipstop dashboard grows inline sparklines (peer count, mesh size, aggregate bytes in/out). A new Graphs tab stacks every metric as an independent mini plot with its own autoscaled range; each plot uses btop's braille 2×4 filled-area algorithm (25-entry lookup table packing two samples per character, per-row gradient coloring for the characteristic btop vertical-band look, rounded borders with embedded titles). Three modes are cycled with `m`: Node (node-level stack), MetricByPeer (small-multiples grid, 1 / 2 / 3 columns by terminal width), PeerByMetric (existing stack scoped to one peer). `n` / `N` cycles the mode-specific selector (metric or peer), a selector row shows the current choice, and Graphs-tab refreshes re-fetch show_stats_peers so selectors track peer churn. Up / Down scrolls the stack, Left / Right cycles the window, `g` jumps to the tab. Implements IDEA-0084 (TASK-2026-0062).
409 lines
14 KiB
Rust
409 lines
14 KiB
Rust
//! Control socket for runtime management and observability.
|
|
//!
|
|
//! Provides a control interface that accepts commands and returns
|
|
//! structured JSON responses. Supports both read-only queries (show_*)
|
|
//! and mutating commands (connect, disconnect).
|
|
//!
|
|
//! Platform-specific implementations:
|
|
//! - Unix: Uses a Unix domain socket for local IPC
|
|
//! - Windows: Uses a TCP socket on localhost (see commit 3)
|
|
|
|
pub mod commands;
|
|
pub mod protocol;
|
|
pub mod queries;
|
|
|
|
use crate::config::ControlConfig;
|
|
use protocol::{Request, Response};
|
|
use tokio::io::{AsyncBufReadExt, AsyncWriteExt, BufReader};
|
|
use tokio::sync::{mpsc, oneshot};
|
|
use tracing::{debug, info, warn};
|
|
|
|
/// Maximum request size in bytes (4 KB).
|
|
const MAX_REQUEST_SIZE: usize = 4096;
|
|
|
|
/// I/O timeout for client connections.
|
|
const IO_TIMEOUT: std::time::Duration = std::time::Duration::from_secs(5);
|
|
|
|
/// A message sent from the accept loop to the main event loop.
|
|
pub type ControlMessage = (Request, oneshot::Sender<Response>);
|
|
|
|
/// Handle a single client connection over any AsyncRead + AsyncWrite stream.
|
|
///
|
|
/// Shared between Unix and Windows implementations to avoid duplicating
|
|
/// the request/response protocol logic.
|
|
async fn handle_connection_generic<S>(
|
|
stream: S,
|
|
control_tx: mpsc::Sender<ControlMessage>,
|
|
) -> Result<(), Box<dyn std::error::Error>>
|
|
where
|
|
S: tokio::io::AsyncRead + tokio::io::AsyncWrite + Unpin,
|
|
{
|
|
let (reader, mut writer) = tokio::io::split(stream);
|
|
let mut buf_reader = BufReader::new(reader);
|
|
let mut line = String::new();
|
|
|
|
// Read one line with timeout and size limit
|
|
let read_result = tokio::time::timeout(IO_TIMEOUT, async {
|
|
let mut total = 0usize;
|
|
loop {
|
|
let n = buf_reader.read_line(&mut line).await?;
|
|
if n == 0 {
|
|
break; // EOF
|
|
}
|
|
total += n;
|
|
if total > MAX_REQUEST_SIZE {
|
|
return Err(std::io::Error::new(
|
|
std::io::ErrorKind::InvalidData,
|
|
"request too large",
|
|
));
|
|
}
|
|
if line.ends_with('\n') {
|
|
break;
|
|
}
|
|
}
|
|
Ok(())
|
|
})
|
|
.await;
|
|
|
|
let response = match read_result {
|
|
Ok(Ok(())) if line.is_empty() => Response::error("empty request"),
|
|
Ok(Ok(())) => {
|
|
// Parse the request
|
|
match serde_json::from_str::<Request>(line.trim()) {
|
|
Ok(request) => {
|
|
// Send to main loop and wait for response
|
|
let (resp_tx, resp_rx) = oneshot::channel();
|
|
if control_tx.send((request, resp_tx)).await.is_err() {
|
|
Response::error("node shutting down")
|
|
} else {
|
|
match tokio::time::timeout(IO_TIMEOUT, resp_rx).await {
|
|
Ok(Ok(resp)) => resp,
|
|
Ok(Err(_)) => Response::error("response channel closed"),
|
|
Err(_) => Response::error("query timeout"),
|
|
}
|
|
}
|
|
}
|
|
Err(e) => Response::error(format!("invalid request: {}", e)),
|
|
}
|
|
}
|
|
Ok(Err(e)) => Response::error(format!("read error: {}", e)),
|
|
Err(_) => Response::error("read timeout"),
|
|
};
|
|
|
|
// Write response with timeout
|
|
let json = serde_json::to_string(&response)?;
|
|
let write_result = tokio::time::timeout(IO_TIMEOUT, async {
|
|
writer.write_all(json.as_bytes()).await?;
|
|
writer.write_all(b"\n").await?;
|
|
writer.shutdown().await?;
|
|
Ok::<_, std::io::Error>(())
|
|
})
|
|
.await;
|
|
|
|
if let Err(_) | Ok(Err(_)) = write_result {
|
|
debug!("Control socket write failed or timed out");
|
|
}
|
|
|
|
Ok(())
|
|
}
|
|
|
|
// ============================================================================
|
|
// Unix implementation
|
|
// ============================================================================
|
|
|
|
#[cfg(unix)]
|
|
mod unix_impl {
|
|
use super::*;
|
|
use std::path::{Path, PathBuf};
|
|
use tokio::net::UnixListener;
|
|
|
|
/// Control socket listener (Unix domain socket).
|
|
///
|
|
/// Manages the Unix domain socket lifecycle: bind, accept, cleanup.
|
|
pub struct ControlSocket {
|
|
listener: UnixListener,
|
|
socket_path: PathBuf,
|
|
}
|
|
|
|
impl ControlSocket {
|
|
/// Bind a new control socket.
|
|
///
|
|
/// Creates parent directories if needed, removes stale socket files,
|
|
/// and binds the Unix listener.
|
|
pub fn bind(config: &ControlConfig) -> Result<Self, std::io::Error> {
|
|
let socket_path = PathBuf::from(&config.socket_path);
|
|
|
|
// Create parent directory if it doesn't exist
|
|
if let Some(parent) = socket_path.parent()
|
|
&& !parent.exists()
|
|
{
|
|
std::fs::create_dir_all(parent)?;
|
|
debug!(path = %parent.display(), "Created control socket directory");
|
|
}
|
|
|
|
// Remove stale socket if it exists
|
|
if socket_path.exists() {
|
|
Self::remove_stale_socket(&socket_path)?;
|
|
}
|
|
|
|
let listener = UnixListener::bind(&socket_path)?;
|
|
|
|
// Make the socket and its parent directory group-accessible so
|
|
// 'fips' group members can use fipsctl/fipstop without root.
|
|
use std::os::unix::fs::PermissionsExt;
|
|
std::fs::set_permissions(&socket_path, std::fs::Permissions::from_mode(0o770))?;
|
|
Self::chown_to_fips_group(&socket_path);
|
|
if let Some(parent) = socket_path.parent() {
|
|
Self::chown_to_fips_group(parent);
|
|
}
|
|
|
|
info!(path = %socket_path.display(), "Control socket listening");
|
|
|
|
Ok(Self {
|
|
listener,
|
|
socket_path,
|
|
})
|
|
}
|
|
|
|
/// Remove a stale socket file.
|
|
///
|
|
/// If the file exists but no one is listening, remove it so we can
|
|
/// bind. This handles unclean daemon exits.
|
|
fn remove_stale_socket(path: &Path) -> Result<(), std::io::Error> {
|
|
// Try connecting to see if someone is listening
|
|
match std::os::unix::net::UnixStream::connect(path) {
|
|
Ok(_) => {
|
|
// Someone is listening — don't remove it
|
|
Err(std::io::Error::new(
|
|
std::io::ErrorKind::AddrInUse,
|
|
format!("control socket already in use: {}", path.display()),
|
|
))
|
|
}
|
|
Err(_) => {
|
|
// No one listening — remove the stale socket
|
|
debug!(path = %path.display(), "Removing stale control socket");
|
|
std::fs::remove_file(path)?;
|
|
Ok(())
|
|
}
|
|
}
|
|
}
|
|
|
|
/// Set group ownership of a path to the 'fips' group (best-effort).
|
|
fn chown_to_fips_group(path: &Path) {
|
|
use std::ffi::CString;
|
|
use std::os::unix::ffi::OsStrExt;
|
|
|
|
// Look up the 'fips' group
|
|
let group_name = CString::new("fips").unwrap();
|
|
let grp = unsafe { libc::getgrnam(group_name.as_ptr()) };
|
|
if grp.is_null() {
|
|
debug!(
|
|
"'fips' group not found, skipping chown for {}",
|
|
path.display()
|
|
);
|
|
return;
|
|
}
|
|
let gid = unsafe { (*grp).gr_gid };
|
|
|
|
let c_path = match CString::new(path.as_os_str().as_bytes()) {
|
|
Ok(p) => p,
|
|
Err(_) => return,
|
|
};
|
|
let ret = unsafe { libc::chown(c_path.as_ptr(), u32::MAX, gid) };
|
|
if ret != 0 {
|
|
warn!(
|
|
path = %path.display(),
|
|
error = %std::io::Error::last_os_error(),
|
|
"Failed to chown control socket to 'fips' group"
|
|
);
|
|
}
|
|
}
|
|
|
|
/// Run the accept loop, forwarding requests to the main event loop via mpsc.
|
|
///
|
|
/// Each accepted connection is handled in a spawned task:
|
|
/// 1. Read one line of JSON (the request)
|
|
/// 2. Send (Request, oneshot::Sender) to the main loop
|
|
/// 3. Wait for the response via oneshot
|
|
/// 4. Write the response as one line of JSON
|
|
/// 5. Close the connection
|
|
pub async fn accept_loop(self, control_tx: mpsc::Sender<ControlMessage>) {
|
|
loop {
|
|
let (stream, _addr) = match self.listener.accept().await {
|
|
Ok(conn) => conn,
|
|
Err(e) => {
|
|
warn!(error = %e, "Control socket accept failed");
|
|
continue;
|
|
}
|
|
};
|
|
|
|
let tx = control_tx.clone();
|
|
tokio::spawn(async move {
|
|
if let Err(e) = handle_connection_generic(stream, tx).await {
|
|
debug!(error = %e, "Control connection error");
|
|
}
|
|
});
|
|
}
|
|
}
|
|
|
|
/// Get the socket path.
|
|
pub fn socket_path(&self) -> &Path {
|
|
&self.socket_path
|
|
}
|
|
|
|
/// Clean up the socket file.
|
|
fn cleanup(&self) {
|
|
if self.socket_path.exists() {
|
|
if let Err(e) = std::fs::remove_file(&self.socket_path) {
|
|
warn!(
|
|
path = %self.socket_path.display(),
|
|
error = %e,
|
|
"Failed to remove control socket"
|
|
);
|
|
} else {
|
|
debug!(path = %self.socket_path.display(), "Control socket removed");
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
impl Drop for ControlSocket {
|
|
fn drop(&mut self) {
|
|
self.cleanup();
|
|
}
|
|
}
|
|
}
|
|
|
|
// ============================================================================
|
|
// Windows implementation (TCP on localhost)
|
|
// ============================================================================
|
|
|
|
#[cfg(windows)]
|
|
mod windows_impl {
|
|
use super::*;
|
|
use tokio::net::TcpListener;
|
|
|
|
/// Default TCP port for the control socket on Windows.
|
|
const DEFAULT_CONTROL_PORT: u16 = 21210;
|
|
|
|
/// Control socket listener (Windows TCP on localhost).
|
|
///
|
|
/// On Windows, the control socket uses a TCP listener bound to
|
|
/// `127.0.0.1` since Windows does not support Unix domain sockets
|
|
/// reliably. Only localhost connections are accepted.
|
|
///
|
|
/// Note: Unlike Unix domain sockets, TCP does not provide filesystem-level
|
|
/// ACLs. Any local user can connect to the control port. This is acceptable
|
|
/// for single-user Windows installations but should be documented.
|
|
pub struct ControlSocket {
|
|
listener: TcpListener,
|
|
port: u16,
|
|
}
|
|
|
|
impl ControlSocket {
|
|
/// Bind a TCP control socket on localhost.
|
|
///
|
|
/// Parses the port from `config.socket_path` (which is a port number
|
|
/// string on Windows, e.g. "21210"). Falls back to the default port
|
|
/// with a warning if parsing fails.
|
|
pub fn bind(config: &ControlConfig) -> Result<Self, std::io::Error> {
|
|
let port: u16 = match config.socket_path.parse() {
|
|
Ok(p) => p,
|
|
Err(e) => {
|
|
warn!(
|
|
path = %config.socket_path,
|
|
error = %e,
|
|
default = DEFAULT_CONTROL_PORT,
|
|
"Invalid control port, using default"
|
|
);
|
|
DEFAULT_CONTROL_PORT
|
|
}
|
|
};
|
|
|
|
let addr = std::net::SocketAddr::from(([127, 0, 0, 1], port));
|
|
let std_listener = std::net::TcpListener::bind(addr)?;
|
|
std_listener.set_nonblocking(true)?;
|
|
let listener = TcpListener::from_std(std_listener)?;
|
|
|
|
info!(port = port, "Control socket listening on localhost");
|
|
|
|
Ok(Self { listener, port })
|
|
}
|
|
|
|
/// Get the listening port.
|
|
pub fn port(&self) -> u16 {
|
|
self.port
|
|
}
|
|
|
|
/// Run the accept loop, forwarding requests to the main event loop via mpsc.
|
|
///
|
|
/// Each accepted connection is handled in a spawned task using the
|
|
/// shared `handle_connection_generic` protocol handler.
|
|
pub async fn accept_loop(self, control_tx: mpsc::Sender<ControlMessage>) {
|
|
loop {
|
|
let (stream, addr) = match self.listener.accept().await {
|
|
Ok(conn) => conn,
|
|
Err(e) => {
|
|
warn!(error = %e, "Control socket accept failed");
|
|
continue;
|
|
}
|
|
};
|
|
|
|
// Only accept connections from localhost
|
|
if !addr.ip().is_loopback() {
|
|
warn!(addr = %addr, "Rejected non-localhost control connection");
|
|
continue;
|
|
}
|
|
|
|
let tx = control_tx.clone();
|
|
tokio::spawn(async move {
|
|
if let Err(e) = handle_connection_generic(stream, tx).await {
|
|
debug!(error = %e, "Control connection error");
|
|
}
|
|
});
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
// Re-export platform-specific types
|
|
#[cfg(unix)]
|
|
pub use unix_impl::ControlSocket;
|
|
#[cfg(windows)]
|
|
pub use windows_impl::ControlSocket;
|
|
|
|
#[cfg(test)]
|
|
mod tests {
|
|
#[cfg(windows)]
|
|
use super::*;
|
|
|
|
#[cfg(windows)]
|
|
#[tokio::test]
|
|
async fn test_tcp_control_socket_bind() {
|
|
let config = ControlConfig {
|
|
enabled: true,
|
|
socket_path: "0".to_string(), // port 0 = ephemeral
|
|
};
|
|
|
|
// Verify the socket binds successfully on an ephemeral port
|
|
let _socket = ControlSocket::bind(&config).expect("failed to bind control socket");
|
|
}
|
|
|
|
#[cfg(windows)]
|
|
#[tokio::test]
|
|
async fn test_tcp_control_socket_invalid_port_uses_default() {
|
|
let config = ControlConfig {
|
|
enabled: true,
|
|
socket_path: "not-a-port".to_string(),
|
|
};
|
|
|
|
// Should fall back to default port 21210. This may fail if 21210
|
|
// is already in use, which is acceptable for a unit test.
|
|
let result = ControlSocket::bind(&config);
|
|
// We mainly verify it doesn't panic on invalid input
|
|
if let Ok(socket) = result {
|
|
assert_eq!(socket.port(), 21210);
|
|
}
|
|
}
|
|
}
|