Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
fix(team): journal secret creation and recover unpublished slots
  • Loading branch information
SivanCola committed Nov 3, 2026
commit 5f29bfade98f31e47907a8bb7110216d5ac098ad
3 changes: 3 additions & 0 deletions desktop/team_host.go
Original file line number Diff line number Diff line change
Expand Up @@ -166,6 +166,9 @@ func (a *App) startTeamHost() {
slog.Warn("desktop: team tick", "err", secrets.RedactError(err))
}
if h.Ready() {
if err := a.recoverTeamSecretCreations(ctx); err != nil && ctx.Err() == nil {
slog.Warn("desktop: Team secret creation recovery", "err", secrets.RedactError(err))
}
if err := a.tickTeamSchedules(ctx, time.Now()); err != nil && ctx.Err() == nil {
slog.Warn("desktop: Team schedule", "err", secrets.RedactError(err))
}
Expand Down
40 changes: 40 additions & 0 deletions desktop/team_secret_creations.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
package main

import (
"context"
"path/filepath"

"deepzora/internal/config"
"deepzora/internal/team"
"deepzora/internal/teamroster"
)

func teamSecretIntentDir(store teamroster.Store) string {
return filepath.Join(store.Dir, "secret-slot-intents-v1")
}

func recoverTeamSecretCreations(ctx context.Context, store teamroster.Store, slots config.TeamSecretSlots) error {
return store.InspectTeamSecrets(ctx, func(book teamroster.TeamSecretBook) error {
referenced := make(map[string]bool)
for _, sc := range book.Secrets {
referenced[sc.Slot] = true
}
for _, sc := range book.Retired {
referenced[sc.Slot] = true
}
return slots.RecoverPending(ctx, teamSecretIntentDir(store), referenced)
})
}

func (a *App) recoverTeamSecretCreations(ctx context.Context) error {
if !teamSecretMaskingReady() {
return nil
}
h, err := a.localTeamHost()
if err != nil {
return err
}
return h.WithWriter(ctx, func(ctx context.Context, _ *team.Service) error {
return recoverTeamSecretCreations(ctx, desktopTeamStore(), config.DefaultTeamSecretSlots())
})
}
114 changes: 114 additions & 0 deletions desktop/team_secret_creations_test.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,114 @@
package main

import (
"errors"
"fmt"
"os"
"path/filepath"
"strings"
"testing"

"deepzora/internal/config"
"deepzora/internal/teamroster"
)

func TestRejectedTeamSecretNeverWritesPlaintext(t *testing.T) {
for _, kind := range []string{"purpose", "capacity", "retired-capacity"} {
t.Run(kind, func(t *testing.T) {
slots := config.TeamSecretSlots{Dir: filepath.Join(t.TempDir(), "slots")}
roster := teamroster.Roster{}
member := roster.AddAgent(teamroster.Agent{Name: "Ada"})
book := teamroster.TeamSecretBook{}
req := SaveTeamSecretRequest{RequestID: "reject-invalid-secret", Operation: "save", Name: "DEPLOY", Value: "never-write-this", Agents: []string{member.ID}}
switch kind {
case "purpose":
req.Purpose = strings.Repeat("x", 801)
case "capacity":
for i := range 128 {
book.Secrets = append(book.Secrets, teamroster.TeamSecret{Name: fmt.Sprintf("KEY_%d", i), Slot: "existing", Agents: []string{member.ID}})
}
case "retired-capacity":
book.Secrets = []teamroster.TeamSecret{{Name: "DEPLOY", Slot: "current", Agents: []string{member.ID}}}
for i := range 2048 {
book.Retired = append(book.Retired, teamroster.RetiredTeamSecret{Name: "DEPLOY", Slot: fmt.Sprintf("old-%d", i)})
}
}
if err := applyUserTeamSecret(t.Context(), &book, roster, slots, req, filepath.Join(t.TempDir(), "intents")); err == nil {
t.Fatal("invalid metadata accepted")
}
if _, err := os.Stat(slots.Dir); !errors.Is(err, os.ErrNotExist) {
t.Fatalf("rejected request touched credential directory: %v", err)
}
})
}
}

func TestTeamSecretCreationRecoveryUsesCommittedBook(t *testing.T) {
for _, outcome := range []string{"unpublished", "publish_failed", "committed", "retired", "unknown", "corrupt"} {
t.Run(outcome, func(t *testing.T) {
store := teamroster.Store{Dir: t.TempDir()}
slots := config.TeamSecretSlots{Dir: t.TempDir()}
var slot string
_, err := store.MutateTeamSecrets(t.Context(), 0, "create-slot-intent", "digest", func(book *teamroster.TeamSecretBook) error {
var err error
slot, err = slots.SaveWithIntent(t.Context(), "private-value", teamSecretIntentDir(store))
if err != nil {
return err
}
if outcome == "unpublished" {
return errors.New("injected metadata publication failure")
}
if outcome == "publish_failed" {
// Block the actual atomic rename after slot publication.
if err := os.Mkdir(filepath.Join(store.Dir, teamroster.SecretFile), 0700); err != nil {
return err
}
}
book.Secrets = []teamroster.TeamSecret{{Name: "DEPLOY", Slot: slot, Agents: []string{}}}
if outcome == "retired" {
book.Retired = []teamroster.RetiredTeamSecret{{Name: "DEPLOY", Slot: slot}}
book.Secrets = nil
}
return nil
})
unpublished := outcome == "unpublished" || outcome == "publish_failed"
if (err != nil) != unpublished {
t.Fatal(err)
}
if outcome == "publish_failed" {
if err := os.Remove(filepath.Join(store.Dir, teamroster.SecretFile)); err != nil {
t.Fatal(err)
}
}
if outcome == "unknown" || outcome == "corrupt" {
body := `{"schemaVersion":999}`
if outcome == "corrupt" {
body = "{broken"
}
if err := os.WriteFile(filepath.Join(store.Dir, teamroster.SecretFile), []byte(body), 0600); err != nil {
t.Fatal(err)
}
}
// Recreate owners to simulate restart after plaintext publication or
// after a successful metadata commit whose result was never observed.
err = recoverTeamSecretCreations(t.Context(), teamroster.Store{Dir: store.Dir}, config.TeamSecretSlots{Dir: slots.Dir})
blocked := outcome == "unknown" || outcome == "corrupt"
if (err != nil) != blocked {
t.Fatalf("recovery error = %v", err)
}
_, valueErr := slots.Read(slot)
if (valueErr != nil) != unpublished {
t.Fatalf("recovery kept/deleted wrong credential: %v", valueErr)
}
_, intentErr := os.Stat(filepath.Join(teamSecretIntentDir(store), slot))
if (intentErr == nil) != blocked {
t.Fatalf("wrong intent retention: %v", intentErr)
}
if !blocked {
if err := recoverTeamSecretCreations(t.Context(), store, slots); err != nil {
t.Fatalf("repeated recovery: %v", err)
}
}
})
}
}
41 changes: 29 additions & 12 deletions desktop/team_secrets_api.go
Original file line number Diff line number Diff line change
Expand Up @@ -104,8 +104,13 @@ func (a *App) SaveTeamSecret(req SaveTeamSecretRequest) (TeamSecretResult, error
if err != nil {
return err
}
_, err = desktopTeamStore().MutateTeamSecrets(ctx, req.ExpectedRevision, req.RequestID, digest, func(book *teamroster.TeamSecretBook) error { return applyUserTeamSecret(ctx, book, roster, slots, req) })
return err
store := desktopTeamStore()
_, err = store.MutateTeamSecrets(ctx, req.ExpectedRevision, req.RequestID, digest, func(book *teamroster.TeamSecretBook) error {
return applyUserTeamSecret(ctx, book, roster, slots, req, teamSecretIntentDir(store))
})
// Re-read under the same lock even after an uncertain write error;
// deleting the returned slot blindly could destroy a committed value.
return errors.Join(err, recoverTeamSecretCreations(ctx, store, slots))
})
})
})
Expand All @@ -120,7 +125,7 @@ func (a *App) SaveTeamSecret(req SaveTeamSecretRequest) (TeamSecretResult, error
return result, nil
}

