mirror of
https://github.com/Such-Software/smirk-backend-core.git
synced 2026-10-17 15:31:38 +02:00
fix(erasure): harden per adversarial review (Subsystem 5)
6 confirmed findings (review wqrd2gka3), 3 root-cause fixes: - HIGH: execute_erasure had no status recheck and the sweeper's SKIP LOCKED row lock was released before execution (separate connection), so (a) a request CANCELLED after the sweep's SELECT was still executed, and (b) a fleet could double-execute one erasure (duplicate hash-chained audit row, double count). Fixed by making execution atomically CLAIM the row as its first statement — `UPDATE ... SET status='completed' WHERE id=$1 AND status='confirmed' RETURNING user_id` — and skipping (returns false) when 0 rows match. Only the first executor of a still-confirmed request proceeds; a cancelled/already-done row is a no-op; on any later failure the whole tx (claim included) rolls back. - account-existence oracle: the absent-user request path returned a FRESH random erasure_id + advancing scheduled_for each call, while a real account returned a STABLE get-or-create id — a re-call distinguisher. The request response is now constant-shape: a STABLE id (real, or a deterministic integrity-secret-keyed synthetic for the absent path), a fixed "pending" status, and NO scheduled_for (it's meaningful only at confirm, where grace starts, and is returned there). - config: ERASURE_GRACE_PERIOD_HOURS is bounded (<= 10 years) in validate(), so the u64->i64 cast can't wrap negative (defeating grace) and Duration::hours can't panic. Dismissed after verification: ERASURE_ENABLED without FEATURE_NOSTR_IDENTITY (validate already requires PUBLIC_API_URL; the nostr_identity coupling is a nicety). Tests extended: cancelled-request-not-executed (HIGH regression), double-execute no-op. 140 lib + 140 integration green, no drift, scans clean.
This commit is contained in:
+75
-13
@@ -26,6 +26,21 @@ fn random_signer() -> SigningKey {
|
||||
}
|
||||
}
|
||||
|
||||
async fn mk_user(db: &smirk_backend_core::infra::db::Database, nostr_pubkey: &str) -> uuid::Uuid {
|
||||
db.create_user(NewUser {
|
||||
username: None,
|
||||
pubkey_hash: Some(format!("pk-{}", uuid::Uuid::new_v4())),
|
||||
nostr_pubkey: Some(nostr_pubkey.to_string()),
|
||||
wallet_birthday: None,
|
||||
seed_fingerprint: None,
|
||||
xmr_start_height: None,
|
||||
wow_start_height: None,
|
||||
})
|
||||
.await
|
||||
.unwrap()
|
||||
.id
|
||||
}
|
||||
|
||||
/// Build a `Nostr <base64(event)>` signed-action token for an erasure purpose.
|
||||
fn sign(
|
||||
sk: &SigningKey,
|
||||
@@ -83,19 +98,7 @@ async fn erasure_request_confirm_execute_flow() {
|
||||
// A user with a linked nostr identity that we control the key for.
|
||||
let sk = random_signer();
|
||||
let pk = hex::encode(sk.verifying_key().to_bytes());
|
||||
app.state
|
||||
.db
|
||||
.create_user(NewUser {
|
||||
username: None,
|
||||
pubkey_hash: Some(format!("pk-{}", uuid::Uuid::new_v4())),
|
||||
nostr_pubkey: Some(pk.clone()),
|
||||
wallet_birthday: None,
|
||||
seed_fingerprint: None,
|
||||
xmr_start_height: None,
|
||||
wow_start_height: None,
|
||||
})
|
||||
.await
|
||||
.unwrap();
|
||||
mk_user(&app.state.db, &pk).await;
|
||||
|
||||
let challenge = |purpose: &'static str| {
|
||||
let app = &app;
|
||||
@@ -218,6 +221,65 @@ async fn erasure_request_confirm_execute_flow() {
|
||||
assert!(body["erasure_id"].as_str().is_some());
|
||||
assert_eq!(body["status"], "pending");
|
||||
|
||||
let secret = app.state.config.admin.key_integrity_secret.clone();
|
||||
|
||||
// [HIGH regression] a request CANCELLED after confirmation is NOT executed:
|
||||
// execute claims `WHERE status='confirmed'`, so a cancelled row is skipped.
|
||||
let pk_c = hex::encode(random_signer().verifying_key().to_bytes());
|
||||
let uc = mk_user(&app.state.db, &pk_c).await;
|
||||
let rc = app.state.db.request_erasure(uc, "h", 0).await.unwrap();
|
||||
app.state
|
||||
.db
|
||||
.confirm_erasure_request(rc.id, uc, 0)
|
||||
.await
|
||||
.unwrap();
|
||||
app.state
|
||||
.db
|
||||
.cancel_erasure_request(rc.id, uc)
|
||||
.await
|
||||
.unwrap();
|
||||
assert!(
|
||||
!app.state
|
||||
.db
|
||||
.execute_erasure(rc.id, true, &secret)
|
||||
.await
|
||||
.unwrap(),
|
||||
"cancelled request is not executed"
|
||||
);
|
||||
assert!(
|
||||
app.state
|
||||
.db
|
||||
.find_user_by_nostr_pubkey(&pk_c)
|
||||
.await
|
||||
.unwrap()
|
||||
.is_some(),
|
||||
"cancelled user survives"
|
||||
);
|
||||
|
||||
// Double-execution is a no-op (idempotent claim): the second call returns false.
|
||||
let pk_d = hex::encode(random_signer().verifying_key().to_bytes());
|
||||
let ud = mk_user(&app.state.db, &pk_d).await;
|
||||
let rd = app.state.db.request_erasure(ud, "h", 0).await.unwrap();
|
||||
app.state
|
||||
.db
|
||||
.confirm_erasure_request(rd.id, ud, 0)
|
||||
.await
|
||||
.unwrap();
|
||||
assert!(app
|
||||
.state
|
||||
.db
|
||||
.execute_erasure(rd.id, true, &secret)
|
||||
.await
|
||||
.unwrap());
|
||||
assert!(
|
||||
!app.state
|
||||
.db
|
||||
.execute_erasure(rd.id, true, &secret)
|
||||
.await
|
||||
.unwrap(),
|
||||
"second execute is a no-op"
|
||||
);
|
||||
|
||||
for k in [
|
||||
"ERASURE_ENABLED",
|
||||
"ADMIN_KEY_INTEGRITY_SECRET",
|
||||
|
||||
Reference in New Issue
Block a user