solid_pod_rs/config/

sources.rs

//! Config source precedence + merge logic.
//!
//! # JSS env var mapping (canonical `JSS_*` prefix)
//!
//! The loader honours the following env vars 1:1 with their JSS
//! semantics. Where a var is listed with `[TODO verify JSS]` it means
//! solid-pod-rs introduces it to parity a Rust-side primitive that JSS
//! handles implicitly or not at all.
//!
//! | Env var | Maps to | JSS source |
//! |---|---|---|
//! | `JSS_HOST` | `server.host` | `config.js:98` |
//! | `JSS_PORT` | `server.port` | `config.js:97` |
//! | `JSS_BASE_URL` | `server.base_url` | `config.js:*` (bin/jss.js) |
//! | `JSS_ROOT` | `storage.Fs{root}` (fs kind only) | `config.js:99` |
//! | `JSS_STORAGE_TYPE` | `storage.type` (`fs`/`memory`) | JSS uses storage adapters via `config.json`; env wrapper added here for CLI parity |
//! | `JSS_STORAGE_ROOT` | `storage.Fs{root}` | alias for `JSS_ROOT` restricted to fs backend |
//! | `JSS_OIDC_ENABLED` | `auth.oidc_enabled` | JSS uses `JSS_IDP` (config.js:107); `JSS_IDP` accepted as alias |
//! | `JSS_IDP` | `auth.oidc_enabled` (alias of `JSS_OIDC_ENABLED`) | `config.js:107` |
//! | `JSS_OIDC_ISSUER` | `auth.oidc_issuer` | JSS `JSS_IDP_ISSUER` (config.js:108); `JSS_IDP_ISSUER` accepted as alias |
//! | `JSS_IDP_ISSUER` | `auth.oidc_issuer` (alias) | `config.js:108` |
//! | `JSS_DPOP_REPLAY_TTL_SECONDS` | `auth.dpop_replay_ttl_seconds` | `[TODO verify JSS]` — Rust-side DPoP cache tuning |
//! | `JSS_NOTIFICATIONS_WS2023` | `notifications.ws2023_enabled` | subset of JSS `JSS_NOTIFICATIONS` (config.js:104) |
//! | `JSS_NOTIFICATIONS_WEBHOOK` | `notifications.webhook2023_enabled` | subset of JSS `JSS_NOTIFICATIONS` |
//! | `JSS_NOTIFICATIONS_LEGACY` | `notifications.legacy_solid_01_enabled` | subset of JSS `JSS_NOTIFICATIONS` |
//! | `JSS_NOTIFICATIONS` | toggles **all three** notification channels on/off | `config.js:104` (coarse master switch) |
//! | `JSS_SSRF_ALLOW_PRIVATE` | `security.ssrf_allow_private` | `[TODO verify JSS]` — F1 security primitive |
//! | `JSS_SSRF_ALLOWLIST` | `security.ssrf_allowlist` (comma-separated) | `[TODO verify JSS]` |
//! | `JSS_SSRF_DENYLIST` | `security.ssrf_denylist` (comma-separated) | `[TODO verify JSS]` |
//! | `JSS_DOTFILE_ALLOWLIST` | `security.dotfile_allowlist` (comma-separated) | `[TODO verify JSS]` |
//! | `JSS_ACL_ORIGIN_ENABLED` | `security.acl_origin_enabled` | `[TODO verify JSS]` — F4 primitive |
//!
//! Unknown `JSS_*` vars are **ignored silently** at the sources layer
//! (warnings are a loader-level concern, see
//! [`crate::config::loader::ConfigLoader`]). This supports forward
//! compat with newer JSS releases.
//!
//! # Precedence
//!
//! ```text
//! Defaults  <  File  <  EnvVars
//! (lowest)                (highest)
//! ```
//!
//! Later sources overwrite earlier ones, matching JSS's
//! `{...defaults, ...fileConfig, ...envConfig}` model
//! (`config.js:219-224`). CLI overlay (if added later) would sit above
//! env vars.

use std::path::{Path, PathBuf};

