fix(worktree): bind publication to dispatch grants
Worktree RPC used to accept repository coordinates from the sandbox. It now accepts only an opaque per-dispatch grant, and the daemon derives the repository path and branch from grant-owned state. Repository worktree paths also move from an ambiguous flattened key to encoded owner/repo components. Origin-matched legacy clones migrate safely; mismatched legacy paths are preserved.
This commit is contained in:
1 parent
7df2ae3626
commit
dbb6550ab3
19 files changed
+494
-175
No files matched your search
@@ -58,6 +58,7 @@ import (
|
||||
"github.com/samcharles93/archie-core/internal/webhookguard"
|
||||
"github.com/samcharles93/archie-core/internal/webui"
|
||||
"github.com/samcharles93/archie-core/internal/worktree"
|
||||
"github.com/samcharles93/archie-core/internal/worktreerpc"
|
||||
)
|
||||
|
||||
// boot is the mutable wiring state assembled by the run() composition
|
||||
@@ -120,6 +121,7 @@ type boot struct {
|
||||
registry workflow.Registry
|
||||
capabilityHost *plugin.Host
|
||||
trees *worktree.Manager
|
||||
worktreeGrants *worktreerpc.Grants
|
||||
identityRunners []*daemon.IdentityRunner
|
||||
memManager *memory.Manager
|
||||
curatorRegistry *curator.Registry
|
||||
@@ -730,7 +732,8 @@ func (b *boot) registerNATSRPC() error {
|
||||
log.Error("nats connection unavailable for task RPC", "err", err)
|
||||
return err
|
||||
}
|
||||
unsubscribe, err := registerTaskRPCServers(coreConn, b.st, b.forgeClient, b.trees, b.identityRunners, log)
|
||||
b.worktreeGrants = worktreerpc.NewGrants()
|
||||
unsubscribe, err := registerTaskRPCServers(coreConn, b.st, b.forgeClient, b.trees, b.identityRunners, b.worktreeGrants, log)
|
||||
if err != nil {
|
||||
log.Error("task RPC server registration failed", "err", err)
|
||||
return err
|
||||
@@ -964,6 +967,7 @@ func (b *boot) buildDaemon() {
|
||||
Log: log,
|
||||
CustomStages: wfeval.Discover,
|
||||
Tasks: b.natsClient,
|
||||
WorktreeGrants: b.worktreeGrants,
|
||||
ContainerPool: b.containerPool,
|
||||
SandboxRequired: b.sandboxRequired,
|
||||
Memory: b.memManager,
|
||||
|
||||
+2
-2
@@ -743,7 +743,7 @@ func subscribeAgentEvents(nc *natsio.Conn, bus *events.Bus, log *slog.Logger) (u
|
||||
// identity's scoped subjects so a container-mode task owned by a non-root
|
||||
// identity has its RPC calls served by its own forge client and worktree
|
||||
// manager.
|
||||
func registerTaskRPCServers(nc *natsio.Conn, st store.TaskStore, forgeClient forge.Forge, trees *worktree.Manager, identities []*daemon.IdentityRunner, log *slog.Logger) (unsubscribe func(), err error) {
|
||||
func registerTaskRPCServers(nc *natsio.Conn, st store.TaskStore, forgeClient forge.Forge, trees *worktree.Manager, identities []*daemon.IdentityRunner, grants *worktreerpc.Grants, log *slog.Logger) (unsubscribe func(), err error) {
|
||||
unsubs := make([]func(), 0, 3+2*len(identities))
|
||||
unsubAll := func() {
|
||||
for _, u := range unsubs {
|
||||
@@ -768,7 +768,7 @@ func registerTaskRPCServers(nc *natsio.Conn, st store.TaskStore, forgeClient for
|
||||
return nil
|
||||
}
|
||||
registerTrees := func(mgr *worktree.Manager, identity string) error {
|
||||
srv := &worktreerpc.Server{Trees: mgr, Log: log.With("rpc_identity", identity)}
|
||||
srv := &worktreerpc.Server{Trees: mgr, Grants: grants, Log: log.With("rpc_identity", identity)}
|
||||
u, err := srv.RegisterFor(nc, identity)
|
||||
if err != nil {
|
||||
return fmt.Errorf("register worktreerpc%s: %w", identitySuffix(identity), err)
|
||||
|
||||
@@ -898,7 +898,7 @@ func TestRegisterTaskRPCServersReachableFromClient(t *testing.T) {
|
||||
trees := &worktree.Manager{WorkDir: t.TempDir()}
|
||||
log := slog.New(slog.DiscardHandler)
|
||||
|
||||
unsubscribe, err := registerTaskRPCServers(serverConn, st, stubForge{}, trees, nil, log)
|
||||
unsubscribe, err := registerTaskRPCServers(serverConn, st, stubForge{}, trees, nil, worktreerpc.NewGrants(), log)
|
||||
if err != nil {
|
||||
t.Fatalf("registerTaskRPCServers: %v", err)
|
||||
}
|
||||
@@ -930,8 +930,8 @@ func TestRegisterTaskRPCServersReachableFromClient(t *testing.T) {
|
||||
}
|
||||
|
||||
treesClient := &worktreerpc.Client{Conn: clientConn, Timeout: 2 * time.Second}
|
||||
if _, _, err := treesClient.Prepare(ctx, "acme", "widget", "main", 1, "feat: x", "", ""); err == nil {
|
||||
t.Fatal("expected Prepare to fail against a non-git remote, proving the RPC round-tripped")
|
||||
if err := treesClient.Push(ctx); err == nil {
|
||||
t.Fatal("expected Push without a dispatch grant to fail, proving the RPC round-tripped")
|
||||
} else if err.Error() == "" {
|
||||
t.Fatal("expected a non-empty error from the worktreerpc round trip")
|
||||
}
|
||||
@@ -1006,7 +1006,7 @@ func TestRegisterTaskRPCServersRoutesIdentityScopedCalls(t *testing.T) {
|
||||
identities := []*daemon.IdentityRunner{
|
||||
{Name: "archie", Forge: archieForge, Trees: archieTrees},
|
||||
}
|
||||
unsubscribe, err := registerTaskRPCServers(serverConn, st, rootForge, rootTrees, identities, slog.New(slog.DiscardHandler))
|
||||
unsubscribe, err := registerTaskRPCServers(serverConn, st, rootForge, rootTrees, identities, worktreerpc.NewGrants(), slog.New(slog.DiscardHandler))
|
||||
if err != nil {
|
||||
t.Fatalf("registerTaskRPCServers: %v", err)
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user