hecks 3.14.0 → 5.0.0

data/rust/host/src/server.rs

@@ -2,6 +2,7 @@
 //! `dispatch_body` with the Lambda custom-runtime path, so neither repeats the other's logic.
 
 use crate::dispatch;
+use crate::host::Host;
 use crate::journal::LineageConfig;
 use crate::lambda_client::LambdaInvoker;
 use crate::log;
@@ -17,34 +18,63 @@ use axum::Router;
 use lambda_runtime::Error;
 use serde_json::Value;
 use std::net::SocketAddr;
-use std::path::{Path, PathBuf};
+use std::path::PathBuf;
 use std::sync::Arc;
 use tokio::sync::Mutex;
 use tokio_postgres::Client;
 
 /// The per-request dispatch decision, shared between the Lambda custom-runtime path and the
 /// axum fallback route below. `body` is already-parsed JSON in one of its recognized shapes.
-pub async fn dispatch_body(
-    body: Value,
-    client: &Mutex<Client>,
-    wasm_path: &Path,
-    config: &LineageConfig,
-    invoker: &dyn LambdaInvoker,
-) -> Result<Value, Error> {
-    if let Some(response) = web::render(&body, client, wasm_path, config, invoker).await {
+///
+/// `"bare": true` beside any of them (`verb` with `to`/`with` or `args`, `read`, `query`) answers
+/// the same outcome with each single-field value object as its bare field
+/// (`{"name": "Margherita"}`, not `{"name": {"value": "Margherita"}}`). What is stored is the
+/// same either way; without `bare` the answer is the stored shape.
+pub async fn dispatch_body(body: Value, host: Host<'_>) -> Result<Value, Error> {
+    if let Some(response) = web::render(&body, host).await {
         return Ok(response);
     }
+    let answer = kernel_answer(&body, host).await?;
+    if !wants_bare(&body) {
+        return Ok(answer);
+    }
+    Ok(dispatch::present(host.wasm_path, answer)
+        .await
+        .map_err(|e| format!("{e:#}"))?)
+}
+
+fn wants_bare(body: &Value) -> bool {
+    body.get("bare").and_then(Value::as_bool) == Some(true)
+}
 
-    if body.get("read").and_then(|v| v.as_bool()) == Some(true) {
+// The kernel's outcome for a read, query or command body, in the stored shape.
+async fn kernel_answer(body: &Value, host: Host<'_>) -> Result<Value, Error> {
+    let Host {
+        client,
+        wasm_path,
+        config,
+        ..
+    } = host;
+
+    if body.get("read").and_then(serde_json::Value::as_bool) == Some(true) {
         // `{e:#}`: anyhow's alternate Display walks `source()` to the real message,
         // where a bare `tokio_postgres` error's Display is just "db error".
-        let result = dispatch::read(client, wasm_path).await.map_err(|e| format!("{e:#}"))?;
+        let result = dispatch::read(client, wasm_path)
+            .await
+            .map_err(|e| format!("{e:#}"))?;
         return Ok(result);
     }
 
     // A query step reads current state and writes nothing to the journal.
     if body.get("query").is_some() {
-        return Ok(crate::query_step::answer(&body, crate::ir::ir(), &config.domain, client, wasm_path).await?);
+        return Ok(crate::query_step::answer(
+            body,
+            crate::ir::ir(),
+            &config.domain,
+            client,
+            wasm_path,
+        )
+        .await?);
     }
 
     let verb = body
@@ -52,30 +82,45 @@ pub async fn dispatch_body(
         .and_then(|v| v.as_str())
         .ok_or("event missing \"verb\"")?
         .to_string();
-    let role = body.get("role").and_then(|v| v.as_str()).map(|s| s.to_string());
+    let role = body
+        .get("role")
+        .and_then(|v| v.as_str())
+        .map(std::string::ToString::to_string);
     // Who the caller is, for Governance. Honored only where the internal protocol is: from this
     // host's own peers (`trusts_internal_dispatch`), never from a public caller.
-    let actor_id = body.get("actor_id").and_then(|v| v.as_str()).map(|s| s.to_string());
-    let caller = dispatch::Caller { role: role.as_deref(), actor_id: actor_id.as_deref() };
+    let actor_id = body
+        .get("actor_id")
+        .and_then(|v| v.as_str())
+        .map(std::string::ToString::to_string);
+    let caller = dispatch::Caller {
+        role: role.as_deref(),
+        actor_id: actor_id.as_deref(),
+    };
 
     let outcome = if let Some(to) = body.get("to").cloned() {
         if body.get("args").is_some() {
             return Err("cannot combine to/with with legacy args".into());
         }
-        let facts = body.get("with").cloned().unwrap_or_else(|| serde_json::json!({}));
-        dispatch::handle_routed_as(client, wasm_path, &verb, to, facts, caller, config, invoker)
+        let facts = body
+            .get("with")
+            .cloned()
+            .unwrap_or_else(|| serde_json::json!({}));
+        dispatch::handle_routed_as(host, &verb, to, facts, caller)
             .await
             .map_err(|e| format!("{e:#}"))?
     } else if let Some(facts) = body.get("with").cloned() {
         if body.get("args").is_some() {
             return Err("cannot combine \"with\" with legacy args".into());
         }
-        dispatch::handle_facts_as(client, wasm_path, &verb, facts, caller, config, invoker)
+        dispatch::handle_facts_as(host, &verb, facts, caller)
             .await
             .map_err(|e| format!("{e:#}"))?
     } else {
-        let args = body.get("args").cloned().unwrap_or_else(|| serde_json::json!({}));
-        dispatch::handle_as(client, wasm_path, &verb, args, caller, config, invoker)
+        let args = body
+            .get("args")
+            .cloned()
+            .unwrap_or_else(|| serde_json::json!({}));
+        dispatch::handle_as(host, &verb, args, caller)
             .await
             .map_err(|e| format!("{e:#}"))?
     };
@@ -93,10 +138,24 @@ pub struct ServerState {
     pub limits: Arc<RateLimits>,
 }
 
+impl ServerState {
+    /// The shared pieces a dispatch needs, borrowed for one call.
+    pub fn host(&self) -> Host<'_> {
+        Host::shared(
+            &self.client,
+            &self.wasm_path,
+            &self.lineage_config,
+            &self.invoker,
+        )
+    }
+}
+
 /// The document `GET /version` serves: era, IR hash, and build — all fixed for the life of
 /// the process, so this is built once at boot. Carries no secrets.
 pub fn version_body(era: &str, ir_hash: &str, build_env: Option<&str>) -> Value {
-    let build = build_env.filter(|v| !v.is_empty()).unwrap_or(env!("CARGO_PKG_VERSION"));
+    let build = build_env
+        .filter(|v| !v.is_empty())
+        .unwrap_or(env!("CARGO_PKG_VERSION"));
     serde_json::json!({ "era": era, "ir_hash": ir_hash, "build": build })
 }
 
@@ -104,13 +163,19 @@ pub fn version_body(era: &str, ir_hash: &str, build_env: Option<&str>) -> Value
 /// request answers a clone of the boot-time document, never touching auth or dispatch.
 pub fn version_router(body: Value) -> Router {
     let body = Arc::new(body);
-    Router::new().route("/version", get(move || std::future::ready(axum::Json(body.as_ref().clone()))))
+    Router::new().route(
+        "/version",
+        get(move || std::future::ready(axum::Json(body.as_ref().clone()))),
+    )
 }
 
 /// Compiles the domain's wasm module, then binds `$PORT` (falls back to 8080) and serves
 /// forever. Nothing listens until the compile finishes, so the health check never lies.
 pub async fn serve(state: ServerState, version: Value) -> Result<(), Error> {
-    let port: u16 = std::env::var("PORT").ok().and_then(|v| v.parse().ok()).unwrap_or(8080);
+    let port: u16 = std::env::var("PORT")
+        .ok()
+        .and_then(|v| v.parse().ok())
+        .unwrap_or(8080);
 
     warm_wasm(&state.wasm_path).await;
 
@@ -122,7 +187,11 @@ pub async fn serve(state: ServerState, version: Value) -> Result<(), Error> {
 
 /// The router and serve loop over an already-bound `listener`, split out so a test can
 /// run the real service on an ephemeral port.
-async fn serve_on(listener: tokio::net::TcpListener, state: ServerState, version: Value) -> Result<(), Error> {
+async fn serve_on(
+    listener: tokio::net::TcpListener,
+    state: ServerState,
+    version: Value,
+) -> Result<(), Error> {
     let app = Router::new()
         .route("/", get(health))
         .fallback(any(dispatch_route))
@@ -130,7 +199,11 @@ async fn serve_on(listener: tokio::net::TcpListener, state: ServerState, version
         .merge(version_router(version));
 
     // The connect info is the TCP peer, which `rate_limit` needs to tell a visitor from a proxy.
-    axum::serve(listener, app.into_make_service_with_connect_info::<SocketAddr>()).await?;
+    axum::serve(
+        listener,
+        app.into_make_service_with_connect_info::<SocketAddr>(),
+    )
+    .await?;
     Ok(())
 }
 
@@ -143,8 +216,14 @@ async fn warm_wasm(wasm_path: &Arc<PathBuf>) {
         Ok(Ok(())) => {
             phase.end();
         }
-        Ok(Err(e)) => log::error("wasm_warm_failed", serde_json::json!({ "error": format!("{e:#}") })),
-        Err(e) => log::error("wasm_warm_failed", serde_json::json!({ "error": format!("{e}") })),
+        Ok(Err(e)) => log::error(
+            "wasm_warm_failed",
+            serde_json::json!({ "error": format!("{e:#}") }),
+        ),
+        Err(e) => log::error(
+            "wasm_warm_failed",
+            serde_json::json!({ "error": format!("{e}") }),
+        ),
     }
 }
 
@@ -179,30 +258,55 @@ async fn dispatch_route(
     response
 }
 
-async fn route_request(state: ServerState, peer: SocketAddr, method: Method, uri: Uri, headers: HeaderMap, body: Bytes) -> Response {
+async fn route_request(
+    state: ServerState,
+    peer: SocketAddr,
+    method: Method,
+    uri: Uri,
+    headers: HeaderMap,
+    body: Bytes,
+) -> Response {
     let envelope = match admit(&state.limits, peer, &method, &uri, &headers, &body) {
         Ok(envelope) => envelope,
         Err(refusal) => return *refusal,
     };
 
-    match dispatch_body(envelope, &state.client, &state.wasm_path, &state.lineage_config, state.invoker.as_ref()).await {
+    match dispatch_body(envelope, state.host()).await {
         Ok(value) => value_to_response(value),
         Err(e) => {
-            log::error("dispatch_failed", serde_json::json!({ "error": format!("{e}") }));
-            (StatusCode::INTERNAL_SERVER_ERROR, axum::Json(serde_json::json!({ "error": format!("{e}") }))).into_response()
+            log::error(
+                "dispatch_failed",
+                serde_json::json!({ "error": format!("{e}") }),
+            );
+            (
+                StatusCode::INTERNAL_SERVER_ERROR,
+                axum::Json(serde_json::json!({ "error": format!("{e}") })),
+            )
+                .into_response()
         }
     }
 }
 
 /// Turns a raw HTTP request into `dispatch_body`'s envelope, or into the response that ends
 /// it first: a `400` for non-JSON, a `429` for a caller over a public route's rate limit.
-fn admit(limits: &RateLimits, peer: SocketAddr, method: &Method, uri: &Uri, headers: &HeaderMap, body: &Bytes) -> Result<Value, Box<Response>> {
+fn admit(
+    limits: &RateLimits,
+    peer: SocketAddr,
+    method: &Method,
+    uri: &Uri,
+    headers: &HeaderMap,
+    body: &Bytes,
+) -> Result<Value, Box<Response>> {
     let parsed: Value = if body.is_empty() {
         serde_json::json!({})
     } else {
         match serde_json::from_slice(body) {
             Ok(value) => value,
-            Err(e) => return Err(Box::new((StatusCode::BAD_REQUEST, format!("invalid JSON body: {e}")).into_response())),
+            Err(e) => {
+                return Err(Box::new(
+                    (StatusCode::BAD_REQUEST, format!("invalid JSON body: {e}")).into_response(),
+                ))
+            }
         }
     };
 
@@ -213,14 +317,22 @@ fn admit(limits: &RateLimits, peer: SocketAddr, method: &Method, uri: &Uri, head
     // they're honored only from a peer on this host (the task's own sidecar); everyone
     // else — the load balancer, i.e. the public internet — gets an ordinary request
     // envelope for the path it actually hit.
-    let envelope = if trusts_internal_dispatch(peer) && is_internal_dispatch_shape(&parsed) {
+    // A proxy on this host (an AwsBox's Caddy, which a tunnel also goes through) makes every
+    // public request arrive from loopback too; the forwarding headers it always adds are what
+    // tell its traffic apart from a sidecar's.
+    let envelope = if trusts_internal_dispatch(peer)
+        && !came_through_a_proxy(headers)
+        && is_internal_dispatch_shape(&parsed)
+    {
         parsed
     } else {
         synthesize_function_url_envelope(method, uri, headers, body)
     };
 
     if let Some((route_method, route_path)) = envelope_route(&envelope) {
-        if let Verdict::Limited { retry_after_secs } = limits.check(route_method, route_path, headers, Some(peer.ip())) {
+        if let Verdict::Limited { retry_after_secs } =
+            limits.check(route_method, route_path, headers, Some(peer.ip()))
+        {
             return Err(Box::new(rate_limit::too_many_requests(retry_after_secs)));
         }
     }
@@ -230,7 +342,11 @@ fn admit(limits: &RateLimits, peer: SocketAddr, method: &Method, uri: &Uri, head
 /// The method and path a Function-URL-shaped envelope names, or `None` for
 /// the verb and read shapes, which carry no route.
 fn envelope_route(envelope: &Value) -> Option<(&str, &str)> {
-    let method = envelope.get("requestContext")?.get("http")?.get("method")?.as_str()?;
+    let method = envelope
+        .get("requestContext")?
+        .get("http")?
+        .get("method")?
+        .as_str()?;
     let path = envelope.get("rawPath")?.as_str()?;
     Some((method, path))
 }
@@ -240,10 +356,29 @@ fn envelope_route(envelope: &Value) -> Option<(&str, &str)> {
 fn trusts_internal_dispatch(peer: SocketAddr) -> bool {
     match peer.ip() {
         std::net::IpAddr::V4(addr) => addr.is_loopback(),
-        std::net::IpAddr::V6(addr) => addr.is_loopback() || addr.to_ipv4_mapped().is_some_and(|mapped| mapped.is_loopback()),
+        std::net::IpAddr::V6(addr) => {
+            addr.is_loopback()
+                || addr
+                    .to_ipv4_mapped()
+                    .is_some_and(|mapped| mapped.is_loopback())
+        }
     }
 }
 
+/// Whether a proxy forwarded this request: Caddy's `reverse_proxy` always sets the
+/// `X-Forwarded-*` headers, and a client cannot make it drop them.
+fn came_through_a_proxy(headers: &HeaderMap) -> bool {
+    [
+        "x-forwarded-for",
+        "x-forwarded-host",
+        "x-forwarded-proto",
+        "forwarded",
+        "via",
+    ]
+    .iter()
+    .any(|name| headers.contains_key(*name))
+}
+
 /// Whether `value` already matches one of `dispatch_body`'s recognized shapes; anything
 /// else (including a bare `{}`) is real REST traffic needing `synthesize_function_url_envelope`.
 fn is_internal_dispatch_shape(value: &Value) -> bool {
@@ -255,11 +390,19 @@ fn is_internal_dispatch_shape(value: &Value) -> bool {
 
 /// Rebuilds the envelope shape a real Lambda Function URL invocation already produces
 /// automatically, from the raw axum request parts.
-fn synthesize_function_url_envelope(method: &Method, uri: &Uri, headers: &HeaderMap, body: &Bytes) -> Value {
+fn synthesize_function_url_envelope(
+    method: &Method,
+    uri: &Uri,
+    headers: &HeaderMap,
+    body: &Bytes,
+) -> Value {
     let mut header_map = serde_json::Map::new();
-    for (name, value) in headers.iter() {
+    for (name, value) in headers {
         if let Ok(value) = value.to_str() {
-            header_map.insert(name.as_str().to_ascii_lowercase(), Value::String(value.to_string()));
+            header_map.insert(
+                name.as_str().to_ascii_lowercase(),
+                Value::String(value.to_string()),
+            );
         }
     }
 
@@ -276,17 +419,25 @@ fn synthesize_function_url_envelope(method: &Method, uri: &Uri, headers: &Header
 /// Translates `dispatch_body`'s JSON result into a real HTTP response: `web::render`'s
 /// Function-URL envelope when `statusCode` is present, else the raw outcome as `200` JSON.
 fn value_to_response(value: Value) -> Response {
-    let Some(status_code) = value.get("statusCode").and_then(|v| v.as_u64()) else {
+    let Some(status_code) = value.get("statusCode").and_then(serde_json::Value::as_u64) else {
         return (StatusCode::OK, axum::Json(value)).into_response();
     };
     // `try_from`, not `as u16`: 65736 would wrap to 200 and turn a handler's garbage into a success.
-    let status = u16::try_from(status_code).ok().and_then(|code| StatusCode::from_u16(code).ok()).unwrap_or(StatusCode::INTERNAL_SERVER_ERROR);
+    let status = u16::try_from(status_code)
+        .ok()
+        .and_then(|code| StatusCode::from_u16(code).ok())
+        .unwrap_or(StatusCode::INTERNAL_SERVER_ERROR);
 
     let mut headers = HeaderMap::new();
     if let Some(header_obj) = value.get("headers").and_then(|h| h.as_object()) {
         for (name, header_value) in header_obj {
-            let Some(header_value) = header_value.as_str() else { continue };
-            if let (Ok(name), Ok(header_value)) = (HeaderName::from_bytes(name.as_bytes()), HeaderValue::from_str(header_value)) {
+            let Some(header_value) = header_value.as_str() else {
+                continue;
+            };
+            if let (Ok(name), Ok(header_value)) = (
+                HeaderName::from_bytes(name.as_bytes()),
+                HeaderValue::from_str(header_value),
+            ) {
                 headers.insert(name, header_value);
             }
         }
@@ -304,7 +455,11 @@ fn value_to_response(value: Value) -> Response {
     }
 
     let raw_body = value.get("body").and_then(|v| v.as_str()).unwrap_or("");
-    let body_bytes = if value.get("isBase64Encoded").and_then(|v| v.as_bool()) == Some(true) {
+    let body_bytes = if value
+        .get("isBase64Encoded")
+        .and_then(serde_json::Value::as_bool)
+        == Some(true)
+    {
         web::base64_decode(raw_body)
     } else {
         raw_body.as_bytes().to_vec()
@@ -319,29 +474,39 @@ mod tests {
 
     #[test]
     fn a_function_url_shaped_body_is_recognized_as_internal_dispatch() {
-        assert!(is_internal_dispatch_shape(&serde_json::json!({"requestContext": {"http": {"method": "GET"}}})));
+        assert!(is_internal_dispatch_shape(
+            &serde_json::json!({"requestContext": {"http": {"method": "GET"}}})
+        ));
     }
 
     #[test]
     fn a_bare_read_body_is_recognized_as_internal_dispatch() {
-        assert!(is_internal_dispatch_shape(&serde_json::json!({"read": true})));
+        assert!(is_internal_dispatch_shape(
+            &serde_json::json!({"read": true})
+        ));
     }
 
     #[test]
     fn a_declared_query_body_is_recognized_as_internal_dispatch() {
         // `dispatch_body` answers `{"query": ...}`, and the generated editor's list and picture
         // pickers ask it; without this a loopback caller was sent to the login page.
-        assert!(is_internal_dispatch_shape(&serde_json::json!({"query": "Pictures::MediaItem.Pictures", "args": {}})));
+        assert!(is_internal_dispatch_shape(
+            &serde_json::json!({"query": "Pictures::MediaItem.Pictures", "args": {}})
+        ));
     }
 
     #[test]
     fn a_verb_command_body_is_recognized_as_internal_dispatch() {
-        assert!(is_internal_dispatch_shape(&serde_json::json!({"verb": "Register", "args": {}})));
+        assert!(is_internal_dispatch_shape(
+            &serde_json::json!({"verb": "Register", "args": {}})
+        ));
     }
 
     #[test]
     fn a_plain_rest_payload_is_not_internal_dispatch() {
-        assert!(!is_internal_dispatch_shape(&serde_json::json!({"email": "a@example.com"})));
+        assert!(!is_internal_dispatch_shape(
+            &serde_json::json!({"email": "a@example.com"})
+        ));
     }
 
     #[test]
@@ -355,21 +520,43 @@ mod tests {
 
     #[test]
     fn only_a_peer_on_this_host_is_trusted_with_the_internal_protocol() {
-        for trusted in ["127.0.0.1:5000", "127.4.5.6:5000", "[::1]:5000", "[::ffff:127.0.0.1]:5000"] {
-            assert!(trusts_internal_dispatch(peer(trusted)), "{trusted} is this host");
+        for trusted in [
+            "127.0.0.1:5000",
+            "127.4.5.6:5000",
+            "[::1]:5000",
+            "[::ffff:127.0.0.1]:5000",
+        ] {
+            assert!(
+                trusts_internal_dispatch(peer(trusted)),
+                "{trusted} is this host"
+            );
         }
-        for outside in ["10.0.0.5:5000", "172.31.4.9:5000", "203.0.113.7:5000", "[2001:db8::1]:5000", "[::ffff:10.0.0.5]:5000"] {
-            assert!(!trusts_internal_dispatch(peer(outside)), "{outside} is not this host");
+        for outside in [
+            "10.0.0.5:5000",
+            "172.31.4.9:5000",
+            "203.0.113.7:5000",
+            "[2001:db8::1]:5000",
+            "[::ffff:10.0.0.5]:5000",
+        ] {
+            assert!(
+                !trusts_internal_dispatch(peer(outside)),
+                "{outside} is not this host"
+            );
         }
     }
 
     fn admitted(from: &str, path: &str, body: &str) -> Value {
         let uri: Uri = path.parse().unwrap();
         let body = Bytes::from(body.to_string());
-        match admit(&limits_from(&[]), peer(from), &Method::POST, &uri, &HeaderMap::new(), &body) {
-            Ok(envelope) => envelope,
-            Err(_) => panic!("{from} POST {path} was refused before dispatch"),
-        }
+        admit(
+            &limits_from(&[]),
+            peer(from),
+            &Method::POST,
+            &uri,
+            &HeaderMap::new(),
+            &body,
+        )
+        .unwrap_or_else(|_| panic!("{from} POST {path} was refused before dispatch"))
     }
 
     // The gap this closes: a public POST to any path the load balancer forwards carried
@@ -377,11 +564,17 @@ mod tests {
     // caller's own word for its role and no session check.
     #[test]
     fn a_verb_or_read_body_from_outside_this_host_is_an_ordinary_request_not_a_command() {
-        for body in [r#"{"verb":"Approve","role":"admin"}"#, r#"{"read":true}"#, r#"{"query":"Pictures::MediaItem.Pictures","args":{}}"#] {
+        for body in [
+            r#"{"verb":"Approve","role":"admin"}"#,
+            r#"{"read":true}"#,
+            r#"{"query":"Pictures::MediaItem.Pictures","args":{}}"#,
+        ] {
             let envelope = admitted("10.0.0.5:5000", "/webhooks/x", body);
 
             assert!(
-                envelope.get("verb").is_none() && envelope.get("read").is_none() && envelope.get("query").is_none(),
+                envelope.get("verb").is_none()
+                    && envelope.get("read").is_none()
+                    && envelope.get("query").is_none(),
                 "{body} must not reach dispatch as a command"
             );
             assert_eq!(envelope["requestContext"]["http"]["method"], "POST");
@@ -397,18 +590,58 @@ mod tests {
 
         assert_eq!(envelope["rawPath"], "/webhooks/x");
         assert_eq!(envelope["requestContext"]["http"]["method"], "POST");
-        assert!(envelope["headers"].get("cookie").is_none(), "headers come from the real request, not the body");
+        assert!(
+            envelope["headers"].get("cookie").is_none(),
+            "headers come from the real request, not the body"
+        );
     }
 
     #[test]
     fn a_verb_or_read_body_from_this_host_still_reaches_dispatch_unchanged() {
-        for body in [r#"{"verb":"Register","to":"r1","with":{}}"#, r#"{"read":true}"#, r#"{"query":"Banking::Customer.Suspended","args":{}}"#] {
+        for body in [
+            r#"{"verb":"Register","to":"r1","with":{}}"#,
+            r#"{"read":true}"#,
+            r#"{"query":"Banking::Customer.Suspended","args":{}}"#,
+        ] {
             let envelope = admitted("127.0.0.1:5000", "/anything", body);
 
             assert_eq!(envelope, serde_json::from_str::<Value>(body).unwrap());
         }
     }
 
+    // The gap this closes: on an AwsBox, Caddy proxies the public internet to 127.0.0.1, so
+    // a public `{"read": true}` or `{"verb": ..., "role": "Admin"}` arrived from loopback and
+    // reached the kernel as the internal protocol.
+    #[test]
+    fn a_verb_or_read_body_a_proxy_on_this_host_forwarded_is_an_ordinary_request() {
+        for header in [
+            "x-forwarded-for",
+            "x-forwarded-host",
+            "x-forwarded-proto",
+            "forwarded",
+            "via",
+        ] {
+            let mut headers = HeaderMap::new();
+            headers.insert(header, "203.0.113.7".parse().unwrap());
+            let body = Bytes::from(r#"{"verb":"Approve","role":"Admin"}"#);
+            let envelope = admit(
+                &limits_from(&[]),
+                peer("127.0.0.1:5000"),
+                &Method::POST,
+                &"/anything".parse().unwrap(),
+                &headers,
+                &body,
+            )
+            .unwrap_or_else(|_| panic!("a request carrying {header} was refused"));
+
+            assert!(
+                envelope.get("verb").is_none(),
+                "a body forwarded with {header} must not reach dispatch as a command"
+            );
+            assert_eq!(envelope["rawPath"], "/anything");
+        }
+    }
+
     // Pins a real REST client's plain POST, with no Function-URL wrapping: it must
     // synthesize the same shape `web::render`/`checkout_route` read, not error on a
     // missing "verb".
@@ -417,8 +650,14 @@ mod tests {
         let method = Method::POST;
         let uri: Uri = "/registrations?utm_source=test".parse().unwrap();
         let mut headers = HeaderMap::new();
-        headers.insert(HeaderName::from_static("stripe-signature"), HeaderValue::from_static("t=1,v1=abc"));
-        headers.insert(HeaderName::from_static("content-type"), HeaderValue::from_static("application/json"));
+        headers.insert(
+            HeaderName::from_static("stripe-signature"),
+            HeaderValue::from_static("t=1,v1=abc"),
+        );
+        headers.insert(
+            HeaderName::from_static("content-type"),
+            HeaderValue::from_static("application/json"),
+        );
         let body = Bytes::from_static(br#"{"event_id":"ci-verification-test"}"#);
 
         let envelope = synthesize_function_url_envelope(&method, &uri, &headers, &body);
@@ -430,7 +669,10 @@ mod tests {
         assert_eq!(envelope["headers"]["content-type"], "application/json");
         assert_eq!(envelope["body"], r#"{"event_id":"ci-verification-test"}"#);
         assert_eq!(envelope["isBase64Encoded"], false);
-        assert!(is_internal_dispatch_shape(&envelope), "the synthesized envelope must itself be recognized on a second pass");
+        assert!(
+            is_internal_dispatch_shape(&envelope),
+            "the synthesized envelope must itself be recognized on a second pass"
+        );
     }
 
     #[test]
@@ -453,7 +695,9 @@ mod tests {
     // Serves `version_router` on an ephemeral port, the way the host serves
     // it, so a request travels the real HTTP stack.
     async fn serve_version(body: Value) -> std::net::SocketAddr {
-        let listener = tokio::net::TcpListener::bind(("127.0.0.1", 0)).await.unwrap();
+        let listener = tokio::net::TcpListener::bind(("127.0.0.1", 0))
+            .await
+            .unwrap();
         let addr = listener.local_addr().unwrap();
         tokio::spawn(async move { axum::serve(listener, version_router(body)).await });
         addr
@@ -462,31 +706,56 @@ mod tests {
     #[tokio::test]
     async fn version_answers_200_json_with_no_session() {
         let addr = serve_version(sample_version()).await;
-        let response = reqwest::get(format!("http://{addr}/version")).await.unwrap();
+        let response = reqwest::get(format!("http://{addr}/version"))
+            .await
+            .unwrap();
         assert_eq!(response.status(), 200);
-        let content_type = response.headers()["content-type"].to_str().unwrap().to_string();
-        assert!(content_type.starts_with("application/json"), "got {content_type}");
+        let content_type = response.headers()["content-type"]
+            .to_str()
+            .unwrap()
+            .to_string();
+        assert!(
+            content_type.starts_with("application/json"),
+            "got {content_type}"
+        );
         let body: Value = response.json().await.unwrap();
-        assert_eq!(body, serde_json::json!({ "era": "199b08", "ir_hash": "a".repeat(64), "build": "build-42" }));
+        assert_eq!(
+            body,
+            serde_json::json!({ "era": "199b08", "ir_hash": "a".repeat(64), "build": "build-42" })
+        );
     }
 
     #[tokio::test]
     async fn version_era_is_a_non_empty_string() {
         let addr = serve_version(sample_version()).await;
-        let body: Value = reqwest::get(format!("http://{addr}/version")).await.unwrap().json().await.unwrap();
+        let body: Value = reqwest::get(format!("http://{addr}/version"))
+            .await
+            .unwrap()
+            .json()
+            .await
+            .unwrap();
         assert!(body["era"].as_str().is_some_and(|era| !era.is_empty()));
     }
 
     #[tokio::test]
     async fn version_is_get_only() {
         let addr = serve_version(sample_version()).await;
-        let response = reqwest::Client::new().post(format!("http://{addr}/version")).send().await.unwrap();
+        let response = reqwest::Client::new()
+            .post(format!("http://{addr}/version"))
+            .send()
+            .await
+            .unwrap();
         assert_eq!(response.status(), 405);
     }
 
     fn limits_from(pairs: &[(&str, &str)]) -> Arc<RateLimits> {
-        let map: std::collections::HashMap<String, String> = pairs.iter().map(|(k, v)| (k.to_string(), v.to_string())).collect();
-        Arc::new(RateLimits::new(crate::rate_limit::Config::from_lookup(|name| map.get(name).cloned()).0))
+        let map: std::collections::HashMap<String, String> = pairs
+            .iter()
+            .map(|(k, v)| (k.to_string(), v.to_string()))
+            .collect();
+        Arc::new(RateLimits::new(
+            crate::rate_limit::Config::from_lookup(|name| map.get(name).cloned()).0,
+        ))
     }
 
     async fn gate_only(
@@ -506,15 +775,30 @@ mod tests {
     // A disposable server on an ephemeral port: the real `admit` gate reading the real connection
     // peer, with an acknowledgement standing in for dispatch, which needs Postgres and wasm.
     async fn gated_server(limits: Arc<RateLimits>) -> SocketAddr {
-        let listener = tokio::net::TcpListener::bind(("127.0.0.1", 0)).await.unwrap();
+        let listener = tokio::net::TcpListener::bind(("127.0.0.1", 0))
+            .await
+            .unwrap();
         let addr = listener.local_addr().unwrap();
         let app = Router::new().fallback(any(gate_only)).with_state(limits);
-        tokio::spawn(async move { axum::serve(listener, app.into_make_service_with_connect_info::<SocketAddr>()).await });
+        tokio::spawn(async move {
+            axum::serve(
+                listener,
+                app.into_make_service_with_connect_info::<SocketAddr>(),
+            )
+            .await
+        });
         addr
     }
 
-    async fn post(addr: SocketAddr, path: &str, forwarded_for: Option<&str>, body: &str) -> reqwest::Response {
-        let mut request = reqwest::Client::new().post(format!("http://{addr}{path}")).body(body.to_string());
+    async fn post(
+        addr: SocketAddr,
+        path: &str,
+        forwarded_for: Option<&str>,
+        body: &str,
+    ) -> reqwest::Response {
+        let mut request = reqwest::Client::new()
+            .post(format!("http://{addr}{path}"))
+            .body(body.to_string());
         if let Some(forwarded_for) = forwarded_for {
             request = request.header("x-forwarded-for", forwarded_for);
         }
@@ -527,37 +811,84 @@ mod tests {
     async fn a_burst_on_a_public_write_route_gets_429_with_retry_after_and_a_json_error() {
         let addr = gated_server(limits_from(&[("HECKS_RATE_LIMIT_SUBSCRIBE", "3")])).await;
         for attempt in 1..=3 {
-            assert_eq!(post(addr, SUBSCRIBE, None, r#"{"email":"a@example.com"}"#).await.status(), 200, "request {attempt}");
+            assert_eq!(
+                post(addr, SUBSCRIBE, None, r#"{"email":"a@example.com"}"#)
+                    .await
+                    .status(),
+                200,
+                "request {attempt}"
+            );
         }
 
         let refused = post(addr, SUBSCRIBE, None, r#"{"email":"a@example.com"}"#).await;
         assert_eq!(refused.status(), 429);
-        let retry_after: u64 = refused.headers()["retry-after"].to_str().unwrap().parse().unwrap();
+        let retry_after: u64 = refused.headers()["retry-after"]
+            .to_str()
+            .unwrap()
+            .parse()
+            .unwrap();
         assert!((1..=3600).contains(&retry_after), "got {retry_after}");
-        assert!(refused.headers()["content-type"].to_str().unwrap().starts_with("application/json"));
+        assert!(refused.headers()["content-type"]
+            .to_str()
+            .unwrap()
+            .starts_with("application/json"));
         let body: Value = refused.json().await.unwrap();
-        assert_eq!(body, serde_json::json!({ "error": "too many requests, please try again later" }));
+        assert_eq!(
+            body,
+            serde_json::json!({ "error": "too many requests, please try again later" })
+        );
     }
 
     #[tokio::test]
     async fn registrations_are_limited_apart_from_subscribes() {
-        let addr = gated_server(limits_from(&[("HECKS_RATE_LIMIT_SUBSCRIBE", "1"), ("HECKS_RATE_LIMIT_REGISTER", "2")])).await;
+        let addr = gated_server(limits_from(&[
+            ("HECKS_RATE_LIMIT_SUBSCRIBE", "1"),
+            ("HECKS_RATE_LIMIT_REGISTER", "2"),
+        ]))
+        .await;
         assert_eq!(post(addr, SUBSCRIBE, None, "{}").await.status(), 200);
         assert_eq!(post(addr, SUBSCRIBE, None, "{}").await.status(), 429);
 
-        assert_eq!(post(addr, "/registrations", None, "{}").await.status(), 200, "subscribe being spent leaves register alone");
+        assert_eq!(
+            post(addr, "/registrations", None, "{}").await.status(),
+            200,
+            "subscribe being spent leaves register alone"
+        );
         assert_eq!(post(addr, "/registrations", None, "{}").await.status(), 200);
         assert_eq!(post(addr, "/registrations", None, "{}").await.status(), 429);
     }
 
     #[tokio::test]
     async fn reads_and_other_routes_are_never_limited() {
-        let addr = gated_server(limits_from(&[("HECKS_RATE_LIMIT_SUBSCRIBE", "1"), ("HECKS_RATE_LIMIT_REGISTER", "1")])).await;
+        let addr = gated_server(limits_from(&[
+            ("HECKS_RATE_LIMIT_SUBSCRIBE", "1"),
+            ("HECKS_RATE_LIMIT_REGISTER", "1"),
+        ]))
+        .await;
         let client = reqwest::Client::new();
         for _ in 0..5 {
-            assert_eq!(client.get(format!("http://{addr}{SUBSCRIBE}")).send().await.unwrap().status(), 200);
-            assert_eq!(client.get(format!("http://{addr}/registrations/REG-1")).send().await.unwrap().status(), 200);
-            assert_eq!(post(addr, "/webhooks/stripe", None, "{}").await.status(), 200);
+            assert_eq!(
+                client
+                    .get(format!("http://{addr}{SUBSCRIBE}"))
+                    .send()
+                    .await
+                    .unwrap()
+                    .status(),
+                200
+            );
+            assert_eq!(
+                client
+                    .get(format!("http://{addr}/registrations/REG-1"))
+                    .send()
+                    .await
+                    .unwrap()
+                    .status(),
+                200
+            );
+            assert_eq!(
+                post(addr, "/webhooks/stripe", None, "{}").await.status(),
+                200
+            );
             assert_eq!(post(addr, "/members", None, "{}").await.status(), 200);
         }
     }
@@ -567,18 +898,46 @@ mod tests {
         // The test client is the peer at 127.0.0.1 and nothing trusts it, so every header is
         // typed by the caller and the count stays with the connection.
         let addr = gated_server(limits_from(&[("HECKS_RATE_LIMIT_SUBSCRIBE", "1")])).await;
-        assert_eq!(post(addr, SUBSCRIBE, Some("1.1.1.1"), "{}").await.status(), 200);
+        assert_eq!(
+            post(addr, SUBSCRIBE, Some("1.1.1.1"), "{}").await.status(),
+            200
+        );
         for spoof in ["2.2.2.2", "3.3.3.3", "4.4.4.4, 5.5.5.5"] {
-            assert_eq!(post(addr, SUBSCRIBE, Some(spoof), "{}").await.status(), 429, "{spoof}");
+            assert_eq!(
+                post(addr, SUBSCRIBE, Some(spoof), "{}").await.status(),
+                429,
+                "{spoof}"
+            );
         }
     }
 
     #[tokio::test]
     async fn behind_a_trusted_proxy_each_visitor_has_their_own_allowance() {
-        let addr = gated_server(limits_from(&[("HECKS_RATE_LIMIT_SUBSCRIBE", "1"), ("HECKS_TRUSTED_PROXIES", "127.0.0.1")])).await;
-        assert_eq!(post(addr, SUBSCRIBE, Some("1.1.1.1, 203.0.113.7"), "{}").await.status(), 200);
-        assert_eq!(post(addr, SUBSCRIBE, Some("2.2.2.2, 203.0.113.7"), "{}").await.status(), 429, "same visitor, new typed entry");
-        assert_eq!(post(addr, SUBSCRIBE, Some("2.2.2.2, 198.51.100.4"), "{}").await.status(), 200, "a different visitor");
+        let addr = gated_server(limits_from(&[
+            ("HECKS_RATE_LIMIT_SUBSCRIBE", "1"),
+            ("HECKS_TRUSTED_PROXIES", "127.0.0.1"),
+        ]))
+        .await;
+        assert_eq!(
+            post(addr, SUBSCRIBE, Some("1.1.1.1, 203.0.113.7"), "{}")
+                .await
+                .status(),
+            200
+        );
+        assert_eq!(
+            post(addr, SUBSCRIBE, Some("2.2.2.2, 203.0.113.7"), "{}")
+                .await
+                .status(),
+            429,
+            "same visitor, new typed entry"
+        );
+        assert_eq!(
+            post(addr, SUBSCRIBE, Some("2.2.2.2, 198.51.100.4"), "{}")
+                .await
+                .status(),
+            200,
+            "a different visitor"
+        );
     }
 
     #[tokio::test]
@@ -587,7 +946,11 @@ mod tests {
         let envelope = r#"{"requestContext":{"http":{"method":"POST"}},"rawPath":"/registrations","body":"{}"}"#;
         assert_eq!(post(addr, "/anything", None, envelope).await.status(), 200);
         assert_eq!(post(addr, "/anything", None, envelope).await.status(), 429);
-        assert_eq!(post(addr, "/registrations", None, "{}").await.status(), 429, "the same budget as the real path");
+        assert_eq!(
+            post(addr, "/registrations", None, "{}").await.status(),
+            429,
+            "the same budget as the real path"
+        );
     }
 
     #[tokio::test]
@@ -601,7 +964,11 @@ mod tests {
 
     #[tokio::test]
     async fn turning_the_limits_off_lets_every_request_through() {
-        let addr = gated_server(limits_from(&[("HECKS_RATE_LIMIT", "off"), ("HECKS_RATE_LIMIT_SUBSCRIBE", "1")])).await;
+        let addr = gated_server(limits_from(&[
+            ("HECKS_RATE_LIMIT", "off"),
+            ("HECKS_RATE_LIMIT_SUBSCRIBE", "1"),
+        ]))
+        .await;
         for _ in 0..10 {
             assert_eq!(post(addr, SUBSCRIBE, None, "{}").await.status(), 200);
         }
@@ -611,16 +978,28 @@ mod tests {
     // checkout fixture's wasm, so the first request is a real compile.
     async fn fixture_host(database: &str, copy_name: &str) -> (SocketAddr, Arc<PathBuf>) {
         let client = crate::dispatch::tests::scratch_db(database).await;
-        crate::dispatch::tests::provision_lineage(&*client.lock().await, "CheckoutFixture", 1, &["Event"]).await;
+        crate::dispatch::tests::provision_lineage(
+            &*client.lock().await,
+            "CheckoutFixture",
+            1,
+            &["Event"],
+        )
+        .await;
         let wasm_path = Arc::new(crate::wasm_runner::tests::cold_copy_of_fixture(copy_name));
         let state = ServerState {
             client: Arc::new(client),
             wasm_path: Arc::clone(&wasm_path),
-            lineage_config: Arc::new(LineageConfig { domain: "CheckoutFixture".to_string(), era: Some(1), mirrored: None }),
+            lineage_config: Arc::new(LineageConfig {
+                domain: "CheckoutFixture".to_string(),
+                era: Some(1),
+                mirrored: None,
+            }),
             invoker: Arc::new(crate::lambda_client::NeverInvoker),
             limits: limits_from(&[]),
         };
-        let listener = tokio::net::TcpListener::bind(("127.0.0.1", 0)).await.unwrap();
+        let listener = tokio::net::TcpListener::bind(("127.0.0.1", 0))
+            .await
+            .unwrap();
         let addr = listener.local_addr().unwrap();
         tokio::spawn(async move { serve_on(listener, state, sample_version()).await });
         (addr, wasm_path)
@@ -631,7 +1010,12 @@ mod tests {
         let requests: Vec<_> = (0..burst)
             .map(|_| {
                 tokio::spawn(async move {
-                    let response = reqwest::Client::new().post(format!("http://{addr}/dispatch")).body(r#"{"read": true}"#).send().await.unwrap();
+                    let response = reqwest::Client::new()
+                        .post(format!("http://{addr}/dispatch"))
+                        .body(r#"{"read": true}"#)
+                        .send()
+                        .await
+                        .unwrap();
                     let status = StatusCode::from_u16(response.status().as_u16()).unwrap();
                     (status, response.json::<Value>().await.unwrap())
                 })
@@ -639,7 +1023,12 @@ mod tests {
             .collect();
         let mut answers = Vec::new();
         for request in requests {
-            answers.push(tokio::time::timeout(std::time::Duration::from_secs(120), request).await.expect("a read was never answered").unwrap());
+            answers.push(
+                tokio::time::timeout(std::time::Duration::from_secs(120), request)
+                    .await
+                    .expect("a read was never answered")
+                    .unwrap(),
+            );
         }
         answers
     }
@@ -665,7 +1054,63 @@ mod tests {
         let answers = read_burst(addr, 1).await;
         assert_eq!(answers[0].0, StatusCode::OK, "{}", answers[0].1);
         assert_eq!(crate::wasm_runner::compile_count(&wasm_path), 1);
-        assert!(started.elapsed() < std::time::Duration::from_secs(1), "a warmed read took {:?}", started.elapsed());
+        assert!(
+            started.elapsed() < std::time::Duration::from_secs(1),
+            "a warmed read took {:?}",
+            started.elapsed()
+        );
+    }
+
+    // The checkout fixture's `Event`: `slug`, `name` and `capacity` hold one `value` field and
+    // `price` one `cents` field, so each answers as a bare scalar when asked to.
+    #[tokio::test]
+    async fn a_bare_body_answers_single_field_value_objects_bare_and_the_default_stays_wrapped() {
+        let client = crate::dispatch::tests::scratch_db("rust_host_serve_bare").await;
+        crate::dispatch::tests::provision_lineage(
+            &*client.lock().await,
+            "CheckoutFixture",
+            1,
+            &["Event"],
+        )
+        .await;
+        let config = LineageConfig {
+            domain: "CheckoutFixture".to_string(),
+            era: Some(1),
+            mirrored: None,
+        };
+        let wasm = PathBuf::from(env!("CARGO_MANIFEST_DIR")).join("../dist/checkout_fixture.wasm");
+        let host = Host::new(&client, &wasm, &config, &crate::lambda_client::NeverInvoker);
+        let schedule = serde_json::json!({
+            "verb": "CheckoutFixture::Event.Schedule",
+            "role": "Organizer",
+            "with": {"slug": "intro", "name": "Intro", "price": 1500, "capacity": 10},
+            "bare": true,
+        });
+
+        let scheduled = dispatch_body(schedule, host).await.unwrap();
+        let wrapped = dispatch_body(serde_json::json!({"read": true}), host)
+            .await
+            .unwrap();
+        let bare = dispatch_body(serde_json::json!({"read": true, "bare": true}), host)
+            .await
+            .unwrap();
+
+        let event = "CheckoutFixture::Event#intro";
+        assert_eq!(
+            scheduled["instances"][event]["name"], "Intro",
+            "{scheduled}"
+        );
+        assert_eq!(
+            scheduled["events"][0]["payload"]["price"], 1500,
+            "{scheduled}"
+        );
+        assert_eq!(
+            wrapped["instances"][event]["name"],
+            serde_json::json!({"value": "Intro"}),
+            "{wrapped}"
+        );
+        assert_eq!(bare["instances"][event]["price"], 1500, "{bare}");
+        assert_eq!(bare["instances"][event]["capacity"], 10, "{bare}");
     }
 
     #[test]
@@ -675,8 +1120,14 @@ mod tests {
 
     #[test]
     fn build_falls_back_to_the_crate_version_when_unset_or_empty() {
-        assert_eq!(version_body("e", "h", None)["build"], env!("CARGO_PKG_VERSION"));
-        assert_eq!(version_body("e", "h", Some(""))["build"], env!("CARGO_PKG_VERSION"));
+        assert_eq!(
+            version_body("e", "h", None)["build"],
+            env!("CARGO_PKG_VERSION")
+        );
+        assert_eq!(
+            version_body("e", "h", Some(""))["build"],
+            env!("CARGO_PKG_VERSION")
+        );
     }
 }