The node's composer asks the vault's own for its modules' secrets sealed to its key, and keeps a value first had while its generation stands; two agent tests folded to hold the count (issue 1126, ADR 0550 §5)

internal/selfcompose/selfcompose_test.go

@@ -2,6 +2,8 @@ package selfcompose
 
 import (
 	"context"
+	"encoding/json"
+	"fmt"
 	"strings"
 	"sync"
 	"testing"
@@ -84,14 +86,24 @@ func TestTheNodeComposesItsWantsFromTheBus(t *testing.T) {
 
 	ctx, cancel := context.WithCancel(context.Background())
 	defer cancel()
-	c := New(b.env())
+	env := b.env()
+	// The vault's own: keeper's password sealed to n1's key, sealed again (other bytes) at every ask.
+	var asks, generation int
+	env.Own = func(context.Context) (json.RawMessage, error) {
+		b.mu.Lock()
+		defer b.mu.Unlock()
+		asks++
+		return json.RawMessage(fmt.Sprintf(`{"node":"n1","key":"sk","own":[{"module":"keeper","name":"password","origin":"made",`+
+			`"generation":%d,"sealed":{"ask":%d}}]}`, generation+1, asks)), nil
+	}
+	c := New(env)
 	out, err := c.Watch(ctx, "n1.>")
 	if err != nil {
 		t.Fatal(err)
 	}
 	place, _ := delivery.EncodePlacement(delivery.Placement{Node: "n1", Decided: delivery.NodeDecided{Hub: true, Address: "10.77.0.1"},
 		Modules: []delivery.PlacedModule{{Module: "lemurs"}}})
-	have, _ := delivery.EncodeHaveNode(delivery.HaveNode{Record: &delivery.NodeRecord{Node: "n1", TunnelKey: "k", Capabilities: []string{"systemd"}}})
+	have, _ := delivery.EncodeHaveNode(delivery.HaveNode{Record: &delivery.NodeRecord{Node: "n1", TunnelKey: "k", SealingKey: "sk", Capabilities: []string{"systemd"}}})
 	mod, _ := delivery.EncodeModule(delivery.Module{FP2: fp, Manifest: digest, Repository: "novox/x", Commit: "c"})
 	want, _ := delivery.EncodeWant(delivery.Want{FP: fp})
 	nodeWant, _ := delivery.EncodeNodeWant(delivery.NodeWant{})
@@ -156,4 +168,44 @@ func TestTheNodeComposesItsWantsFromTheBus(t *testing.T) {
 	if n != 1 {
 		t.Errorf("the fault was said %d times, want once: %v", n, b.said)
 	}
+
+	// An own secret comes sealed from the vault into the composition; sealed again at the same generation it is the value
+	// first had, so nothing is handed again; a new generation is handed.
+	b.put(t, delivery.AssignerWantsBucket, "want.n1.lemurs", want)
+	if u := next(t, out); u.Key != lemursKey {
+		t.Fatalf("lemurs wanted back handed %s", u.Key)
+	}
+	keeper := `{"module":"keeper","version":"1","own-secrets":{"password":"/var/lib/mesh/keeper/password"},` +
+		`"resources":[{"id":"state","type":"directory","path":"/var/lib/mesh/keeper","mode":"0700"}]}`
+	kdigest := delivery.ManifestDigest([]byte(keeper))
+	kman, _ := delivery.EncodeManifest(delivery.Manifest{Module: "keeper", JSON: keeper})
+	kkey, _ := delivery.ManifestsKey(kdigest)
+	b.mu.Lock()
+	b.kv[delivery.ManifestsBucket+"/"+kkey] = kman
+	b.mu.Unlock()
+	kmod, _ := delivery.EncodeModule(delivery.Module{FP2: fp, Manifest: kdigest, Repository: "novox/k", Commit: "c"})
+	both, _ := delivery.EncodePlacement(delivery.Placement{Node: "n1", Decided: delivery.NodeDecided{Hub: true, Address: "10.77.0.1"},
+		Modules: []delivery.PlacedModule{{Module: "lemurs"}, {Module: "keeper"}}})
+	b.put(t, delivery.ModulesBucket, "keeper", kmod)
+	b.put(t, delivery.PlacementBucket, "placement.n1", both)
+	b.put(t, delivery.AssignerWantsBucket, "want.n1.keeper", want)
+	keeperKey, _ := delivery.ComposedKey("n1", "keeper", fp)
+	var handed string
+	for handed == "" {
+		if u := next(t, out); u.Key == keeperKey {
+			handed = string(u.Value)
+		}
+	}
+	if !strings.Contains(handed, `{\"ask\":`) {
+		t.Fatalf("keeper's composition does not carry the sealed value: %s", handed)
+	}
+	b.put(t, ResolvedBucket, "n1.other.k", []byte(`{"value":2}`))
+	quiet(t, out)
+	b.mu.Lock()
+	generation++
+	b.mu.Unlock()
+	b.put(t, ResolvedBucket, "n1.other.k", []byte(`{"value":3}`))
+	if u := next(t, out); u.Key != keeperKey {
+		t.Fatalf("a new generation handed %s, want keeper again", u.Key)
+	}
 }