use serde_json::{Map, Value};

use crate::config::schema::ServerConfig;
use crate::error::PodError;

// ---------------------------------------------------------------------------
// ConfigSource
// ---------------------------------------------------------------------------

/// One layer of the precedence stack.
#[derive(Debug, Clone)]
pub enum ConfigSource {
    /// Hard-coded defaults (always first).
    Defaults,

    /// Config file at the given path. Format auto-detected from the
    /// extension: `.json`, `.yaml`/`.yml`, `.toml` (YAML/TOML require
    /// the `config-loader` feature). Missing / malformed is a hard
    /// error; unknown fields are tolerated.
    File(PathBuf),

    /// Read `JSS_*` env vars from `std::env`.
    EnvVars,

    /// Sprint 11 (row 121): highest-precedence CLI overlay, carried as
    /// a pre-built JSON value so the loader can deep-merge it without
    /// caring about the CLI parser.
    CliOverlay(Value),
}

// ---------------------------------------------------------------------------
// Resolution / merging
// ---------------------------------------------------------------------------

/// Resolve a source into a JSON value tree.
///
/// The returned value is a `serde_json::Value::Object` that is merged
/// into the accumulator by [`merge_json`] in precedence order.
pub(crate) fn resolve_source(source: &ConfigSource) -> Result<Value, PodError> {
    match source {
        ConfigSource::Defaults => {
            // Serialise the Default impl; this gives us the same
            // structure as a file-sourced config for easy merging.
            let cfg = ServerConfig::default();
            serde_json::to_value(&cfg).map_err(PodError::Json)
        }

        ConfigSource::File(path) => load_file(path),

        ConfigSource::EnvVars => Ok(load_env()),

        ConfigSource::CliOverlay(v) => Ok(v.clone()),
    }
}

fn load_file(path: &Path) -> Result<Value, PodError> {
    let content = std::fs::read_to_string(path)
        .map_err(|e| PodError::Backend(format!("config file {path:?}: {e}")))?;

    // Auto-detect format from extension. Unknown extensions fall back to
    // JSON, preserving the Sprint-4 behaviour.
    let ext = path
        .extension()
        .and_then(|e| e.to_str())
        .map(|s| s.to_ascii_lowercase());

    let v: Value = match ext.as_deref() {
        #[cfg(feature = "config-loader")]
        Some("yaml") | Some("yml") => serde_norway::from_str(&content).map_err(|e| {
            PodError::Backend(format!("config file {path:?} is not valid YAML: {e}"))
        })?,

        #[cfg(feature = "config-loader")]
        Some("toml") => {
            let toml_v: toml::Value = toml::from_str(&content).map_err(|e| {
                PodError::Backend(format!("config file {path:?} is not valid TOML: {e}"))
            })?;
            // Convert toml::Value -> serde_json::Value via serde round-trip.
            serde_json::to_value(toml_v).map_err(PodError::Json)?
        }

        // Default / JSON extension / config-loader off: try JSON.
        _ => serde_json::from_str(&content).map_err(|e| {
            PodError::Backend(format!("config file {path:?} is not valid JSON: {e}"))
        })?,
    };

    if !v.is_object() {
        return Err(PodError::Backend(format!(
            "config file {path:?}: top-level must be an object, got {}",
            type_name(&v)
        )));
    }

    // JSS accepts a flat config.json (host/port at root). Normalise
    // both flat and nested shapes into the nested ServerConfig
    // structure that ServerConfig expects.
    Ok(normalise_file_shape(v))
}

