From 925dfb8f6f7695d96d56827514aa8523bb14ab02 Mon Sep 17 00:00:00 2001 From: Sam Catlow Date: Tue, 13 Oct 2026 15:58:51 +1100 Subject: [PATCH] fix(staterpc): an org-scoped caller cannot read or write another org's harness secret Issue: archie-core-jo15w --- .../staterpc/harness_org_test.go | 37 +++++++++++++++++++ internal/infrastructure/staterpc/server.go | 19 +++++++++- 2 files changed, 55 insertions(+), 1 deletion(-) create mode 100644 internal/infrastructure/staterpc/harness_org_test.go diff --git a/internal/infrastructure/staterpc/harness_org_test.go b/internal/infrastructure/staterpc/harness_org_test.go new file mode 100644 index 000000000..c2d838f81 --- /dev/null +++ b/internal/infrastructure/staterpc/harness_org_test.go @@ -0,0 +1,37 @@ +package staterpc + +import ( + "context" + "testing" + + "google.golang.org/grpc/codes" + "google.golang.org/grpc/status" + + "github.com/samcharles93/archie-core/internal/domain/org" +) + +func TestConfineHarnessOrg(t *testing.T) { + tests := []struct { + name string + scope org.OrgID + target string + denied bool + }{ + {"internal service names any org", "", "acme", false}, + {"org caller reads its own org", "acme", "acme", false}, + {"org caller cannot name another org", "acme", "other", true}, + {"system org operates the instance", org.DefaultOrgID, "other", false}, + } + for _, tt := range tests { + t.Run(tt.name, func(t *testing.T) { + ctx := context.Background() + if tt.scope != "" { + ctx = org.WithScope(ctx, tt.scope) + } + err := confineHarnessOrg(ctx, tt.target) + if denied := status.Code(err) == codes.PermissionDenied; denied != tt.denied { + t.Fatalf("denied = %v, want %v (err %v)", denied, tt.denied, err) + } + }) + } +} diff --git a/internal/infrastructure/staterpc/server.go b/internal/infrastructure/staterpc/server.go index 6c5348b1e..6c494726b 100644 --- a/internal/infrastructure/staterpc/server.go +++ b/internal/infrastructure/staterpc/server.go @@ -376,10 +376,23 @@ func (s *server) ListSteps(ctx context.Context, r *pb.ListStepsRequest) (*pb.Lis return &pb.ListStepsResponse{Steps: mapValues(steps, stepExecutionProto)}, nil } +// confineHarnessOrg refuses a harness secret request that names an org other +// than the one the caller is confined to. Internal services act unscoped and +// name the task's org; the system org operates the whole instance. +func confineHarnessOrg(ctx context.Context, target string) error { + if scope, ok := org.Scope(ctx); ok && !org.InstanceScope(ctx) && string(scope) != target { + return status.Error(codes.PermissionDenied, "harness secret belongs to another org") + } + return nil +} + func (s *server) GetHarnessSecret(ctx context.Context, r *pb.GetHarnessSecretRequest) (*pb.GetHarnessSecretResponse, error) { if s.deps.HarnessSecrets == nil { return nil, status.Error(codes.Unavailable, "harness secret store unavailable") } + if err := confineHarnessOrg(ctx, r.Org); err != nil { + return nil, err + } secret, err := s.deps.HarnessSecrets.GetHarnessSecret(ctx, r.Org, r.Service) if err != nil { return nil, s.logErr("GetHarnessSecret", err) @@ -391,7 +404,11 @@ func (s *server) PutHarnessSecret(ctx context.Context, r *pb.PutHarnessSecretReq if s.deps.HarnessSecrets == nil { return nil, status.Error(codes.Unavailable, "harness secret store unavailable") } - if err := s.deps.HarnessSecrets.PutHarnessSecret(ctx, harnessSecretValue(r.Secret)); err != nil { + value := harnessSecretValue(r.Secret) + if err := confineHarnessOrg(ctx, value.Org); err != nil { + return nil, err + } + if err := s.deps.HarnessSecrets.PutHarnessSecret(ctx, value); err != nil { return nil, s.logErr("PutHarnessSecret", err) } return &pb.PutHarnessSecretResponse{}, nil