diff --git a/TODO.md b/TODO.md index d0ccbb8..cab9e5f 100644 --- a/TODO.md +++ b/TODO.md @@ -106,14 +106,14 @@ Design: [`plan.md`](plan.md) · Review fixes: [`plan/review.md`](plan/review.md) ## Phase 4 — TLS and NixOS packaging ### WS-I TLS · [card](plan/workstreams/WS-I-tls.md) -- [ ] **I1** (TLS) Config `server.tls.{enabled,cert_file,key_file}` with validation and documented example keys -- [ ] **I2** (TLS) Serve over rustls with a single pinned crypto provider. No openssl. -- [ ] **I3** (TLS) Reload cert and key on SIGHUP without dropping connections. A bad cert keeps the old one. -- [ ] **I4** (TLS) MCP allowed origins use `https://` when TLS is on -- [ ] **I5** (TLS) Startup warning for non-loopback bind without TLS -- [ ] **I6** (TLS) Tests with a generated self-signed cert: HTTPS, 401/200 over TLS, plain HTTP rejected, SIGHUP reload, bad files, bounded shutdown -- [ ] **I7** (TLS) README TLS section -- [ ] **I8** (TLS) Live check with `curl --cacert` and an `/mcp` initialize over HTTPS +- [ ] **T1** Config `server.tls.{enabled,cert_file,key_file}` with validation and documented example keys +- [ ] **T2** Serve over rustls with a single pinned crypto provider. No openssl. +- [ ] **T3** Reload cert and key on SIGHUP without dropping connections. A bad cert keeps the old one. +- [ ] **T4** MCP allowed origins use `https://` when TLS is on +- [ ] **T5** Startup warning for non-loopback bind without TLS +- [ ] **T6** Tests with a generated self-signed cert: HTTPS, 401/200 over TLS, plain HTTP rejected, SIGHUP reload, bad files, bounded shutdown +- [ ] **T7** README TLS section +- [ ] **T8** Live check with `curl --cacert` and an `/mcp` initialize over HTTPS ### WS-H NixOS · [card](plan/workstreams/WS-H-nixos.md) - [ ] **H1** `nix/package.nix`: `buildRustPackage` from `Cargo.lock` with pkg-config, cmake, systemd. Binary `slinuxm`. diff --git a/plan/workstreams/WS-I-tls.md b/plan/workstreams/WS-I-tls.md index aacee9a..be0ef8f 100644 --- a/plan/workstreams/WS-I-tls.md +++ b/plan/workstreams/WS-I-tls.md @@ -17,20 +17,20 @@ Serve REST and `/mcp` over HTTPS with certificates the operator provides, so bea Tick these in [`TODO.md`](../../TODO.md). -- **I1** Config: `server.tls.enabled` (default false), `server.tls.cert_file`, `server.tls.key_file`. Validation: enabled requires both paths, and both files must be readable at startup with a clear error. Document each key and its env var in `config.example.toml`. -- **I2** Serve over rustls. Pick the integration that keeps openssl out (`axum-server` with `tls-rustls`, or `tokio-rustls` with hyper-util). Pin the crypto provider so only one is linked. Cargo.toml change is a small separate commit. -- **I3** Reload certificate and key on SIGHUP without dropping connections. A bad new cert keeps the old one and logs an error. -- **I4** MCP allowlists: when TLS is on, `allowed_origins` default to `https://…`. `allowed_hosts` is unchanged. -- **I5** Startup warning when `bind` is non-loopback and TLS is off. Do not refuse. -- **I6** Tests: generate a self-signed cert in the test (dev-dependency such as `rcgen`). Cover HTTPS `/healthz`, 401 and 200 with a token over TLS, plain HTTP to the TLS port failing, SIGHUP reload serving the new cert, bad cert files failing startup, and graceful shutdown still within its bound. -- **I7** README TLS section, with a self-signed example and a note on ACME or sops certificate paths. -- **I8** Live check: `curl --cacert` against the running server, and one `/mcp` initialize over HTTPS. +- **T1** Config: `server.tls.enabled` (default false), `server.tls.cert_file`, `server.tls.key_file`. Validation: enabled requires both paths, and both files must be readable at startup with a clear error. Document each key and its env var in `config.example.toml`. +- **T2** Serve over rustls. Pick the integration that keeps openssl out (`axum-server` with `tls-rustls`, or `tokio-rustls` with hyper-util). Pin the crypto provider so only one is linked. Cargo.toml change is a small separate commit. +- **T3** Reload certificate and key on SIGHUP without dropping connections. A bad new cert keeps the old one and logs an error. +- **T4** MCP allowlists: when TLS is on, `allowed_origins` default to `https://…`. `allowed_hosts` is unchanged. +- **T5** Startup warning when `bind` is non-loopback and TLS is off. Do not refuse. +- **T6** Tests: generate a self-signed cert in the test (dev-dependency such as `rcgen`). Cover HTTPS `/healthz`, 401 and 200 with a token over TLS, plain HTTP to the TLS port failing, SIGHUP reload serving the new cert, bad cert files failing startup, and graceful shutdown still within its bound. +- **T7** README TLS section, with a self-signed example and a note on ACME or sops certificate paths. +- **T8** Live check: `curl --cacert` against the running server, and one `/mcp` initialize over HTTPS. ## Done when - `server.tls.enabled = true` serves HTTPS, and `cargo tree -i openssl` is still empty. - Replacing the cert files and sending SIGHUP changes the served certificate without a restart. -- Clippy, fmt and tests are clean, and the I8 live check passes. +- Clippy, fmt and tests are clean, and the T8 live check passes. ## Notes