mirror of
https://github.com/block/buzz.git
synced 2026-10-27 20:41:57 +00:00
## Summary User deletion can now discover current communities from a hex public key or npub, save that inventory, and run it through the existing approval and dummy workflow. `--pubkey demo` remains the default. Execution only prints messages; it does not fence users or delete data. Discovery combines explicit relay memberships with active channel memberships, including users who have no relay membership row. It deduplicates communities and preserves owner relationships. The saved manifest contains only community IDs, labels and relationships. Historical discovery and owned-community execution remain later work. Submission rejects owner inventories atomically with a specific unsupported-execution error; preview still includes owners. This is an expand-schema change after #8520. Migrations 0072–0073 replace the demo-only target check with a bounded identifier check, with 5-second lock and 30-second statement timeouts. The database keeps the user-only entity-type check while allowing different identity formats in the target field. Workflow-specific commands reject entity types they cannot execute. The application currently resolves demo and hex/npub inputs; account-ID lookup is future work. The desired-state constraint matches. No backfill, trigger, function, or foreign key is added. Existing demo rows remain valid. Old binaries fail closed on new manifests; use the new CLI for their approval and execution. Older auto-migrating binaries need the documented rollback procedure. Identity parsing and demo fixture selection stay in intake. Approval and resume use the saved target without reparsing its format. The user workflow defines its stage names and handlers; CLI stage validation reads those rules instead of a separate three-name list. Shared persistence accepts caller-defined stages. Permanent target uniqueness is unchanged. Dummy submissions and execution belong in isolated, disposable development databases; production preview uses read-only access. CLI operator names remain self-asserted. ### Related issue Follows #8520. Searched open PRs; no duplicate inventory change found. #8489 is earlier workflow scaffolding. ### Testing Built `buzz-admin` locally and applied all migrations to a fresh disposable PostgreSQL database. Ran the actual CLI through preview → submit → inspect → approve → `run --next-step` → resume → completed for both demo and a public key with a channel-only membership fixture. Demo completed five stages; the public-key run completed three. Injected `--fail-stage purge_db`, waited for the retry deadline, and resumed the same failed stage successfully. Membership data remained intact. Repeated the CLI workflow on October 26 for demo and an npub backed by a fresh production inventory. Production access used read-only credentials and the real `inventory --pubkey "$SUBJECT"` handler. Copied only the relevant discovery fields into an isolated local PostgreSQL database; local channel parent rows supplied placeholder fields for foreign keys. The inventory saved by local submission exactly matched the production result. All workflow writes stayed local. For each input, ran `submit --pubkey "$SUBJECT" --requested-by local-e2e-submitter`, inspected the saved inventory, and confirmed execution before approval was rejected. Approved its digest, then ran each handler with `run "$REQUEST_ID" --next-step --stage-delay-ms 2500` in a new process. Captured all three workflow tables during and after every stage. Demo completed five stages across two communities; the npub completed three stages for its discovered community. Each handler saved `dummy: true`. Both requests finished with no current stage, no worker lease, and no retries. Copied memberships remained intact. This additional run exercised orderly resume; it did not inject a failure. The reproducible command sequence and fixture setup are in [the inventory walkthrough](docs/operator-user-deletion-inventory.md). Production was not changed. The earlier full-workflow runs used synthetic local fixtures; the additional npub run used captured production discovery fields. Repository-wide `just ci` was not run; validation focused on the affected packages and PostgreSQL workflow. The pre-push desktop build failed with “Too many open files in system.” Stopped the broader hook run and bypassed it to publish the earlier commits; the affected-package Clippy and formatting checks had passed. Generated with Codex --------- Signed-off-by: Ravneet Arora <rarora@squareup.com>
395 lines
14 KiB
Rust
395 lines
14 KiB
Rust
//! Exercise the real CLI with SELECT-only access and no workflow tables.
|
|
|
|
use nostr::ToBech32;
|
|
use serde_json::Value;
|
|
use sqlx::PgPool;
|
|
use tokio::process::Command;
|
|
use url::Url;
|
|
use uuid::Uuid;
|
|
|
|
fn admin_binary() -> std::ffi::OsString {
|
|
// Nextest relocates binaries when extracting an archive. Cargo's build-time
|
|
// path remains the fallback for local cargo test runs.
|
|
std::env::var_os("NEXTEST_BIN_EXE_buzz_admin")
|
|
.unwrap_or_else(|| env!("CARGO_BIN_EXE_buzz-admin").into())
|
|
}
|
|
|
|
#[tokio::test]
|
|
#[ignore = "requires Postgres"]
|
|
async fn cluster_global_inventory_cli_uses_only_existing_membership_tables() {
|
|
let database_url = std::env::var("BUZZ_TEST_DATABASE_URL")
|
|
.or_else(|_| std::env::var("DATABASE_URL"))
|
|
.unwrap();
|
|
let pool = PgPool::connect(&database_url).await.unwrap();
|
|
// All interpolated identifiers are this fixed prefix plus generated hex.
|
|
let name = format!("inventory_{}", Uuid::new_v4().simple());
|
|
let mut tx = pool.begin().await.unwrap();
|
|
sqlx::raw_sql(sqlx::AssertSqlSafe(format!(
|
|
"CREATE SCHEMA {name}; SET LOCAL search_path TO {name}, public;"
|
|
)))
|
|
.execute(&mut *tx)
|
|
.await
|
|
.unwrap();
|
|
// These are existing deployed tables. No entity_deletion_* schema is needed.
|
|
sqlx::raw_sql(include_str!(
|
|
"../../../schema/tables/public/communities.sql"
|
|
))
|
|
.execute(&mut *tx)
|
|
.await
|
|
.unwrap();
|
|
sqlx::raw_sql(include_str!(
|
|
"../../../schema/tables/public/relay_members.sql"
|
|
))
|
|
.execute(&mut *tx)
|
|
.await
|
|
.unwrap();
|
|
for schema in [
|
|
include_str!("../../../schema/tables/public/channels.sql"),
|
|
include_str!("../../../schema/tables/public/channel_members.sql"),
|
|
] {
|
|
sqlx::raw_sql(schema).execute(&mut *tx).await.unwrap();
|
|
}
|
|
let pubkey = "5e4083a7a793d02575876eaf47932b4835999f5af2653d26250a909b450da7c9";
|
|
let community = Uuid::new_v4();
|
|
sqlx::query("INSERT INTO communities (id, host) VALUES ($1, 'inventory-cli.example')")
|
|
.bind(community)
|
|
.execute(&mut *tx)
|
|
.await
|
|
.unwrap();
|
|
sqlx::query("INSERT INTO relay_members (community_id, pubkey, role) VALUES ($1, $2, 'member')")
|
|
.bind(community)
|
|
.bind(pubkey)
|
|
.execute(&mut *tx)
|
|
.await
|
|
.unwrap();
|
|
let participant_community = Uuid::new_v4();
|
|
sqlx::query("INSERT INTO communities (id, host) VALUES ($1, 'channel-only-cli.example')")
|
|
.bind(participant_community)
|
|
.execute(&mut *tx)
|
|
.await
|
|
.unwrap();
|
|
for target in [community, participant_community] {
|
|
for _ in 0..2 {
|
|
let channel = Uuid::new_v4();
|
|
sqlx::query("INSERT INTO channels (community_id, id, name, created_by) VALUES ($1, $2, 'inventory-test', decode($3, 'hex'))")
|
|
.bind(target).bind(channel).bind(pubkey).execute(&mut *tx).await.unwrap();
|
|
sqlx::query("INSERT INTO channel_members (community_id, channel_id, pubkey) VALUES ($1, $2, decode($3, 'hex'))")
|
|
.bind(target).bind(channel).bind(pubkey).execute(&mut *tx).await.unwrap();
|
|
}
|
|
}
|
|
sqlx::raw_sql(sqlx::AssertSqlSafe(format!(
|
|
"CREATE ROLE {name} LOGIN PASSWORD 'inventory-local-fixture'; \
|
|
GRANT USAGE ON SCHEMA {name} TO {name}; \
|
|
GRANT SELECT ON ALL TABLES IN SCHEMA {name} TO {name};"
|
|
)))
|
|
.execute(&mut *tx)
|
|
.await
|
|
.unwrap();
|
|
tx.commit().await.unwrap();
|
|
|
|
let mut reader_url = Url::parse(&database_url).unwrap();
|
|
reader_url.set_username(&name).unwrap();
|
|
reader_url
|
|
.set_password(Some("inventory-local-fixture"))
|
|
.unwrap();
|
|
reader_url
|
|
.query_pairs_mut()
|
|
.append_pair("options", &format!("-csearch_path={name}"));
|
|
let npub = nostr::PublicKey::parse(pubkey)
|
|
.unwrap()
|
|
.to_bech32()
|
|
.unwrap();
|
|
let mut outputs = Vec::new();
|
|
for input in [pubkey, npub.as_str()] {
|
|
outputs.push(
|
|
tokio::time::timeout(
|
|
std::time::Duration::from_secs(15),
|
|
Command::new(admin_binary())
|
|
.args(["user-deletions", "inventory", "--pubkey", input])
|
|
.env("DATABASE_URL", reader_url.as_str())
|
|
.kill_on_drop(true)
|
|
.output(),
|
|
)
|
|
.await
|
|
.unwrap()
|
|
.unwrap(),
|
|
);
|
|
}
|
|
let demo = Command::new(admin_binary())
|
|
.args(["user-deletions", "inventory"])
|
|
.env("DATABASE_URL", reader_url.as_str())
|
|
.kill_on_drop(true)
|
|
.output()
|
|
.await
|
|
.unwrap();
|
|
// Clean cluster-wide role state before asserting the subprocess results.
|
|
sqlx::raw_sql(sqlx::AssertSqlSafe(format!(
|
|
"DROP SCHEMA {name} CASCADE; DROP OWNED BY {name}; DROP ROLE {name};"
|
|
)))
|
|
.execute(&pool)
|
|
.await
|
|
.unwrap();
|
|
let inventories: Vec<Value> = outputs
|
|
.into_iter()
|
|
.map(|output| {
|
|
assert!(
|
|
output.status.success(),
|
|
"{}",
|
|
String::from_utf8_lossy(&output.stderr)
|
|
);
|
|
serde_json::from_slice(&output.stdout).unwrap()
|
|
})
|
|
.collect();
|
|
assert_eq!(inventories[0], inventories[1]);
|
|
assert!(
|
|
demo.status.success(),
|
|
"{}",
|
|
String::from_utf8_lossy(&demo.stderr)
|
|
);
|
|
let demo: Value = serde_json::from_slice(&demo.stdout).unwrap();
|
|
assert_eq!(
|
|
demo,
|
|
serde_json::json!({
|
|
"communities": [
|
|
{"community_id": "00000000-0000-0000-0000-00000000000b", "label": "demo:community-b", "relationship": "participant"},
|
|
{"community_id": "00000000-0000-0000-0000-00000000000c", "label": "demo:community-c", "relationship": "former_participant"}
|
|
]
|
|
})
|
|
);
|
|
let inventory = &inventories[0];
|
|
assert_eq!(inventory.as_object().unwrap().len(), 1);
|
|
assert_eq!(demo.as_object().unwrap().len(), 1);
|
|
let communities = inventory["communities"].as_array().unwrap();
|
|
assert_eq!(communities.len(), 2);
|
|
let explicit_member = communities
|
|
.iter()
|
|
.find(|item| item["community_id"] == community.to_string())
|
|
.unwrap();
|
|
assert_eq!(explicit_member["label"], "inventory-cli.example");
|
|
assert_eq!(explicit_member["relationship"], "participant");
|
|
let participant = communities
|
|
.iter()
|
|
.find(|item| item["community_id"] == participant_community.to_string())
|
|
.unwrap();
|
|
assert_eq!(participant["label"], "channel-only-cli.example");
|
|
assert_eq!(participant["relationship"], "participant");
|
|
for output in [&demo, inventory] {
|
|
for row in output["communities"].as_array().unwrap() {
|
|
assert_eq!(row.as_object().unwrap().len(), 3);
|
|
}
|
|
}
|
|
}
|
|
|
|
#[test]
|
|
fn invalid_inventory_key_fails_before_database_connection() {
|
|
let output = std::process::Command::new(admin_binary())
|
|
.args(["user-deletions", "inventory", "--pubkey", "invalid-npub"])
|
|
.env_remove("DATABASE_URL")
|
|
.output()
|
|
.unwrap();
|
|
assert_eq!(output.status.code(), Some(2));
|
|
assert!(output.stdout.is_empty());
|
|
assert!(String::from_utf8_lossy(&output.stderr)
|
|
.contains("expected a 64-character hex public key or an npub"));
|
|
}
|
|
|
|
async fn workflow_cli(url: &str, args: &[&str], success: bool) -> Value {
|
|
let output = tokio::time::timeout(
|
|
std::time::Duration::from_secs(20),
|
|
Command::new(admin_binary())
|
|
.arg("user-deletions")
|
|
.args(args)
|
|
.env("DATABASE_URL", url)
|
|
.env("BUZZ_DB_POOL_SIZE", "1")
|
|
.kill_on_drop(true)
|
|
.output(),
|
|
)
|
|
.await
|
|
.unwrap()
|
|
.unwrap();
|
|
assert_eq!(
|
|
output.status.success(),
|
|
success,
|
|
"{args:?}: {}",
|
|
String::from_utf8_lossy(&output.stderr)
|
|
);
|
|
if success {
|
|
serde_json::from_slice(&output.stdout).unwrap()
|
|
} else {
|
|
Value::Null
|
|
}
|
|
}
|
|
|
|
#[tokio::test]
|
|
#[ignore = "requires Postgres"]
|
|
async fn inventory_submission_runs_demo_and_public_key_workflows_end_to_end() {
|
|
let url = std::env::var("BUZZ_TEST_DATABASE_URL").unwrap();
|
|
let pool = PgPool::connect(&url).await.unwrap();
|
|
let key = "ab".repeat(32);
|
|
let npub = nostr::PublicKey::parse(&key).unwrap().to_bech32().unwrap();
|
|
let community = Uuid::new_v4();
|
|
let channel = Uuid::new_v4();
|
|
sqlx::query("INSERT INTO communities (id, host) VALUES ($1, 'workflow-fixture.example')")
|
|
.bind(community)
|
|
.execute(&pool)
|
|
.await
|
|
.unwrap();
|
|
sqlx::query("INSERT INTO channels (community_id, id, name, created_by) VALUES ($1, $2, 'fixture', decode($3, 'hex'))")
|
|
.bind(community).bind(channel).bind(&key).execute(&pool).await.unwrap();
|
|
sqlx::query("INSERT INTO channel_members (community_id, channel_id, pubkey) VALUES ($1, $2, decode($3, 'hex'))")
|
|
.bind(community).bind(channel).bind(&key).execute(&pool).await.unwrap();
|
|
|
|
for subject in ["demo", npub.as_str()] {
|
|
let preview = workflow_cli(&url, &["inventory", "--pubkey", subject], true).await;
|
|
let saved = workflow_cli(
|
|
&url,
|
|
&[
|
|
"submit",
|
|
"--pubkey",
|
|
subject,
|
|
"--requested-by",
|
|
"operator-a",
|
|
],
|
|
true,
|
|
)
|
|
.await;
|
|
assert_eq!(saved["inventory_manifest"], preview);
|
|
assert_eq!(
|
|
saved["target"],
|
|
if subject == "demo" {
|
|
"demo:default"
|
|
} else {
|
|
&key
|
|
}
|
|
);
|
|
assert_eq!(saved["status"], "inventoried");
|
|
let id = saved["id"].as_str().unwrap();
|
|
workflow_cli(&url, &["run", id], false).await;
|
|
workflow_cli(
|
|
&url,
|
|
&[
|
|
"approve",
|
|
id,
|
|
"--approved-by",
|
|
"operator-b",
|
|
"--inventory-digest",
|
|
"wrong",
|
|
],
|
|
false,
|
|
)
|
|
.await;
|
|
let approved = workflow_cli(
|
|
&url,
|
|
&[
|
|
"approve",
|
|
id,
|
|
"--approved-by",
|
|
"operator-b",
|
|
"--inventory-digest",
|
|
saved["inventory_digest"].as_str().unwrap(),
|
|
],
|
|
true,
|
|
)
|
|
.await;
|
|
assert!(approved["stage_history"].as_array().unwrap().is_empty());
|
|
let stepped = workflow_cli(&url, &["run", id, "--next-step"], true).await;
|
|
assert_eq!(stepped["stage_history"][0]["status"], "completed");
|
|
let first_id = stepped["stage_history"][0]["id"].clone();
|
|
let done = workflow_cli(&url, &["run", id], true).await;
|
|
assert_eq!(done["status"], "completed");
|
|
assert_eq!(done["stage_history"][0]["id"], first_id);
|
|
let stages = done["stage_history"].as_array().unwrap();
|
|
assert_eq!(stages.len(), if subject == "demo" { 5 } else { 3 });
|
|
assert!(stages
|
|
.iter()
|
|
.all(|s| s["status"] == "completed" && s["is_current"] == false));
|
|
let inspected = workflow_cli(&url, &["inspect", id], true).await;
|
|
assert_eq!(inspected, done);
|
|
// Hex and npub converge on the same saved request without rediscovery.
|
|
let repeat = workflow_cli(
|
|
&url,
|
|
&[
|
|
"submit",
|
|
"--pubkey",
|
|
if subject == "demo" { "demo" } else { &key },
|
|
"--requested-by",
|
|
"operator-a",
|
|
],
|
|
true,
|
|
)
|
|
.await;
|
|
for (field, value) in repeat.as_object().unwrap() {
|
|
assert_eq!(value, &done[field]);
|
|
}
|
|
workflow_cli(
|
|
&url,
|
|
&[
|
|
"submit",
|
|
"--pubkey",
|
|
subject,
|
|
"--requested-by",
|
|
"someone-else",
|
|
],
|
|
false,
|
|
)
|
|
.await;
|
|
}
|
|
// Real membership data remains unchanged after all dummy handlers execute.
|
|
let count: i64 = sqlx::query_scalar("SELECT count(*) FROM channel_members WHERE community_id = $1 AND pubkey = decode($2, 'hex')")
|
|
.bind(community).bind(&key).fetch_one(&pool).await.unwrap();
|
|
assert_eq!(count, 1);
|
|
}
|
|
|
|
#[tokio::test]
|
|
#[ignore = "requires Postgres"]
|
|
async fn inventory_approval_and_resume_use_saved_account_identity_without_resolution() {
|
|
let url = std::env::var("BUZZ_TEST_DATABASE_URL").unwrap();
|
|
let pool = PgPool::connect(&url).await.unwrap();
|
|
let saved = workflow_cli(
|
|
&url,
|
|
&[
|
|
"submit",
|
|
"--target",
|
|
"demo:resolved-account",
|
|
"--requested-by",
|
|
"operator-a",
|
|
],
|
|
true,
|
|
)
|
|
.await;
|
|
let id = saved["id"].as_str().unwrap();
|
|
// Model the output of a future account resolver. This is not CLI support
|
|
// for resolving account IDs: the inventory is already saved and complete.
|
|
let account = "builderlab:account-123";
|
|
sqlx::query("UPDATE entity_deletion_requests SET target = $2 WHERE id = $1")
|
|
.bind(Uuid::parse_str(id).unwrap())
|
|
.bind(account)
|
|
.execute(&pool)
|
|
.await
|
|
.unwrap();
|
|
workflow_cli(
|
|
&url,
|
|
&[
|
|
"approve",
|
|
id,
|
|
"--approved-by",
|
|
"operator-b",
|
|
"--inventory-digest",
|
|
saved["inventory_digest"].as_str().unwrap(),
|
|
],
|
|
true,
|
|
)
|
|
.await;
|
|
let stepped = workflow_cli(&url, &["run", id, "--next-step"], true).await;
|
|
let first_stage = stepped["stage_history"][0]["id"].clone();
|
|
let completed = workflow_cli(&url, &["run", id], true).await;
|
|
assert_eq!(completed["target"], account);
|
|
assert_eq!(completed["inventory_manifest"], saved["inventory_manifest"]);
|
|
assert_eq!(completed["status"], "completed");
|
|
assert_eq!(completed["stage_history"][0]["id"], first_stage);
|
|
for stage in completed["stage_history"].as_array().unwrap() {
|
|
assert_eq!(stage["metadata_json"]["inputs"]["target"], account);
|
|
assert_eq!(stage["status"], "completed");
|
|
}
|
|
}
|