/// Translate a JSS-style flat `config.json` into solid-pod-rs's nested
/// shape. A nested config passes through untouched.
///
/// JSS flat:
/// ```json
/// { "host": "0.0.0.0", "port": 3000, "storage": { "type": "fs", "root": "./data" } }
/// ```
///
/// Nested (solid-pod-rs native):
/// ```json
/// { "server": { "host": "…", "port": 3000 }, "storage": {…} }
/// ```
fn normalise_file_shape(v: Value) -> Value {
    let obj = match v {
        Value::Object(m) => m,
        other => return other,
    };

    // If a `server` key already exists, assume nested shape — pass through.
    if obj.contains_key("server") {
        return Value::Object(obj);
    }

    let mut out = Map::new();
    let mut server = Map::new();
    let mut remaining = Map::new();

    for (k, v) in obj {
        match k.as_str() {
            "host" | "port" | "base_url" | "baseUrl" => {
                // camelCase → snake_case for baseUrl
                let key = if k == "baseUrl" {
                    "base_url".to_string()
                } else {
                    k
                };
                server.insert(key, v);
            }
            _ => {
                remaining.insert(k, v);
            }
        }
    }

    if !server.is_empty() {
        out.insert("server".to_string(), Value::Object(server));
    }
    for (k, v) in remaining {
        out.insert(k, v);
    }

    Value::Object(out)
}

// ---------------------------------------------------------------------------
// Env var loading
// ---------------------------------------------------------------------------

/// Read the known `JSS_*` env vars and build a sparse JSON object
/// reflecting whichever were set.
///
/// Unknown `JSS_*` vars are ignored (warnings happen at the loader
/// level if requested).
fn load_env() -> Value {
    env_from(|k| std::env::var(k).ok())
}

