1 files changed, 36 insertions, 18 deletions

diff --git a/crates/chat-server/src/main.rs b/crates/chat-server/src/main.rs
index 6c7f4e1..cfd3e7a 100644
--- a/crates/chat-server/src/main.rs
+++ b/crates/chat-server/src/main.rs
@@ -16,6 +16,7 @@
 #![doc = "Local experimental chat server with ciphertext-only durable storage."]
 
 mod http;
+mod maintenance;
 mod service;
 mod store;
 
@@ -31,10 +32,18 @@ use std::process::ExitCode;
 struct Arguments {
     #[arg(long, default_value = ".")]
     root: PathBuf,
-    #[arg(long, default_value = "127.0.0.1:9080")]
-    bind: SocketAddr,
     #[arg(long)]
+    bind: Option<SocketAddr>,
+    #[arg(long, conflicts_with_all = ["reset_owner", "owner_fingerprint", "snapshot"])]
     init: bool,
+    #[arg(long, value_name = "FINGERPRINT", conflicts_with_all = ["owner_fingerprint", "snapshot"], help = "Permanently clear the matching owner registration and all chat history after key loss")]
+    reset_owner: Option<String>,
+    #[arg(
+        long,
+        conflicts_with = "snapshot",
+        help = "Print the registered owner's public fingerprint"
+    )]
+    owner_fingerprint: bool,
     #[arg(long)]
     snapshot: Option<PathBuf>,
 }
@@ -64,7 +73,7 @@ fn initialize(root: &std::path::Path) -> Result<()> {
     {
         writeln!(file, "CHAT_ORIGIN=http://127.0.0.1:9080")?;
     }
-    Ok(())
+    stack_config::initialize_public(root)
 }
 
 async fn run(arguments: Arguments) -> Result<()> {
@@ -72,15 +81,28 @@ async fn run(arguments: Arguments) -> Result<()> {
     if arguments.init {
         return initialize(&root);
     }
+    let configuration = stack_config::Config::load(&root)?;
+    let bind = arguments.bind.unwrap_or(configuration.chat_bind()?);
     let data = root.join("var/data/chat");
     std::fs::create_dir_all(&data)?;
     std::fs::set_permissions(&data, std::os::unix::fs::PermissionsExt::from_mode(0o700))?;
     let database = data.join("chat.sqlite");
-    let store = store::Store::open(&database)?;
+    let _server_lock = if arguments.snapshot.is_none() && !arguments.owner_fingerprint {
+        Some(maintenance::lock(&data)?)
+    } else {
+        None
+    };
+    let mut store = store::Store::open(&database)?;
     std::fs::set_permissions(
         &database,
         std::os::unix::fs::PermissionsExt::from_mode(0o600),
     )?;
+    if arguments.owner_fingerprint {
+        return maintenance::fingerprint(&store);
+    }
+    if let Some(expected) = arguments.reset_owner {
+        return maintenance::reset(&mut store, &expected, bind);
+    }
     if let Some(destination) = arguments.snapshot {
         store.snapshot(&destination)?;
         std::fs::set_permissions(
@@ -90,28 +112,24 @@ async fn run(arguments: Arguments) -> Result<()> {
         return Ok(());
     }
     ensure!(
-        arguments.bind.ip().is_loopback(),
+        bind.ip().is_loopback(),
         "Experimental server must bind to loopback"
     );
-    let settings = dotenvy::from_path_iter(root.join(".env"))?
-        .collect::<std::result::Result<std::collections::HashMap<_, _>, _>>()?;
-    let origin = settings
-        .get("CHAT_ORIGIN")
-        .context("Run --init to configure chat")?;
+    let origin = configuration.value("CHAT_ORIGIN")?;
     ensure!(
-        origin == &format!("http://{}", arguments.bind),
-        "This development server requires CHAT_ORIGIN to match its loopback bind address"
+        origin == format!("http://{bind}"),
+        "CHAT_ORIGIN must match the loopback CHAT_BIND or --bind address"
     );
-    let setup = settings
-        .get("CHAT_SETUP_TOKEN")
-        .context("Missing CHAT_SETUP_TOKEN")?;
-    let state = service::Service::new(store, origin.clone(), setup.clone());
-    let listener = tokio::net::TcpListener::bind(arguments.bind).await?;
+    let setup = configuration
+        .value("CHAT_SETUP_TOKEN")
+        .context("Run --init to configure chat")?;
+    let state = service::Service::new(store, origin.to_owned(), setup.to_owned());
+    let listener = tokio::net::TcpListener::bind(bind).await?;
     writeln!(
         std::io::stdout().lock(),
         "Experimental chat: {origin} (owner setup: /#setup)"
     )?;
-    http::serve(listener, state, &root).await
+    http::serve(listener, state, &root, configuration.public_values(None)?).await
 }
 
 #[tokio::main]