* feat: numa setup-phone — QR-based mobile DoT onboarding Adds a CLI subcommand that generates a one-time mobileconfig profile containing both the Numa local CA (as a com.apple.security.root payload) and the DoT DNS settings, then serves it via a temporary HTTP server and prints a scannable QR code in the terminal. Flow: 1. User runs `numa setup-phone` (no sudo needed) 2. Detects current LAN IP, reads CA from /usr/local/var/numa/ca.pem 3. Builds combined mobileconfig (CA trust + DoT) 4. Renders QR code with qrcode crate (Unicode block characters) 5. Serves the profile on port 8765, stays open until Ctrl+C 6. Counts successful downloads (multi-device households) Important caveat documented in instructions: even with the CA bundled in the profile, iOS still requires the user to manually enable trust in Settings → General → About → Certificate Trust Settings. Verified on a real iPhone. Stable PayloadIdentifiers/UUIDs ensure re-running replaces the existing profile on iOS rather than accumulating duplicates. - New module: src/setup_phone.rs (~270 lines) - New CLI subcommand: `numa setup-phone` - New dependency: qrcode = "0.14" (default-features = false) - tokio "signal" feature added for Ctrl+C handling - 3 unit tests: PEM stripping, mobileconfig generation, QR rendering Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> * feat: mobile API, enriched /health, mobileconfig module Adds a persistent read-only HTTP listener (default port 8765, LAN-bound) serving a dedicated subset of Numa's API for iOS/Android companion apps and as a replacement for the one-shot server setup_phone used to spin up: GET /health — enriched JSON with version, hostname, LAN IP, SNI, DoT config, mobile API port, CA fingerprint, features (shared handler with the main API on port 5380) GET /ca.pem — public CA certificate (shared handler) GET /mobileconfig — full iOS profile (CA trust + DNS settings pinned to current LAN IP) GET /ca.mobileconfig — CA-only iOS profile (trust anchor without DNS override — for the iOS companion app's programmatic DNS flow via NEDNSSettingsManager) All routes are idempotent GETs. The mobile API never serves the state-mutating routes that live on the main API (overrides, blocking toggle, service CRUD, cache flush), so it is safe to expose on the LAN regardless of the main API's bind address. The CA private key is never served by any route. Opt-in via `[mobile] enabled = true`. Default is false so new installs do not silently expose a LAN listener after upgrading; our committed numa.toml template enables it explicitly for spike testing. New modules: - src/mobileconfig.rs — ProfileMode::{Full, CaOnly} enum with plist builder lifted from setup_phone.rs. Full and CaOnly share the CA payload UUID (same trust anchor) but have distinct top-level UUIDs so they coexist as separate installable profiles on iOS. - src/health.rs — HealthMeta cached metadata built once at startup from config + CA fingerprint (SHA-256 of the PEM via ring), and the HealthResponse JSON shape shared between the main and mobile APIs. - src/mobile_api.rs — axum Router for the persistent listener. Reuses api::health and api::serve_ca from the main API; owns the two mobileconfig handlers. Modified: - src/api.rs — health() returns the enriched HealthResponse, now pub. serve_ca is now pub so mobile_api can reuse it. - src/config.rs — MobileConfig section (enabled, port, bind_addr). - src/ctx.rs — health_meta: HealthMeta field on ServerCtx. - src/main.rs — builds HealthMeta at startup, spawns mobile API listener if enabled. - src/lan.rs — build_announcement takes &HealthMeta and writes enriched TXT records (version, api_port, proto, dot_port, ca_fp). SRV port now reports the mobile API port; peer discovery still reads TXT `services=` so this is backwards compatible. Always announces even when no .numa services are registered, so the iOS companion app can discover Numa via mDNS regardless of service state. - src/setup_phone.rs — reduced from 267 to 100 lines. The CLI is now a thin QR wrapper over the persistent /mobileconfig endpoint; the hand-rolled one-shot HTTP server (accept_loop, RUST_OK_HEADERS, RUST_NOT_FOUND, download counter) is gone. - src/dot.rs — test fixture updated with HealthMeta::test_fixture(). - numa.toml — commented [mobile] section, enabled = true for spike. Tests: 136 unit tests passing (5 new in mobileconfig, 3 new in health). cargo clippy clean. Integration sanity check: curl'd /health, /ca.pem, /mobileconfig, /ca.mobileconfig against a running numa — all return 200 with correct content types and valid response bodies. Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> * fix: setup-phone probe, unknown command error, query source in dashboard - setup-phone now probes the mobile API before printing the QR code and shows an actionable error if [mobile] is not enabled - Unknown CLI subcommands print an error instead of silently attempting to start a full server - Dashboard query log shows source IP under timestamp (localhost for loopback, full IP for LAN devices) with full addr on hover Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> --------- Co-authored-by: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
108 lines
4.4 KiB
Rust
108 lines
4.4 KiB
Rust
//! Mobile API — persistent HTTP listener for iOS/Android companion apps.
|
|
//!
|
|
//! Read-only subset of Numa's HTTP surface served on a separate port
|
|
//! (default 8765) bound to the LAN. Unlike the main API on port 5380
|
|
//! (which defaults to `127.0.0.1` and serves mutating routes like
|
|
//! `DELETE /services/{name}` or `PUT /blocking/toggle`), this listener
|
|
//! is safe to expose on the LAN because every route is idempotent and
|
|
//! read-only.
|
|
//!
|
|
//! Routes (all GET):
|
|
//!
|
|
//! - `/health` — enriched status + metadata, shares the handler with the
|
|
//! main API via `crate::api::health`
|
|
//! - `/ca.pem` — Numa local CA in PEM form, shares the handler with the
|
|
//! main API via `crate::api::serve_ca`
|
|
//! - `/mobileconfig` — combined CA + DNS settings profile (Full mode)
|
|
//! - `/ca.mobileconfig` — CA-only trust profile (no DNS override)
|
|
//!
|
|
//! The mobile API does NOT include the mutating routes (overrides, cache
|
|
//! flush, blocking toggle, service CRUD, etc.). Even if a user sets
|
|
//! `api_bind_addr` to `0.0.0.0` for the main API, those routes stay on
|
|
//! port 5380; the mobile API on port 8765 never serves them. This is the
|
|
//! primary security boundary: anything exposed to the LAN is read-only.
|
|
|
|
use std::net::Ipv4Addr;
|
|
use std::sync::Arc;
|
|
|
|
use axum::extract::State;
|
|
use axum::http::{header, StatusCode};
|
|
use axum::response::IntoResponse;
|
|
use axum::routing::get;
|
|
use axum::Router;
|
|
use log::info;
|
|
|
|
use crate::ctx::ServerCtx;
|
|
use crate::mobileconfig::{build_mobileconfig, ProfileMode};
|
|
|
|
/// Content-Disposition for the full CA + DNS profile download.
|
|
const FULL_PROFILE_DISPOSITION: &str = "attachment; filename=\"numa.mobileconfig\"";
|
|
|
|
/// Content-Disposition for the CA-only profile download.
|
|
const CA_ONLY_PROFILE_DISPOSITION: &str = "attachment; filename=\"numa-ca.mobileconfig\"";
|
|
|
|
/// Build the axum router for the mobile API.
|
|
///
|
|
/// Shares handler functions with the main API where possible (`health`,
|
|
/// `serve_ca`) so the response shapes are identical across both ports.
|
|
pub fn router(ctx: Arc<ServerCtx>) -> Router {
|
|
Router::new()
|
|
.route("/health", get(crate::api::health))
|
|
.route("/ca.pem", get(crate::api::serve_ca))
|
|
.route("/mobileconfig", get(serve_full_mobileconfig))
|
|
.route("/ca.mobileconfig", get(serve_ca_only_mobileconfig))
|
|
.with_state(ctx)
|
|
}
|
|
|
|
/// Start the mobile API listener on `bind_addr:port`. Runs until the
|
|
/// caller cancels the spawned task. Logs the URL on successful bind.
|
|
pub async fn start(ctx: Arc<ServerCtx>, bind_addr: String, port: u16) -> crate::Result<()> {
|
|
let addr: std::net::SocketAddr = format!("{}:{}", bind_addr, port).parse()?;
|
|
let listener = tokio::net::TcpListener::bind(addr).await?;
|
|
|
|
info!("Mobile API listening on http://{}", addr);
|
|
|
|
let app = router(ctx);
|
|
axum::serve(listener, app).await?;
|
|
|
|
Ok(())
|
|
}
|
|
|
|
/// Serve the full mobileconfig profile (CA + DNS settings), with the
|
|
/// DNS payload pointing at the current LAN IP. Each request reads the
|
|
/// fresh LAN IP from `ctx.lan_ip` so the profile always reflects the
|
|
/// laptop's current network state.
|
|
async fn serve_full_mobileconfig(
|
|
State(ctx): State<Arc<ServerCtx>>,
|
|
) -> Result<impl IntoResponse, StatusCode> {
|
|
let ca_pem = ctx.ca_pem.as_deref().ok_or(StatusCode::NOT_FOUND)?;
|
|
let lan_ip: Ipv4Addr = *ctx.lan_ip.lock().unwrap();
|
|
let profile = build_mobileconfig(ProfileMode::Full { lan_ip }, ca_pem);
|
|
Ok(profile_response(profile, FULL_PROFILE_DISPOSITION))
|
|
}
|
|
|
|
/// Serve the CA-only mobileconfig profile. Trusts the Numa local CA but
|
|
/// does NOT change the device's DNS settings. Used by the iOS companion
|
|
/// app's DoT mode, where the app configures DNS via `NEDNSSettingsManager`
|
|
/// and only needs the system trust store to accept Numa's self-signed cert.
|
|
async fn serve_ca_only_mobileconfig(
|
|
State(ctx): State<Arc<ServerCtx>>,
|
|
) -> Result<impl IntoResponse, StatusCode> {
|
|
let ca_pem = ctx.ca_pem.as_deref().ok_or(StatusCode::NOT_FOUND)?;
|
|
let profile = build_mobileconfig(ProfileMode::CaOnly, ca_pem);
|
|
Ok(profile_response(profile, CA_ONLY_PROFILE_DISPOSITION))
|
|
}
|
|
|
|
/// Shared response constructor for both mobileconfig variants.
|
|
/// Identical headers; only the Content-Disposition filename differs.
|
|
fn profile_response(profile: String, disposition: &'static str) -> impl IntoResponse {
|
|
(
|
|
[
|
|
(header::CONTENT_TYPE, "application/x-apple-aspen-config"),
|
|
(header::CONTENT_DISPOSITION, disposition),
|
|
(header::CACHE_CONTROL, "no-store"),
|
|
],
|
|
profile,
|
|
)
|
|
}
|