/// Test-friendly variant that reads env via a closure.
pub(crate) fn env_from<F>(mut get: F) -> Value
where
    F: FnMut(&str) -> Option<String>,
{
    let mut out = Map::new();
    let mut server = Map::new();
    let mut storage = Map::new();
    let mut auth = Map::new();
    let mut notifications = Map::new();
    let mut security = Map::new();

    // --- server.*
    if let Some(v) = get("JSS_HOST") {
        server.insert("host".into(), Value::String(v));
    }
    if let Some(v) = get("JSS_PORT") {
        if let Ok(n) = v.parse::<u16>() {
            server.insert("port".into(), Value::Number(n.into()));
        }
    }
    if let Some(v) = get("JSS_BASE_URL") {
        server.insert("base_url".into(), Value::String(v));
    }

    // --- storage.*
    //
    // Precedence inside storage: JSS_STORAGE_TYPE > (JSS_STORAGE_ROOT | JSS_ROOT)
    // A bare JSS_ROOT implies fs backend.
    let storage_type = get("JSS_STORAGE_TYPE").map(|s| s.to_ascii_lowercase());
    let storage_root = get("JSS_STORAGE_ROOT").or_else(|| get("JSS_ROOT"));

    match storage_type.as_deref() {
        Some("memory") => {
            storage.insert("type".into(), Value::String("memory".into()));
            // JSS_STORAGE_ROOT=... while JSS_STORAGE_TYPE=memory is
            // nonsensical; loader emits a warning. Here we honour
            // memory and drop root.
        }
        Some("fs") | None if storage_root.is_some() => {
            storage.insert("type".into(), Value::String("fs".into()));
            if let Some(v) = storage_root {
                storage.insert("root".into(), Value::String(v));
            }
        }
        Some("fs") => {
            storage.insert("type".into(), Value::String("fs".into()));
        }
        Some(other) => {
            // Preserve unsupported values so tagged-enum deserialisation fails
            // clearly instead of silently falling back to filesystem storage.
            storage.insert("type".into(), Value::String(other.to_string()));
        }
        None => {}
    }

    // --- auth.*
    if let Some(v) = get("JSS_OIDC_ENABLED").or_else(|| get("JSS_IDP")) {
        if let Some(b) = parse_bool(&v) {
            auth.insert("oidc_enabled".into(), Value::Bool(b));
        }
    }
    if let Some(v) = get("JSS_OIDC_ISSUER").or_else(|| get("JSS_IDP_ISSUER")) {
        auth.insert("oidc_issuer".into(), Value::String(v));
    }
    if let Some(v) = get("JSS_NIP98_ENABLED") {
        if let Some(b) = parse_bool(&v) {
            auth.insert("nip98_enabled".into(), Value::Bool(b));
        }
    }
    if let Some(v) = get("JSS_DPOP_REPLAY_TTL_SECONDS") {
        if let Ok(n) = v.parse::<u64>() {
            auth.insert("dpop_replay_ttl_seconds".into(), Value::Number(n.into()));
        }
    }

    // --- notifications.*
    // Coarse master switch — drives all three sub-toggles if individual
    // toggles aren't set.
    let master = get("JSS_NOTIFICATIONS").and_then(|v| parse_bool(&v));

    let ws = get("JSS_NOTIFICATIONS_WS2023")
        .and_then(|v| parse_bool(&v))
        .or(master);
    let webhook = get("JSS_NOTIFICATIONS_WEBHOOK")
        .and_then(|v| parse_bool(&v))
        .or(master);
    let legacy = get("JSS_NOTIFICATIONS_LEGACY")
        .and_then(|v| parse_bool(&v))
        .or(master);

    if let Some(b) = ws {
        notifications.insert("ws2023_enabled".into(), Value::Bool(b));
    }
    if let Some(b) = webhook {
        notifications.insert("webhook2023_enabled".into(), Value::Bool(b));
    }
    if let Some(b) = legacy {
        notifications.insert("legacy_solid_01_enabled".into(), Value::Bool(b));
    }

    // --- security.*
    if let Some(v) = get("JSS_SSRF_ALLOW_PRIVATE") {
        if let Some(b) = parse_bool(&v) {
            security.insert("ssrf_allow_private".into(), Value::Bool(b));
        }
    }
    if let Some(v) = get("JSS_SSRF_ALLOWLIST") {
        security.insert("ssrf_allowlist".into(), parse_csv(&v));
    }
    if let Some(v) = get("JSS_SSRF_DENYLIST") {
        security.insert("ssrf_denylist".into(), parse_csv(&v));
    }
    if let Some(v) = get("JSS_DOTFILE_ALLOWLIST") {
        security.insert("dotfile_allowlist".into(), parse_csv(&v));
    }
    if let Some(v) = get("JSS_ACL_ORIGIN_ENABLED") {
        if let Some(b) = parse_bool(&v) {
            security.insert("acl_origin_enabled".into(), Value::Bool(b));
        }
    }

    // Sprint 7: JSS_DEFAULT_QUOTA decoded via parse_size (`50MB`, `1.5GB`).
    // Surfaces under `security.default_quota_bytes` when valid;
    // malformed values are ignored (forward-compat with unknown units).
    if let Some(v) = get("JSS_DEFAULT_QUOTA").or_else(|| get("JSS_QUOTA_DEFAULT_BYTES")) {
        if let Ok(bytes) = parse_size(&v) {
            security.insert("default_quota_bytes".into(), Value::Number(bytes.into()));
        }
    }

    // Sprint 11 (row 120-124): JSS parity knobs that surface under the
    // forward-compat / operator-facing extras. Malformed values ignored
    // where parsing applies, same forward-compat rule as above.
    //
    // These vars do not yet have dedicated serde fields on
    // `ServerConfig` — they are stored under `extras.*` so operator
    // scripts can set them today and call sites can consult the loaded
    // tree via `ServerConfig::extras()` once wired. Keeping the env
    // map complete means a binary restart with new flags Just Works.
    let mut extras = Map::new();

    if let Some(v) = get("JSS_CONNEG") {
        if let Some(b) = parse_bool(&v) {
            extras.insert("conneg_enabled".into(), Value::Bool(b));
        }
    }
    if let Some(v) = get("JSS_CORS_ALLOWED_ORIGINS") {
        extras.insert("cors_allowed_origins".into(), parse_csv(&v));
    }
    if let Some(v) = get("JSS_MAX_BODY_SIZE").or_else(|| get("JSS_MAX_REQUEST_BODY")) {
        if let Ok(bytes) = parse_size(&v) {
            extras.insert("max_body_size_bytes".into(), Value::Number(bytes.into()));
        }
    }
    if let Some(v) = get("JSS_MAX_ACL_BYTES") {
        if let Ok(bytes) = parse_size(&v) {
            extras.insert("max_acl_bytes".into(), Value::Number(bytes.into()));
        }
    }
    if let Some(v) = get("JSS_RATE_LIMIT_WRITES_PER_MIN") {
        if let Ok(n) = v.parse::<u64>() {
            extras.insert("rate_limit_writes_per_min".into(), Value::Number(n.into()));
        }
    }
    if let Some(v) = get("JSS_SUBDOMAINS") {
        if let Some(b) = parse_bool(&v) {
            extras.insert("subdomains_enabled".into(), Value::Bool(b));
        }
    }
    if let Some(v) = get("JSS_BASE_DOMAIN") {
        extras.insert("base_domain".into(), Value::String(v));
    }
    if let Some(v) = get("JSS_IDP_ENABLED") {
        if let Some(b) = parse_bool(&v) {
            extras.insert("idp_enabled".into(), Value::Bool(b));
        }
    }
    if let Some(v) = get("JSS_INVITE_ONLY") {
        if let Some(b) = parse_bool(&v) {
            extras.insert("invite_only".into(), Value::Bool(b));
        }
    }
    if let Some(v) = get("JSS_ADMIN_KEY") {
        extras.insert("admin_key".into(), Value::String(v));
    }
    for (var, key) in [
        ("JSS_ACTIVITYPUB", "activitypub_enabled"),
        ("JSS_TRUST_PROXY", "trust_proxy"),
    ] {
        if let Some(b) = get(var).and_then(|v| parse_bool(&v)) {
            extras.insert(key.into(), Value::Bool(b));
        }
    }
    for (var, key) in [
        ("JSS_AP_USERNAME", "ap_username"),
        ("JSS_AP_DISPLAY_NAME", "ap_display_name"),
        ("JSS_AP_SUMMARY", "ap_summary"),
        ("JSS_AP_NOSTR_PUBKEY", "ap_nostr_pubkey"),
    ] {
        if let Some(v) = get(var) {
            extras.insert(key.into(), Value::String(v));
        }
    }
    if let Some(v) = get("JSS_DID_NOSTR_ORIGINS") {
        extras.insert("did_nostr_origins".into(), parse_csv(&v));
    }

    if !server.is_empty() {
        out.insert("server".into(), Value::Object(server));
    }
    if !storage.is_empty() {
        out.insert("storage".into(), Value::Object(storage));
    }
    if !auth.is_empty() {
        out.insert("auth".into(), Value::Object(auth));
    }
    if !notifications.is_empty() {
        out.insert("notifications".into(), Value::Object(notifications));
    }
    if !security.is_empty() {
        out.insert("security".into(), Value::Object(security));
    }
    if !extras.is_empty() {
        out.insert("extras".into(), Value::Object(extras));
    }

    Value::Object(out)
}

