From dcb58aaff2372fbdbf3871e9903408b67cbff158 Mon Sep 17 00:00:00 2001 From: VirtualMachinist Date: Mon, 26 Oct 2026 16:52:45 -0400 Subject: [PATCH] docs(vault): rotate help matches the no-reseal refusal `--drop-recipient` help, the `--yes` refusal text and the rotate summary still implied a dropped recipient keeps reading old objects without `--reseal`. Since a vault that holds entries now requires `--reseal`, that incomplete-revocation case only applies to empty vaults; say so. --- CHANGELOG.md | 1 + crates/geode-cli/src/cmd/vault.rs | 15 +++++++++------ 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8fd6e6e..1961e23 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -19,6 +19,7 @@ Format: [Keep a Changelog](https://keepachangelog.com/en/1.1.0/). Versioning: se - `vault rotate` fails closed: it refuses a kept symmetric recipient it cannot re-wrap (that recipient would be locked out), an unusable X25519 public, or a kept set no one can open; it verifies the new wraps, the new manifest and every resealed object before the header commits, and restores the old epoch on any failure. - `vault rotate` without `--reseal` on a vault that holds entries is now refused (exit 1, vault unchanged) with a hint to re-run with `--reseal`. It used to publish an empty new-epoch manifest, so every entry vanished from `list`/`cat`/`open`. Rotating an empty vault without `--reseal` still works. - A failed `vault rotate` now also removes the old-epoch recipients snapshot it wrote, and a failure while restoring is reported together with the original error (nonzero exit) instead of being ignored. +- `vault rotate` help and messages no longer say a dropped recipient keeps reading old objects without `--reseal`: a vault that holds entries requires `--reseal`, so that incomplete-revocation case now only applies to empty vaults. ### Security diff --git a/crates/geode-cli/src/cmd/vault.rs b/crates/geode-cli/src/cmd/vault.rs index b9abcef..79894ae 100644 --- a/crates/geode-cli/src/cmd/vault.rs +++ b/crates/geode-cli/src/cmd/vault.rs @@ -45,8 +45,9 @@ pub enum VaultCmd { /// A vault that holds entries requires `--reseal` (objects are sealed per /// epoch; a new epoch without them would hide every entry). On an empty /// vault a drop without `--reseal` is incomplete revocation: the former - /// recipient keeps its old-epoch wrap. Do not fix incomplete revocation in policy — recipient - /// possession bypasses policy if the holder runs other software. + /// recipient keeps its old-epoch wrap. Do not fix incomplete revocation + /// in policy — recipient possession bypasses policy if the holder runs + /// other software. Rotate(RotateArgs), } @@ -87,8 +88,10 @@ pub struct RotateArgs { /// revocation path. #[arg(long)] pub reseal: bool, - /// Drop a recipient by `key_id` (hex). Without `--reseal` this is - /// incomplete revocation: the former recipient still reads old objects. + /// Drop a recipient by `key_id` (hex). A vault that holds entries + /// requires `--reseal`, which completes the revocation. Only on an empty + /// vault is a drop without `--reseal` allowed; the former recipient then + /// keeps its old-epoch wrap (incomplete revocation, nothing to read). #[arg(long, value_name = "ID")] pub drop_recipient: Vec, /// Wrap the new EK for an X25519 recipient `.gpub`. @@ -325,7 +328,7 @@ fn bump_header_epoch( fn rotate(args: &RotateArgs, global: &GlobalArgs, out: OutMode) -> Result<()> { if !args.yes { return Err(Error::Format( - "rotate requires --yes (skips confirmation; drop without --reseal is incomplete revocation)" + "rotate requires --yes (skips confirmation; a vault that holds entries also requires --reseal)" .into(), )); } @@ -421,7 +424,7 @@ fn rotate(args: &RotateArgs, global: &GlobalArgs, out: OutMode) -> Result<()> { String::new() }; let incomplete_bit = if incomplete { - "; drop without --reseal is incomplete revocation" + "; vault is empty, so the drop without --reseal is incomplete revocation (the former recipient keeps its old-epoch wrap)" } else { "" };