diff --git a/internal/nodegrant/nodegrant_test.go b/internal/nodegrant/nodegrant_test.go index 6e1de5b8..2841941a 100644 --- a/internal/nodegrant/nodegrant_test.go +++ b/internal/nodegrant/nodegrant_test.go @@ -1,19 +1,60 @@ package nodegrant import ( + "encoding/json" + "os" "slices" + "strings" "testing" ) -// Design 47 G A-461b: the node asks the seat mesh-catalog's verbs entry, module and seat-definitions through the seat's call -// subjects, so its grant holds each; a grant without one makes that call hang until the node's own bound (the verb module was -// declared in the manifest but missing here, which held the node-engine's integration tests for 58 s). -func TestTheNodeGrantHoldsTheCatalogVerbsTheComposerAsks(t *testing.T) { +// Design 47 G A-461c: the golden node grant 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 TestTheNodeGrantHoldsTheCallSubjectOfEveryVerbTheManifestInvokes(t *testing.T) { + 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 := For("it1") - for _, verb := range []string{"entry", "module", "seat-definitions"} { - want := "mesh.seat.mesh-catalog.call." + verb + ".node~it1" - if !slices.Contains(p.Publish, want) { - t.Errorf("the node's grant does not publish to %s", want) + 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") + } } diff --git a/internal/nodegrant/testdata/node.json b/internal/nodegrant/testdata/node.json index 70cea869..46b12cd7 100644 --- a/internal/nodegrant/testdata/node.json +++ b/internal/nodegrant/testdata/node.json @@ -117,6 +117,14 @@ "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",