/// Parse a human-friendly size string into bytes.
///
/// Accepts a decimal number (optionally with fractional part) followed
/// by an optional suffix. Whitespace around / between the number and
/// suffix is tolerated. Empty suffix (or bare digits) is treated as raw
/// bytes.
///
/// # Multipliers
///
/// Supports **both SI (decimal, 1000-based) and IEC (binary, 1024-based)**
/// suffixes; case-insensitive:
///
/// | Suffix | Multiplier | Family |
/// |--------|-----------|--------|
/// | `B` or bare | 1 | — |
/// | `KB` | 1_000 | SI |
/// | `MB` | 1_000_000 | SI |
/// | `GB` | 1_000_000_000 | SI |
/// | `TB` | 1_000_000_000_000 | SI |
/// | `KiB` | 1_024 | IEC |
/// | `MiB` | 1_024² | IEC |
/// | `GiB` | 1_024³ | IEC |
/// | `TiB` | 1_024⁴ | IEC |
///
/// Sprint 7 tests relied on SI (`1.5GB → 1_500_000_000`). Sprint 11 adds
/// IEC suffixes so operators can mirror JSS's native 1024-based sizing
/// (`50MiB → 50 * 1024 * 1024`). JSS itself accepts only SI-style
/// suffixes (`K/M/G/T`) but multiplies them by 1024 — neither strictly
/// matches. We implement both and let the operator pick.
///
/// # JSS parity: `src/config.js::parseSize`
///
/// ```js
/// const match = str.match(/^(\d+(?:\.\d+)?)\s*(B|KB|MB|GB|TB)?$/i);
/// ```
///
/// Rust mirror: fraction-capable leading number, optional unit, case-
/// insensitive. JSS falls back to `parseInt(str, 10) || 0` on mismatch;
/// we return `Err` instead — callers decide whether to default.
pub fn parse_size(s: &str) -> Result<u64, String> {
    let trimmed = s.trim();
    if trimmed.is_empty() {
        return Err("parse_size: empty input".into());
    }

    // Split number / suffix at the first non-digit / non-dot char.
    let cut = trimmed
        .find(|c: char| !(c.is_ascii_digit() || c == '.'))
        .unwrap_or(trimmed.len());
    let (num_part, suffix_part) = trimmed.split_at(cut);
    let num_part = num_part.trim();
    // Preserve case for `iB` detection, but match lookups case-insensitively.
    let suffix_raw = suffix_part.trim();
    let suffix = suffix_raw.to_ascii_uppercase();

    if num_part.is_empty() {
        return Err(format!("parse_size: missing number in {s:?}"));
    }

    // Reject malformed numerics (multi-dot, leading/trailing dot).
    if num_part.matches('.').count() > 1 || num_part.starts_with('.') || num_part.ends_with('.') {
        return Err(format!("parse_size: invalid number {num_part:?}"));
    }

    let num: f64 = num_part
        .parse()
        .map_err(|e| format!("parse_size: bad number {num_part:?}: {e}"))?;

    if !num.is_finite() || num < 0.0 {
        return Err(format!(
            "parse_size: non-negative finite number required, got {num}"
        ));
    }

    // IEC (binary) suffixes carry the `i` between the prefix and B.
    // Upper-case comparison loses the lowercase `i`, so dispatch via the
    // already-uppercased suffix (which turns `KiB` into `KIB`).
    let multiplier: u64 = match suffix.as_str() {
        "" | "B" => 1,
        // SI (1000-based)
        "KB" => 1_000,
        "MB" => 1_000_000,
        "GB" => 1_000_000_000,
        "TB" => 1_000_000_000_000,
        // IEC (1024-based) — case-insensitive match since we upper-cased.
        "KIB" => 1_024,
        "MIB" => 1_024u64.pow(2),
        "GIB" => 1_024u64.pow(3),
        "TIB" => 1_024u64.pow(4),
        other => return Err(format!("parse_size: unknown suffix {other:?}")),
    };

    // floor(num * multiplier) — match JSS Math.floor behaviour.
    let bytes = (num * multiplier as f64).floor();
    if !bytes.is_finite() || bytes < 0.0 || bytes > u64::MAX as f64 {
        return Err(format!("parse_size: result out of u64 range: {bytes}"));
    }
    Ok(bytes as u64)
}

