docs/prds/external-agent-harness.md (Credentials) and orgs-and-access.md: egress.Resolver had no production implementation, and no run carried a credential naming the org secrets its identity is granted, so a Kit's required credential@1 was refused at the proxy and no harness run authenticated (archie-core-egkf.11). Two things, as scoped (this does not attempt #1026's full run-credential consolidation replacing WorktreeGrantIssuer/StateStoreGrantIssuer -- that PRD item is real, separate, and still open; this is deliberately narrower): 1. A run credential naming granted secrets: config.CredentialBinding maps a Kit credential@1 service to a secret; config.Config/IdentityConfig gain Org and GrantedCredentials (a per-identity allowlist of service names, reusing the existing per-identity config-override pattern DiffCapLines already uses, not a new Cedar/Authorizer integration -- KindSecret policy objects exist in internal/domain/access but assembling a full Principal is #1026's job, not a two-line addition here). config.ContainerConfig. BoundCredentials computes the declared (Kit) ∩ granted (identity) ∩ org-matched intersection Sam's own rule requires: neither side widens the other, proven by a mutation-checked test flipping each of the three independently. 2. egress.GrantResolver: the production Resolver, holding only what a caller explicitly Grant-ed one run, replaced wholesale (not merged) on a repeated Grant, gone entirely on RevokeGrant. kitrun.Launcher.Launch computes the intersection per launch and resolves real values through the existing secret registry (SecretResolver), Grants it before the proxy session opens, and Release/error-path rollback (a new shared Launcher.release) always revokes it. Course-corrected mid-implementation (flagged by Sam): credential bindings first landed as a boot-time config.ContainerConfig.Credentials field captured once into Launcher.Bindings -- exactly the "parses but is not a resource" trap CLAUDE.md warns about, and inconsistent with agent-profiles (#1207) making a Kit profile apply without a restart. Rebuilt as its own live control-plane resource, CredentialBindingsKind ("credential-bindings"), following the agent-profiles/container-runtime-policies split precisely: config.ContainerConfig.Credentials is json:"-", [containers].credentials is only its seed, and kitrun.Launcher now holds *config.Holder (not a captured slice) and reads Containers.Credentials fresh on every Launch. Org/GrantedCredentials were already read fresh per dispatch (d.configFor inside runKitTask, never cached), so no equivalent fix was needed there. Deliberately not built: identities and grants as their own State Store resource (orgs-and-access.md's "Org owns ... identities and their grants"). Identities are entirely config.toml-defined today with no control-plane resource at all; moving GrantedCredentials alone into one would put half an identity in two places. That migration is identities' own scope, not credential bindings'.
215 lines
8.1 KiB
Go
215 lines
8.1 KiB
Go
package controlplane
|
|
|
|
import (
|
|
"encoding/json"
|
|
"testing"
|
|
"time"
|
|
|
|
"github.com/samcharles93/archie-core/internal/config"
|
|
"github.com/samcharles93/archie-core/internal/infrastructure/configuration"
|
|
)
|
|
|
|
// TestResourceValidatorsRejectWhatEffectiveValidationRejects ties the two rule
|
|
// sets that guard the same fields. A control-plane resource is seeded from the
|
|
// file document and then replaces it wholesale (Client.RuntimeConfig), so a
|
|
// value the file path accepts must not be storable through the resource, and a
|
|
// value the resource accepts must not stop the daemon's validation of the
|
|
// effective document. Guards that live only on one side are how a stale TOML
|
|
// value becomes a database value the operator cannot fix by editing config.toml.
|
|
//
|
|
// Each case mutates the same field the resource carries, so the two halves
|
|
// cannot drift apart without failing here.
|
|
func TestResourceValidatorsRejectWhatEffectiveValidationRejects(t *testing.T) {
|
|
tests := []struct {
|
|
name string
|
|
kind string
|
|
value any
|
|
mutate func(cfg *config.Config)
|
|
wantErr bool
|
|
}{
|
|
{
|
|
name: "valid scheduling policy",
|
|
kind: SchedulingPolicyKind,
|
|
value: map[string]any{"poll_interval": "1m0s", "max_retries": 0, "dispatch": map[string]any{"trigger": "assignee"}},
|
|
mutate: func(cfg *config.Config) {},
|
|
wantErr: false,
|
|
},
|
|
{
|
|
name: "unrecognised dispatch trigger",
|
|
kind: SchedulingPolicyKind,
|
|
value: map[string]any{"poll_interval": "1m0s", "max_retries": 0, "dispatch": map[string]any{"trigger": "labels"}},
|
|
mutate: func(cfg *config.Config) { cfg.Dispatch.Trigger = "labels" },
|
|
wantErr: true,
|
|
},
|
|
{
|
|
name: "negative poll interval",
|
|
kind: SchedulingPolicyKind,
|
|
value: map[string]any{"poll_interval": "-5s", "max_retries": 0, "dispatch": map[string]any{"trigger": "assignee"}},
|
|
mutate: func(cfg *config.Config) { cfg.PollInterval = config.Duration(-5 * time.Second) },
|
|
wantErr: true,
|
|
},
|
|
{
|
|
// A zero interval is what applyDefaults replaces before validation
|
|
// runs, so the file layer only ever sees it as a value to reject. The
|
|
// resource has no defaulting behind it: a stored "0s" would become
|
|
// cfg.PollInterval = 0 and stop archied starting.
|
|
name: "zero poll interval",
|
|
kind: SchedulingPolicyKind,
|
|
value: map[string]any{"poll_interval": "0s", "max_retries": 0, "dispatch": map[string]any{"trigger": "assignee"}},
|
|
mutate: func(cfg *config.Config) { cfg.PollInterval = 0 },
|
|
wantErr: true,
|
|
},
|
|
{
|
|
// The pairing rule the file layer's validateDispatch enforces on the
|
|
// effective document (the GH#445 guard): a label-requiring trigger
|
|
// with no label matches every open issue. The resource carries the
|
|
// label precisely so the write path can judge the pairing, so a
|
|
// stored policy without one is refused here and by boot alike.
|
|
name: "label trigger without a label",
|
|
kind: SchedulingPolicyKind,
|
|
value: map[string]any{"poll_interval": "1m0s", "max_retries": 0, "dispatch": map[string]any{"trigger": "label"}},
|
|
mutate: func(cfg *config.Config) { cfg.Dispatch.Trigger = "label" },
|
|
wantErr: true,
|
|
},
|
|
{
|
|
name: "label trigger with a label",
|
|
kind: SchedulingPolicyKind,
|
|
value: map[string]any{"poll_interval": "1m0s", "max_retries": 0, "label": "archie:labelled", "dispatch": map[string]any{"trigger": "label"}},
|
|
mutate: func(cfg *config.Config) { cfg.Dispatch.Trigger = "label"; cfg.Label = "archie:labelled" },
|
|
wantErr: false,
|
|
},
|
|
{
|
|
name: "valid repository policies",
|
|
kind: RepositoryPoliciesKind,
|
|
value: []config.Repo{{Owner: "acme", Name: "app", TestGlob: "**/*_test.go"}},
|
|
mutate: func(cfg *config.Config) {},
|
|
wantErr: false,
|
|
},
|
|
{
|
|
name: "malformed test glob",
|
|
kind: RepositoryPoliciesKind,
|
|
value: []config.Repo{{Owner: "acme", Name: "app", TestGlob: "["}},
|
|
mutate: func(cfg *config.Config) { cfg.Repos = []config.Repo{{Owner: "acme", Name: "app", TestGlob: "["}} },
|
|
wantErr: true,
|
|
},
|
|
{
|
|
// Both layers have to call a duplicate list invalid. When only the
|
|
// resource did, a config the file layer blessed left the daemon
|
|
// unbootable on a database-named error.
|
|
name: "duplicate repository",
|
|
kind: RepositoryPoliciesKind,
|
|
value: []config.Repo{{Owner: "acme", Name: "app"}, {Owner: "acme", Name: "app"}},
|
|
mutate: func(cfg *config.Config) {
|
|
cfg.Repos = []config.Repo{{Owner: "acme", Name: "app"}, {Owner: "acme", Name: "app"}}
|
|
},
|
|
wantErr: true,
|
|
},
|
|
{
|
|
name: "valid container runtime policies",
|
|
kind: ContainerRuntimePoliciesKind,
|
|
value: containerRuntimePolicies{Image: "archie-agent:test", PullPolicy: "missing"},
|
|
mutate: func(cfg *config.Config) {},
|
|
wantErr: false,
|
|
},
|
|
{
|
|
name: "agent profile with an empty tool name",
|
|
kind: AgentProfileKind,
|
|
value: map[string]agentProfile{
|
|
"net": {Tools: []string{""}},
|
|
},
|
|
mutate: func(cfg *config.Config) {
|
|
cfg.Containers.Profiles = map[string]config.AgentProfile{"net": {Tools: []string{""}}}
|
|
},
|
|
wantErr: true,
|
|
},
|
|
{
|
|
name: "credential binding with an empty service name",
|
|
kind: CredentialBindingsKind,
|
|
value: []credentialBinding{
|
|
{Service: "", Org: "acme"},
|
|
},
|
|
mutate: func(cfg *config.Config) {
|
|
cfg.Containers.Credentials = []config.CredentialBinding{{Service: "", Org: "acme"}}
|
|
},
|
|
wantErr: true,
|
|
},
|
|
{
|
|
name: "container runtime policies without an image",
|
|
kind: ContainerRuntimePoliciesKind,
|
|
value: containerRuntimePolicies{PullPolicy: "missing"},
|
|
mutate: func(cfg *config.Config) { cfg.Containers.Image = "" },
|
|
wantErr: true,
|
|
},
|
|
{
|
|
name: "negative container volume ttl",
|
|
kind: ContainerRuntimePoliciesKind,
|
|
value: containerRuntimePolicies{Image: "archie-agent:test", VolumeTTL: config.Duration(-time.Minute)},
|
|
mutate: func(cfg *config.Config) { cfg.Containers.VolumeTTL = config.Duration(-time.Minute) },
|
|
wantErr: true,
|
|
},
|
|
{
|
|
name: "provider base URL carrying userinfo",
|
|
kind: ProviderSettingsKind,
|
|
value: map[string]any{"acme": map[string]any{"class": "openai", "base_url": "https://user:pass@example.com"}},
|
|
mutate: func(cfg *config.Config) {
|
|
cfg.Providers = map[string]config.Provider{"acme": {Class: "openai", BaseURL: "https://user:pass@example.com"}}
|
|
},
|
|
wantErr: true,
|
|
},
|
|
}
|
|
|
|
for _, tt := range tests {
|
|
t.Run(tt.name, func(t *testing.T) {
|
|
cfg := validConfigForValidation()
|
|
tt.mutate(&cfg)
|
|
configErr := configuration.Validate(&cfg)
|
|
|
|
encoded, err := json.Marshal(tt.value)
|
|
if err != nil {
|
|
t.Fatal(err)
|
|
}
|
|
resourceErr := decodeResource(t, tt.kind, encoded)
|
|
|
|
if !tt.wantErr {
|
|
if configErr != nil {
|
|
t.Errorf("configuration.Validate = %v, want nil for a valid value", configErr)
|
|
}
|
|
if resourceErr != nil {
|
|
t.Errorf("%s Decode = %v, want nil for a valid value", tt.kind, resourceErr)
|
|
}
|
|
return
|
|
}
|
|
if configErr == nil {
|
|
t.Errorf("configuration.Validate accepted the value, want the effective document to reject it")
|
|
}
|
|
if resourceErr == nil {
|
|
t.Errorf("%s accepted the value, want the resource validator to reject what the effective document rejects", tt.kind)
|
|
}
|
|
})
|
|
}
|
|
}
|
|
|
|
// decodeResource runs the resource validator exactly as ImportConfig does when
|
|
// it seeds a kind from the file config (registry.go), against the production
|
|
// server the composition roots build (testServer).
|
|
func decodeResource(t *testing.T, kind string, encoded []byte) error {
|
|
t.Helper()
|
|
_, err := testServer(t, nil).definitions[kind].Decode(encoded)
|
|
return err
|
|
}
|
|
|
|
// validConfigForValidation is a document every check passes, so each case above
|
|
// fails only for the value it changes -- same fixture the configuration package
|
|
// uses, restated here because Validate documents that it does not apply
|
|
// defaults.
|
|
func validConfigForValidation() config.Config {
|
|
return config.Config{
|
|
BotUser: "archie-bot",
|
|
PollInterval: config.Duration(60 * time.Second),
|
|
Dispatch: config.Dispatch{Trigger: "assignee"},
|
|
Forge: config.Forge{Type: "none"},
|
|
Containers: config.ContainerConfig{Image: "ghcr.io/samcharles93/archie-agent:latest"},
|
|
Services: config.Services{config.ServiceNameGateway: {Target: "127.0.0.1:8585"}},
|
|
}
|
|
}
|