diff --git a/internal/nodegrant/testdata/node.json b/internal/nodegrant/testdata/node.json index 0270797c..46b12cd7 100644 --- a/internal/nodegrant/testdata/node.json +++ b/internal/nodegrant/testdata/node.json @@ -116,6 +116,15 @@ "$SRV.PING.node-tools.NODE", "mesh.control.NODE.>", "mesh.seat.mesh-catalog.call.entry.node~NODE", + "mesh.seat.mesh-catalog.call.module.node~NODE", + "mesh.seat.container-image-registry.call.versions.node~NODE", + "mesh.seat.mesh-catalog.call.revision.node~NODE", + "mesh.seat.mesh-grants.call.withheld.node~NODE", + "mesh.seat.mesh-module-assigner.call.assignments.node~NODE", + "mesh.seat.mesh-recovery.call.kept-points.node~NODE", + "mesh.seat.mesh-recovery.call.restore-kept.node~NODE", + "mesh.seat.mesh-recovery.call.snapshot-kept.node~NODE", + "mesh.seat.oci-artifact-registry.call.versions.node~NODE", "mesh.seat.mesh-catalog.call.seat-definitions.node~NODE", "mesh.seat.node-backup.call.backed-up.NODE.node~NODE", "mesh.seat.node-backup.call.now.NODE.node~NODE", diff --git a/internal/selfcompose/selfcompose_test.go b/internal/selfcompose/selfcompose_test.go index aa32d999..3b7209fb 100644 --- a/internal/selfcompose/selfcompose_test.go +++ b/internal/selfcompose/selfcompose_test.go @@ -96,6 +96,58 @@ func (b *fakeBus) put(t *testing.T, bucket, key string, value []byte) { b.send(bucket, agent.Update{Key: key, Value: value}) } +// Design 47 G A-461c: the golden node grant (called from the test of what the node reads under it) is checked against the node-engine's manifest. Every seat verb it invokes has its +// call subject in the grant, in the form the grants part writes: a grant to call a seat's verb is `mesh.seat..tool.` +// and `.tool..*` (mesh-grants internal/buscompose nats.go:1960-1969, invokedSubjects), and each is also written under the +// `call` kind with the caller's own token last (callers.go:75-91, calledPublish; the token is the user with each dot a `~`): +// `mesh.seat..call..node~` and `mesh.seat..call..*.node~`. A verb of a seat held per node +// may be granted for the one node, `.call...node~`, which is the same grant in the node's own form. A verb the +// composer asks that the golden grant lacks is refused in the real bus and hangs the pass to its bound (the verb module, #233). +func checkGrantHoldsEveryInvokedVerb(t *testing.T) { + t.Helper() + raw, err := os.ReadFile("../../module.json") + if err != nil { + t.Fatal(err) + } + var m struct { + Invokes []json.RawMessage `json:"invokes"` + } + if err := json.Unmarshal(raw, &m); err != nil { + t.Fatal(err) + } + p := nodegrant.For("it1") + seen := 0 + for _, r := range m.Invokes { + var verb string + if json.Unmarshal(r, &verb) != nil { + var o struct { + Verb string `json:"verb"` + } + if err := json.Unmarshal(r, &o); err != nil { + t.Fatal(err) + } + verb = o.Verb + } + rest, isSeat := strings.CutPrefix(verb, "seat:") + if !isSeat { + continue + } + seat, name, ok := strings.Cut(rest, ".") + if !ok { + t.Fatalf("the invoke %q names no verb", verb) + } + seen++ + base := "mesh.seat." + seat + ".call." + name + "." + forms := []string{base + "node~it1", base + "*.node~it1", base + "it1.node~it1"} + if !slices.ContainsFunc(forms, func(f string) bool { return slices.Contains(p.Publish, f) }) { + t.Errorf("the node's grant holds no call subject for %s: want one of %v", verb, forms) + } + } + if seen == 0 { + t.Fatal("the manifest invokes no seat verb: the test reads nothing") + } +} + // grantAllows says whether the node's grant (the grants part's, nodegrant.For) lets it watch or read pattern of // bucket: the consumer a watch or a get makes (`$JS.API.CONSUMER.CREATE.KV_..$KV..`) // and the stream's information, matched as the bus matches a permission against a subject. @@ -1553,6 +1605,7 @@ func TestTheNodeComposesItsWantsFromTheBus(t *testing.T) { if got, err := r.Served(ctx, "n2", "mailer", []string{"domain"}); err != nil || fmt.Sprint(got) != "map[domain:example.org]" { t.Errorf("what n2's mailer serves: %v, %v", got, err) } + checkGrantHoldsEveryInvokedVerb(t) // A-461c served := nodegrant.For("n1", "n2.mailer.domain") b.mu.Lock() for _, read := range b.reads {