fn parse_bool(s: &str) -> Option<bool> {
    match s.trim().to_ascii_lowercase().as_str() {
        "1" | "true" | "yes" | "on" => Some(true),
        "0" | "false" | "no" | "off" | "" => Some(false),
        _ => None,
    }
}

fn parse_csv(s: &str) -> Value {
    Value::Array(
        s.split(',')
            .map(|p| p.trim())
            .filter(|p| !p.is_empty())
            .map(|p| Value::String(p.to_string()))
            .collect(),
    )
}

fn type_name(v: &Value) -> &'static str {
    match v {
        Value::Null => "null",
        Value::Bool(_) => "bool",
        Value::Number(_) => "number",
        Value::String(_) => "string",
        Value::Array(_) => "array",
        Value::Object(_) => "object",
    }
}

// ---------------------------------------------------------------------------
// Merge logic
// ---------------------------------------------------------------------------

/// Recursively deep-merge `overlay` into `base`. Objects are merged
/// key-by-key; non-object leaves are replaced wholesale.
///
/// This matches JSS's shallow-spread behaviour at the top level
/// (`{...defaults, ...fileConfig, ...envConfig}` — `config.js:219`)
/// but extends it to nested objects so a partial `server` override
/// doesn't wipe unset siblings.
pub(crate) fn merge_json(base: &mut Value, overlay: Value) {
    match (base, overlay) {
        (Value::Object(b), Value::Object(o)) => {
            for (k, v) in o {
                match b.get_mut(&k) {
                    Some(existing) => merge_json(existing, v),
                    None => {
                        b.insert(k, v);
                    }
                }
            }
        }
        (slot, overlay) => {
            *slot = overlay;
        }
    }
}

