mirror of
https://github.com/jmcorgan/fips.git
synced 2026-10-05 19:18:25 +00:00
A client process opens a flow to a peer's public key on a chosen port and sends and receives datagrams on a file descriptor the daemon hands it. No IPv6 emulation, no TUN device, no DNS: a datagram travels from key to key. The feature is off by default and is not a stable interface. The wire needs no change and gets none. Every FSP data packet has carried a port pair inside its AEAD envelope since v0.2.0, and port 256 is simply the IPv6 shim. What was missing was a way for a program to ask for a port of its own and be handed the traffic. Addressing is the part worth reading twice, because the obvious design is wrong. The x-only public key is the address. An npub is that key written in bech32, so converting between them is a local encoding rather than a lookup or a name service. The 16-byte node address that travels on the wire is the first half of a SHA-256 of the key: it is a truncated hash, it does not invert, and it appears nowhere a client can see. An earlier iteration of this work reported a peer by that hash and could supply a key only sometimes, which is what treating a wire identifier as an identity produces. An accepted flow therefore always knows its peer. The key is captured where the peer is authenticated rather than looked up when a report is rendered: every inbound datagram passes one call site inside a handler that refuses anything whose session is not established, and the responder has already rejected the session unless the claimed address derives from the key it proved. Reaching for the identity cache instead gives a best-effort answer from a structure that evicts. A listener is a descriptor. The daemon writes one message per arrival to it, carrying the new flow's descriptor and the peer's address, so poll, select and epoll work on a listener and accepting is a recvmsg. That is what lets the API be used from a program that already has an event loop, which a command-and-reply listener could not support: an arrival could not be waited on beside anything else. There is no accept command and no reject command. Refusing a flow is closing the descriptor you were handed. The Rust surface mirrors std::net. FipsStream::connect, FipsListener::bind, incoming, accept, io::Result and an errno mapping rather than a bespoke error type. An address is given as an npub, as a key, or as a pair, through one parameter, the way ToSocketAddrs takes several spellings of one thing. Each type holds its descriptor and copies of what setup told it and nothing else, so a stream that outlives its setup connection is not representable. set_nonblocking, AsFd and the four deadline methods carry the names and signatures std::net uses for the same jobs. They were asked for by a user integrating the API with tokio: AsyncFd requires a non-blocking descriptor, and anything receiving from a peer needs a bounded wait. AsFd is the better of the two descriptor accessors, because the borrow cannot outlive the value that owns the descriptor, so a reactor cannot hold a registration for a descriptor that has since been closed and its number reused by the next open. The non-blocking flag is read, modified and written back rather than assigned, since the flag word carries more than that one bit and a caller may have set O_ASYNC. A zero timeout is refused with EINVAL, because the kernel reads a zero timeval as "wait for ever", which inverts what a caller passing zero means; std::net refuses it for the same reason. The two directions are separate options and stay that way. FipsListener gets no timeout methods, matching TcpListener: bounding an accept is set_nonblocking plus the caller's own poll, which the reactor how-to builds. A flow taken from accept is blocking whatever the listener was set to, because the two are separate sockets and the daemon hands over a fresh one. One rule has no counterpart in Berkeley sockets and a client author must know it: the v1 wire carries no half-close, so nothing peer-driven ever closes a flow. A server written to read until the flow ends waits for a signal that cannot arrive, holding a thread and a flow per peer until its process exits. A program decides its own termination, and the example serves one datagram per flow. The tests reach a live daemon rather than a stand-in. Every public item had a unit test against a hand-written stand-in with canned replies, and the five entry points a program actually calls first, connect, connect_from, connect_at, bind and the SOCKET constant, had no coverage of any kind, because the tests that appear to cover them build a Wire over a socket pair and hand it to the private open and hold, so nothing ever resolved a socket path or mapped its errors. examples/native-surface.rs walks all thirty-eight items against a running daemon and reports the number of assertions it made. The count is read from the recorder rather than written as a literal, and the harness asserts the exit status, the completion marker and the count together, so deleting an assertion fails the check rather than quietly shrinking it. Watchdogs turn a hang into a named failure, which several of the walked behaviours would otherwise produce. The shared Docker image is built once for every integration leg, so the new binary is staged at all ten places the existing one is, the interop builder included, which gets a stub because those images exercise the wire between daemon versions and older refs do not carry the example. The platform gating was tested rather than reasoned about: flipping all eleven gates so the native API is excluded leaves the crate compiling clean across the workspace, every target and the profiling feature. The shipped docs tree gains what only the LaTeX manual under design/ had, which is not published with the daemon. A reference entry covers the whole surface: addressing and the port tiers, the Berkeley mapping, every method on FipsAddr, FipsStream, FipsListener and Incoming, the errno table, the ceilings, the four places data disappears with nothing reported, the line protocol and the command reference. The errno table gives names rather than numbers, since the client maps each name onto the libc constant for the platform it was built for and the supported platforms disagree on the numbers. A tutorial side trip stands up two throwaway nodes on one machine, peered over loopback UDP with no TUN and no DNS, then writes a listening program and a connecting program against them; it needs neither the public mesh nor root, because the native path is the one that does not go through the IPv6 adapter. The obligations a client in another language carries are a how-to of their own, since they are a task rather than a description: reading the setup connection with recvmsg, associating a descriptor with the last complete line, telling an empty datagram from a close, and six others. Serving many peers from one poll loop is another, with the whole program, because the straightforward listener spawns a thread per flow and that is wrong at the node's ceiling of 256. The drop causes are a table mapping each of the seven texts DropReason::as_str produces to the counter it increments, with drop_oversize called out as the ninth counter that is not in the table. What a daemon restart costs is a section of its own: every flow and listener ends, descriptors do not survive, there is no resumption, and datagrams sent but not yet forwarded are lost through a window nothing bounds. A stack comparison diagram places the interface against the stack a reader already knows: the same application over HTTP, TLS, TCP, IP and Ethernet on one side, and over its own format, FSP, FMP and a FIPS transport on the other, aligned so each row is one concern. The two columns are not alternatives and are not drawn as such. An unmodified IPv6 program's packets reach fips0, and the adapter hands each one to FSP as a payload, so the left stack runs inside the right one; the left column ends at a fork, eth0 for the ordinary internet and fips0 for the mesh, and an arrow leaves fips0 and runs back up into FSP's input. The row where TCP would be is empty on purpose and names Reliable Object Delivery, which is where that capability is expected to land. ROD is a v2 capability, the box is dashed because none of it exists yet, and the design entry says the part a reader needs most: nothing on the surface anticipates it, so a program written today should assume it does not exist. Both endpoints carry a scheme and a worked port, https://<npub>.fips:443 and fips://<npub>:443, with a footnote saying the two ports are not the same kind of thing, a TCP port inside the tunnel on the left and an FSP port on the right. The fips:// form is a coinage: nothing in the tree parses it, nothing registers the scheme, and the API takes a key and a port as separate arguments rather than a URL. The diagram also says where the right column stops, since FIPS over UDP still rides IP and Ethernet beneath. It appears in fips-concepts.md and fips-ipv6-adapter.md, which were making its argument in prose without a picture, and deliberately not in fips-architecture.md, which already carries the OSI mapping and makes the same point about the transport row. The gateway's control socket moves onto the same bind policy this API uses, which is the one change here that touches deployed behaviour: fips-gateway now tightens /run/fips to 0750. That is unreachable under the packaged deployment, where fips.service has already created the directory at that mode, and reachable for a source build or a container that starts the gateway alone. One changelog entry under Added, describing the released state: what a client opens and reads, the addressing and why the node address is not it, the listener being a descriptor, the std::net shape of the Rust surface, and the one rule Berkeley sockets have no counterpart for. It says in as many words that the wire is unchanged.
381 lines
13 KiB
Rust
381 lines
13 KiB
Rust
//! Gateway control socket for runtime status queries.
|
|
//!
|
|
//! Provides a Unix domain socket that accepts JSON commands and returns
|
|
//! structured responses. Uses the same line-delimited JSON protocol as
|
|
//! the daemon control socket: one JSON line in, one JSON line out, then
|
|
//! close.
|
|
|
|
use crate::control::protocol::{Request, Response};
|
|
use crate::gateway::pool::{MappingInfo, MappingState, PoolStatus};
|
|
use std::path::PathBuf;
|
|
use std::time::Instant;
|
|
use tokio::io::{AsyncBufReadExt, AsyncWriteExt, BufReader};
|
|
use tokio::net::UnixListener;
|
|
use tokio::sync::watch;
|
|
use tracing::{debug, info, warn};
|
|
|
|
/// Socket path for the gateway control socket.
|
|
///
|
|
/// Hardcoded to `/run/fips/gateway.sock`: gateway operation requires root
|
|
/// for NAT/conntrack management, so the daemon side never needs to fall
|
|
/// back to `XDG_RUNTIME_DIR` or `/tmp`. Client tools resolve the path via
|
|
/// [`crate::config::default_gateway_path`], which uses the shared
|
|
/// [`crate::config::resolve_default_socket`] helper and falls through to
|
|
/// `XDG_RUNTIME_DIR` / `/tmp` for non-root dev runs that don't have
|
|
/// `/run/fips` writable.
|
|
pub const GATEWAY_SOCKET_PATH: &str = "/run/fips/gateway.sock";
|
|
|
|
/// 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);
|
|
|
|
/// Snapshot of gateway state published by the main loop.
|
|
#[derive(Clone)]
|
|
pub struct GatewaySnapshot {
|
|
pub pool: PoolStatus,
|
|
pub mappings: Vec<MappingInfo>,
|
|
pub nat_mappings: usize,
|
|
pub dns_listen: String,
|
|
pub uptime_secs: u64,
|
|
// Config fields
|
|
pub pool_cidr: String,
|
|
pub lan_interface: String,
|
|
pub dns_upstream: String,
|
|
pub dns_ttl: u32,
|
|
pub pool_grace_period: u64,
|
|
}
|
|
|
|
/// Gateway control socket listener.
|
|
pub struct GatewayControlSocket {
|
|
listener: UnixListener,
|
|
socket_path: PathBuf,
|
|
}
|
|
|
|
impl GatewayControlSocket {
|
|
/// Bind the gateway control socket under the shared FIPS access policy.
|
|
///
|
|
/// The policy creates the parent directory, removes a stale socket file,
|
|
/// and applies mode `0770` plus the `fips` group. It also applies `0750` to
|
|
/// a parent it manages, which `/run/fips` is; systemd already creates that
|
|
/// directory at `0750` for the daemon this service requires, so under the
|
|
/// packaged deployment it is set to the value it already holds.
|
|
pub fn bind() -> Result<Self, std::io::Error> {
|
|
let socket_path = PathBuf::from(GATEWAY_SOCKET_PATH);
|
|
let listener = crate::utils::sockbind::bind(&socket_path, "gateway control")?;
|
|
|
|
info!(path = %socket_path.display(), "Gateway control socket listening");
|
|
|
|
Ok(Self {
|
|
listener,
|
|
socket_path,
|
|
})
|
|
}
|
|
|
|
/// Run the accept loop, reading the latest snapshot from the watch channel.
|
|
pub async fn accept_loop(self, snapshot_rx: watch::Receiver<Option<GatewaySnapshot>>) {
|
|
loop {
|
|
let (stream, _addr) = match self.listener.accept().await {
|
|
Ok(conn) => conn,
|
|
Err(e) => {
|
|
warn!(error = %e, "Gateway control socket accept failed");
|
|
continue;
|
|
}
|
|
};
|
|
|
|
let rx = snapshot_rx.clone();
|
|
tokio::spawn(async move {
|
|
if let Err(e) = Self::handle_connection(stream, rx).await {
|
|
debug!(error = %e, "Gateway control connection error");
|
|
}
|
|
});
|
|
}
|
|
}
|
|
|
|
/// Handle a single client connection.
|
|
async fn handle_connection(
|
|
stream: tokio::net::UnixStream,
|
|
snapshot_rx: watch::Receiver<Option<GatewaySnapshot>>,
|
|
) -> Result<(), Box<dyn std::error::Error>> {
|
|
let (reader, mut writer) = stream.into_split();
|
|
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;
|
|
}
|
|
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(())) => match serde_json::from_str::<Request>(line.trim()) {
|
|
Ok(request) => dispatch_command(&request.command, &snapshot_rx),
|
|
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!("Gateway control socket write failed or timed out");
|
|
}
|
|
|
|
Ok(())
|
|
}
|
|
|
|
/// Clean up the socket file.
|
|
fn cleanup(&self) {
|
|
crate::utils::sockbind::cleanup(&self.socket_path, "gateway control");
|
|
}
|
|
}
|
|
|
|
impl Drop for GatewayControlSocket {
|
|
fn drop(&mut self) {
|
|
self.cleanup();
|
|
}
|
|
}
|
|
|
|
/// Dispatch a command against the latest gateway snapshot.
|
|
fn dispatch_command(
|
|
command: &str,
|
|
snapshot_rx: &watch::Receiver<Option<GatewaySnapshot>>,
|
|
) -> Response {
|
|
let snapshot = match snapshot_rx.borrow().clone() {
|
|
Some(s) => s,
|
|
None => return Response::error("gateway not yet initialized"),
|
|
};
|
|
|
|
match command {
|
|
"show_gateway" => build_show_gateway(&snapshot),
|
|
"show_mappings" => build_show_mappings(&snapshot),
|
|
_ => Response::error(format!("unknown command: {command}")),
|
|
}
|
|
}
|
|
|
|
/// Build the `show_gateway` response with pool utilization summary.
|
|
fn build_show_gateway(snapshot: &GatewaySnapshot) -> Response {
|
|
Response::ok(serde_json::json!({
|
|
"pool_total": snapshot.pool.total,
|
|
"pool_allocated": snapshot.pool.allocated,
|
|
"pool_active": snapshot.pool.active,
|
|
"pool_draining": snapshot.pool.draining,
|
|
"pool_free": snapshot.pool.free,
|
|
"nat_mappings": snapshot.nat_mappings,
|
|
"dns_listen": snapshot.dns_listen,
|
|
"uptime_secs": snapshot.uptime_secs,
|
|
"pool_cidr": snapshot.pool_cidr,
|
|
"lan_interface": snapshot.lan_interface,
|
|
"dns_upstream": snapshot.dns_upstream,
|
|
"dns_ttl": snapshot.dns_ttl,
|
|
"pool_grace_period": snapshot.pool_grace_period,
|
|
}))
|
|
}
|
|
|
|
/// Build the `show_mappings` response with per-mapping detail.
|
|
fn build_show_mappings(snapshot: &GatewaySnapshot) -> Response {
|
|
let mappings: Vec<serde_json::Value> = snapshot
|
|
.mappings
|
|
.iter()
|
|
.map(|m| {
|
|
serde_json::json!({
|
|
"virtual_ip": m.virtual_ip.to_string(),
|
|
"mesh_addr": m.mesh_addr.to_string(),
|
|
"node_addr": m.node_addr.to_string(),
|
|
"dns_name": m.dns_name,
|
|
"state": mapping_state_str(m.state),
|
|
"sessions": m.session_count,
|
|
"age_secs": m.age_secs,
|
|
"last_ref_secs": m.last_ref_secs,
|
|
})
|
|
})
|
|
.collect();
|
|
|
|
Response::ok(serde_json::json!({ "mappings": mappings }))
|
|
}
|
|
|
|
/// Convert MappingState to a display string.
|
|
fn mapping_state_str(state: MappingState) -> &'static str {
|
|
match state {
|
|
MappingState::Allocated => "Allocated",
|
|
MappingState::Active => "Active",
|
|
MappingState::Draining => "Draining",
|
|
}
|
|
}
|
|
|
|
/// Static gateway configuration for snapshot building.
|
|
pub struct SnapshotConfig {
|
|
pub pool_cidr: String,
|
|
pub lan_interface: String,
|
|
pub dns_upstream: String,
|
|
pub dns_listen: String,
|
|
pub dns_ttl: u32,
|
|
pub pool_grace_period: u64,
|
|
}
|
|
|
|
/// Build a `GatewaySnapshot` from current component state.
|
|
///
|
|
/// Called from the pool tick task to publish updated status.
|
|
pub fn build_snapshot(
|
|
pool_status: PoolStatus,
|
|
mappings: Vec<MappingInfo>,
|
|
nat_mappings: usize,
|
|
start_time: Instant,
|
|
config: &SnapshotConfig,
|
|
) -> GatewaySnapshot {
|
|
GatewaySnapshot {
|
|
pool: pool_status,
|
|
mappings,
|
|
nat_mappings,
|
|
dns_listen: config.dns_listen.clone(),
|
|
uptime_secs: start_time.elapsed().as_secs(),
|
|
pool_cidr: config.pool_cidr.clone(),
|
|
lan_interface: config.lan_interface.clone(),
|
|
dns_upstream: config.dns_upstream.clone(),
|
|
dns_ttl: config.dns_ttl,
|
|
pool_grace_period: config.pool_grace_period,
|
|
}
|
|
}
|
|
|
|
#[cfg(test)]
|
|
mod tests {
|
|
use super::*;
|
|
use crate::NodeAddr;
|
|
|
|
fn make_snapshot() -> GatewaySnapshot {
|
|
GatewaySnapshot {
|
|
pool: PoolStatus {
|
|
total: 65535,
|
|
allocated: 1,
|
|
active: 0,
|
|
draining: 0,
|
|
free: 65534,
|
|
},
|
|
mappings: vec![MappingInfo {
|
|
virtual_ip: "fd01::1".parse().unwrap(),
|
|
mesh_addr: "fd97:467a::1".parse().unwrap(),
|
|
node_addr: NodeAddr::from_bytes([0; 16]),
|
|
dns_name: "npub1test.fips".to_string(),
|
|
state: MappingState::Active,
|
|
session_count: 3,
|
|
age_secs: 120,
|
|
last_ref_secs: 5,
|
|
}],
|
|
nat_mappings: 1,
|
|
dns_listen: "[fd02::10]:53".to_string(),
|
|
uptime_secs: 3600,
|
|
pool_cidr: "fd01::/112".to_string(),
|
|
lan_interface: "br-lan".to_string(),
|
|
dns_upstream: "127.0.0.1:5354".to_string(),
|
|
dns_ttl: 60,
|
|
pool_grace_period: 60,
|
|
}
|
|
}
|
|
|
|
#[test]
|
|
fn test_show_gateway_response() {
|
|
let snapshot = make_snapshot();
|
|
let resp = build_show_gateway(&snapshot);
|
|
assert_eq!(resp.status, "ok");
|
|
let data = resp.data.unwrap();
|
|
assert_eq!(data["pool_total"], 65535);
|
|
assert_eq!(data["pool_free"], 65534);
|
|
assert_eq!(data["nat_mappings"], 1);
|
|
assert_eq!(data["dns_listen"], "[fd02::10]:53");
|
|
assert_eq!(data["uptime_secs"], 3600);
|
|
}
|
|
|
|
#[test]
|
|
fn test_show_mappings_response() {
|
|
let snapshot = make_snapshot();
|
|
let resp = build_show_mappings(&snapshot);
|
|
assert_eq!(resp.status, "ok");
|
|
let data = resp.data.unwrap();
|
|
let mappings = data["mappings"].as_array().unwrap();
|
|
assert_eq!(mappings.len(), 1);
|
|
assert_eq!(mappings[0]["state"], "Active");
|
|
assert_eq!(mappings[0]["sessions"], 3);
|
|
assert_eq!(mappings[0]["virtual_ip"], "fd01::1");
|
|
}
|
|
|
|
#[test]
|
|
fn test_unknown_command() {
|
|
let (tx, rx) = watch::channel(Some(make_snapshot()));
|
|
let resp = dispatch_command("bogus", &rx);
|
|
assert_eq!(resp.status, "error");
|
|
assert!(resp.message.unwrap().contains("unknown command: bogus"));
|
|
drop(tx);
|
|
}
|
|
|
|
#[test]
|
|
fn test_not_initialized() {
|
|
let (tx, rx) = watch::channel::<Option<GatewaySnapshot>>(None);
|
|
let resp = dispatch_command("show_gateway", &rx);
|
|
assert_eq!(resp.status, "error");
|
|
assert!(resp.message.unwrap().contains("not yet initialized"));
|
|
drop(tx);
|
|
}
|
|
|
|
#[test]
|
|
fn test_mapping_state_str() {
|
|
assert_eq!(mapping_state_str(MappingState::Allocated), "Allocated");
|
|
assert_eq!(mapping_state_str(MappingState::Active), "Active");
|
|
assert_eq!(mapping_state_str(MappingState::Draining), "Draining");
|
|
}
|
|
|
|
#[test]
|
|
fn test_empty_mappings() {
|
|
let snapshot = GatewaySnapshot {
|
|
pool: PoolStatus {
|
|
total: 255,
|
|
allocated: 0,
|
|
active: 0,
|
|
draining: 0,
|
|
free: 255,
|
|
},
|
|
mappings: vec![],
|
|
nat_mappings: 0,
|
|
dns_listen: "[::1]:53".to_string(),
|
|
uptime_secs: 0,
|
|
pool_cidr: "fd01::/112".to_string(),
|
|
lan_interface: "br-lan".to_string(),
|
|
dns_upstream: "127.0.0.1:5354".to_string(),
|
|
dns_ttl: 60,
|
|
pool_grace_period: 60,
|
|
};
|
|
let resp = build_show_mappings(&snapshot);
|
|
assert_eq!(resp.status, "ok");
|
|
let data = resp.data.unwrap();
|
|
let mappings = data["mappings"].as_array().unwrap();
|
|
assert!(mappings.is_empty());
|
|
}
|
|
}
|