func applyUserTeamSecret(ctx context.Context, book *teamroster.TeamSecretBook, roster teamroster.Roster, slots config.TeamSecretSlots, req SaveTeamSecretRequest) error {
func applyUserTeamSecret(ctx context.Context, book *teamroster.TeamSecretBook, roster teamroster.Roster, slots config.TeamSecretSlots, req SaveTeamSecretRequest, intentDir string) error {
if len(req.RequestID) < 8 || len(req.RequestID) > 128 {
return teamroster.ErrInvalid
}
Expand Down Expand Up @@ -152,6 +157,10 @@ func applyUserTeamSecret(ctx context.Context, book *teamroster.TeamSecretBook, r
book.Secrets = slices.Delete(book.Secrets, i, i+1)
return nil
case "save", "authorize":
proposed := *book
proposed.Secrets = slices.Clone(book.Secrets)
proposed.Retired = slices.Clone(book.Retired)
proposed.Requests = slices.Clone(book.Requests)
agents := slices.Clone(req.Agents)
if agents == nil {
agents = []string{}
Expand All @@ -174,21 +183,29 @@ func applyUserTeamSecret(ctx context.Context, book *teamroster.TeamSecretBook, r
}
sc.Slot = book.Secrets[i].Slot
} else {
slot, err := slots.Save(ctx, req.Value)
if err != nil {
return err
}
sc.Slot = slot
sc.Slot = "pending"
if i >= 0 {
book.Retire(book.Secrets[i], now)
proposed.Retire(book.Secrets[i], now)
}
}
if i < 0 {
book.Secrets = append(book.Secrets, sc)
i = len(proposed.Secrets)
proposed.Secrets = append(proposed.Secrets, sc)
} else {
book.Secrets[i] = sc
proposed.Secrets[i] = sc
}
proposed.Requests = slices.DeleteFunc(proposed.Requests, func(q teamroster.TeamSecretRequest) bool { return q.ID == req.SecretRequestID })
if err := proposed.Validate(); err != nil {
return err
}
if req.Operation == "save" {
slot, err := slots.SaveWithIntent(ctx, req.Value, intentDir)
if err != nil {
return err
}
proposed.Secrets[i].Slot = slot
}
book.Requests = slices.DeleteFunc(book.Requests, func(q teamroster.TeamSecretRequest) bool { return q.ID == req.SecretRequestID })
*book = proposed
return nil
default:
return teamroster.ErrInvalid
Expand Down
8 changes: 4 additions & 4 deletions desktop/team_secrets_api_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -26,13 +26,13 @@ func TestUserSecretRotationKeepsRetiredSlotsAndExplicitEmptyGrants(t *testing.T)
member := roster.AddAgent(teamroster.Agent{Name: "Ada"})
book := teamroster.TeamSecretBook{}
req := SaveTeamSecretRequest{RequestID: "save-secret-fixture", Operation: "save", Name: "DEPLOY", Purpose: "deploy", Value: "first-value", Agents: []string{member.ID}}
if err := applyUserTeamSecret(t.Context(), &book, roster, slots, req); err != nil {
if err := applyUserTeamSecret(t.Context(), &book, roster, slots, req, slots.Dir+"/intents"); err != nil {
t.Fatal(err)
}
old := book.Secrets[0].Slot
req.Value = "replacement-value"
req.Agents = []string{}
if err := applyUserTeamSecret(t.Context(), &book, roster, slots, req); err != nil {
if err := applyUserTeamSecret(t.Context(), &book, roster, slots, req, slots.Dir+"/intents"); err != nil {
t.Fatal(err)
}
if len(book.Retired) != 1 || book.Retired[0].Slot != old || len(book.Secrets[0].Agents) != 0 {
Expand All @@ -47,11 +47,11 @@ func TestUserSecretRotationKeepsRetiredSlotsAndExplicitEmptyGrants(t *testing.T)
}
req.Operation = "forget_retired"
req.ConfirmForget = false
if err := applyUserTeamSecret(t.Context(), &book, roster, slots, req); err == nil {
if err := applyUserTeamSecret(t.Context(), &book, roster, slots, req, slots.Dir+"/intents"); err == nil {
t.Fatal("forgot old values without new confirmation")
}
req.ConfirmForget = true
if err := applyUserTeamSecret(t.Context(), &book, roster, slots, req); err != nil || len(book.Retired) != 0 {
if err := applyUserTeamSecret(t.Context(), &book, roster, slots, req, slots.Dir+"/intents"); err != nil || len(book.Retired) != 0 {
t.Fatalf("confirmed forget: %+v %v", book, err)
}
}
82 changes: 82 additions & 0 deletions internal/config/team_secret_pending.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,82 @@
package config

import (
"context"
"errors"
"os"
"path/filepath"

"deepzora/internal/fileutil"
)

// RecoverPending reconciles only explicitly journaled new slots. It never
// sweeps untracked credentials. The caller must hold the owning secret-book
// lock and derive referenced from freshly loaded, validated metadata.
func (s TeamSecretSlots) RecoverPending(ctx context.Context, intentDir string, referenced map[string]bool) error {
entries, err := os.ReadDir(intentDir)
if errors.Is(err, os.ErrNotExist) {
return nil
}
if err != nil {
return err
}
for _, entry := range entries {
if err := ctx.Err(); err != nil {
return err
}
slot := entry.Name()
if !teamSecretSlotName.MatchString(slot) {
continue
}
path := filepath.Join(intentDir, slot)
info, err := os.Lstat(path)
if err != nil || !info.Mode().IsRegular() || info.Size() != 2 {
return errors.New("invalid Team secret creation intent")
}
body, err := os.ReadFile(path)
if err != nil || string(body) != "1\n" {
return errors.New("unknown Team secret creation intent version")
}
if !referenced[slot] {
if err := s.removeUnpublished(slot); err != nil {
return err
}
}
// Sync the metadata directory before retiring the intent. In particular,
// a prior metadata rename may have returned a directory-sync error.
if err := fileutil.SyncParentDir(intentDir); err != nil {
return err
}
if err := os.Remove(path); err != nil {
return err
}
if err := fileutil.SyncParentDir(path); err != nil {
return err
}
}
return nil
}

func (s TeamSecretSlots) removeUnpublished(slot string) error {
root, err := os.OpenRoot(s.Dir)
if errors.Is(err, os.ErrNotExist) {
return nil
}
if err != nil {
return err
}
defer root.Close()
info, err := root.Lstat(slot)
if err != nil && !errors.Is(err, os.ErrNotExist) {
return err
}
if err == nil {
if !info.Mode().IsRegular() {
return errors.New("Team secret cleanup requires a regular slot")
}
if err := root.Remove(slot); err != nil {
return err
}
}
return fileutil.SyncParentDir(filepath.Join(s.Dir, slot))
}
29 changes: 29 additions & 0 deletions internal/config/team_secret_slots.go
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,19 @@ func DefaultTeamSecretSlots() TeamSecretSlots {
return TeamSecretSlots{Dir: filepath.Join(filepath.Dir(UserCredentialsPath()), "team-secret-slots")}
}
func (s TeamSecretSlots) Save(ctx context.Context, value string) (string, error) {
return s.save(ctx, value, "")
}

// SaveWithIntent durably records the prospective slot before writing plaintext.
// The caller holds its secret-book lock until metadata publication finishes.
func (s TeamSecretSlots) SaveWithIntent(ctx context.Context, value, intentDir string) (string, error) {
if intentDir == "" {
return "", errors.New("Team secret intent directory required")
}
return s.save(ctx, value, intentDir)
}

func (s TeamSecretSlots) save(ctx context.Context, value, intentDir string) (string, error) {
if err := ctx.Err(); err != nil {
return "", err
}
Expand All @@ -37,6 +50,22 @@ func (s TeamSecretSlots) Save(ctx context.Context, value string) (string, error)
return "", err
}
slot := "ts-" + hex.EncodeToString(id)
if intentDir != "" {
if err := os.MkdirAll(intentDir, 0700); err != nil {
return "", err
}
if err := fileutil.SyncParentDir(intentDir); err != nil {
return "", err
}
if err := fileutil.AtomicWriteFileStrict(filepath.Join(intentDir, slot), []byte("1\n"), 0600); err != nil {
return "", err
}
// AtomicWriteFileStrict intentionally ignores post-rename fsync
// failures. An intent must be durable before any plaintext is written.
if err := fileutil.SyncParentDir(filepath.Join(intentDir, slot)); err != nil {
return "", err
}
}
if err := fileutil.AtomicWriteFileStrict(filepath.Join(s.Dir, slot), []byte(value), 0600); err != nil {
return "", err
}
Expand Down
Loading