// ---------------------------------------------------------------------------
// Tests
// ---------------------------------------------------------------------------

#[cfg(test)]
mod tests {
    use super::*;

    #[test]
    fn merge_nested_objects_preserves_siblings() {
        let mut base = serde_json::json!({
            "server": { "host": "0.0.0.0", "port": 3000 },
            "auth":   { "oidc_enabled": false }
        });
        let overlay = serde_json::json!({
            "server": { "port": 8080 }
        });

        merge_json(&mut base, overlay);

        assert_eq!(base["server"]["host"], "0.0.0.0");
        assert_eq!(base["server"]["port"], 8080);
        assert_eq!(base["auth"]["oidc_enabled"], false);
    }

    #[test]
    fn env_host_port() {
        let v = env_from(|k| match k {
            "JSS_HOST" => Some("127.0.0.1".into()),
            "JSS_PORT" => Some("4242".into()),
            _ => None,
        });
        assert_eq!(v["server"]["host"], "127.0.0.1");
        assert_eq!(v["server"]["port"], 4242);
    }

    #[test]
    fn env_memory_storage_ignores_root() {
        let v = env_from(|k| match k {
            "JSS_STORAGE_TYPE" => Some("memory".into()),
            "JSS_STORAGE_ROOT" => Some("/ignored".into()),
            _ => None,
        });
        assert_eq!(v["storage"]["type"], "memory");
        assert!(v["storage"].get("root").is_none());
    }

    #[test]
    fn env_fs_storage_from_jss_root_alias() {
        let v = env_from(|k| match k {
            "JSS_ROOT" => Some("/pods".into()),
            _ => None,
        });
        assert_eq!(v["storage"]["type"], "fs");
        assert_eq!(v["storage"]["root"], "/pods");
    }

    #[test]
    fn env_unsupported_storage_is_preserved_for_validation_error() {
        let v = env_from(|k| match k {
            "JSS_STORAGE_TYPE" => Some("s3".into()),
            _ => None,
        });
        assert_eq!(v["storage"]["type"], "s3");
        assert!(serde_json::from_value::<super::super::schema::ServerConfig>(v).is_err());
    }

    #[test]
    fn env_csv_parses_to_array() {
        let v = env_from(|k| match k {
            "JSS_SSRF_ALLOWLIST" => Some("10.0.0.0/8, 192.168.1.5".into()),
            _ => None,
        });
        assert_eq!(
            v["security"]["ssrf_allowlist"],
            serde_json::json!(["10.0.0.0/8", "192.168.1.5"])
        );
    }

    #[test]
    fn flat_file_shape_normalised_to_nested() {
        let flat = serde_json::json!({
            "host": "0.0.0.0",
            "port": 3000,
            "baseUrl": "https://example.org",
            "storage": { "type": "fs", "root": "./data" }
        });
        let nested = normalise_file_shape(flat);

        assert_eq!(nested["server"]["host"], "0.0.0.0");
        assert_eq!(nested["server"]["port"], 3000);
        assert_eq!(nested["server"]["base_url"], "https://example.org");
        assert_eq!(nested["storage"]["type"], "fs");
    }

    #[test]
    fn nested_file_shape_passes_through() {
        let nested = serde_json::json!({
            "server": { "host": "0.0.0.0", "port": 3000 }
        });
        let out = normalise_file_shape(nested.clone());
        assert_eq!(out, nested);
    }
}