fix(library): 撤销派发激活后不得用旧证据重开
build / build (push) Successful in 1m37s

为什么:撤销若只是把 revoked_at 置空,等于"撤销"变成界面动作;
部署想重开必须给出新的排空证据或换目标身份,不能复用同一条。

验证:真 PG 用例先绿,再把 SQL 变异回 DO UPDATE ⇒ 用例红于
"revoked activation was reopened with the same evidence",还原后再绿。
This commit is contained in:
姚章浩
2026-11-02 16:41:06 +08:00
parent 18a4b83f78
commit 3bce6c7a3f
2 changed files with 38 additions and 6 deletions
@@ -33,18 +33,17 @@ var ErrRestoreDispatchNotActivated = libraryrelease.ErrRestoreDispatchUnavailabl
// ActivateRestoreDispatch 登记"该目标已完成旧 writer 退出/排空"的部署证据。
//
// 它记录的是运维声明,不验证声明为真;代码只能保证没有这条登记就不发放许可。
// 撤销是终局:重新启用必须换一个新的目标身份(或由 DBA 归档旧行后重新登记),
// 不允许用同一条旧证据把已经撤销的目标悄悄打开。
func (s *Store) ActivateRestoreDispatch(ctx context.Context, targetIdentity, activatedBy, drainEvidenceDigest string, now time.Time) error {
if targetIdentity == "" || activatedBy == "" || drainEvidenceDigest == "" {
return errors.New("restore dispatch activation requires target, actor and drain evidence digest")
}
_, err := s.db.Exec(ctx, `
if _, err := s.db.Exec(ctx, `
INSERT INTO library_index_restore_dispatch_activation (target_identity, protocol_version, activated_by, drain_evidence_digest, activated_at)
VALUES ($1, 1, $2, $3, $4)
ON CONFLICT (target_identity) DO UPDATE
SET revoked_at = NULL
WHERE library_index_restore_dispatch_activation.revoked_at IS NOT NULL`,
targetIdentity, activatedBy, drainEvidenceDigest, now.UTC())
if err != nil {
ON CONFLICT (target_identity) DO NOTHING`,
targetIdentity, activatedBy, drainEvidenceDigest, now.UTC()); err != nil {
return fmt.Errorf("activate restore dispatch: %w", err)
}
return s.requireRestoreDispatchActivation(ctx, targetIdentity)
@@ -300,3 +300,36 @@ func TestRestoreDispatchCommitWithoutExplicitSuccessYieldsNoPermit(t *testing.T)
t.Fatal("second confirmation accepted")
}
}
// 撤销是终局:不能用同一条旧证据把已撤销目标重新打开(否则"撤销"只是界面动作)。
func TestRestoreDispatchRevocationIsFinal(t *testing.T) {
store, pool := newIdentityStore(t)
ctx := context.Background()
now := time.Now().UTC()
seedOperationJob(t, store, pool, "internal", "libsync-ds01-revoke", "sync", now)
if _, err := store.BeginLibraryAttempt(ctx, "libsync-ds01-revoke", "worker-a#q1#0", 10*time.Minute, now); err != nil {
t.Fatal(err)
}
if err := store.ActivateRestoreDispatch(ctx, "target-ds01", "deploy-bot", "sha256:drain", now); err != nil {
t.Fatal(err)
}
if err := store.RevokeRestoreDispatch(ctx, "target-ds01", now); err != nil {
t.Fatal(err)
}
binding := ds01Binding()
binding.Key.WindowJobID = "libsync-ds01-revoke"
binding.Key.OperationID = seededOperationID(t, pool, "libsync-ds01-revoke")
if _, err := store.PrepareRestoreMarker(ctx, binding); !errors.Is(err, libraryrelease.ErrRestoreDispatchUnavailable) {
t.Fatalf("revoked target still prepared: %v", err)
}
if err := store.ActivateRestoreDispatch(ctx, "target-ds01", "deploy-bot", "sha256:drain", now); err == nil {
t.Fatal("revoked activation was reopened with the same evidence")
}
var revoked *time.Time
if err := pool.QueryRow(ctx, `SELECT revoked_at FROM library_index_restore_dispatch_activation`).Scan(&revoked); err != nil {
t.Fatal(err)
}
if revoked == nil {
t.Fatal("revocation was silently cleared")
}
}