Skip to content

Agent Mesh

fix(node): build router-auth authorizer from the key that verified

Antonio Ojea807100b43424
diff --git a/internal/node/enroll_test.go b/internal/node/enroll_test.go
index ca6e8fbb..d4afd929 100644
--- a/internal/node/enroll_test.go
+++ b/internal/node/enroll_test.go
@@ -189,6 +189,15 @@ func TestStartRecoversStaleIdentityViaRefreshToken(t *testing.T) {
t.Fatal(err)
}
+ // A decoy key ahead of the real one: the router handshake must build its
+ // authorizer from the key that verified, not from trustedKeys[0].
+ decoyKey, _, _ := ed25519.GenerateKey(nil)
+ if err := store.SaveTrustedKeys([]TrustedKey{
+ {Key: decoyKey, ReceivedAt: time.Now()},
+ }); err != nil {
+ t.Fatal(err)
+ }
+
node, err := NewSamNode(Options{
PrivKey: privKey,
Store: store,
diff --git a/internal/node/node.go b/internal/node/node.go
index dab2b2b1..662c826d 100644
--- a/internal/node/node.go
+++ b/internal/node/node.go
@@ -903,13 +903,15 @@ func (n *SamNode) performRouterAuthHandshake(s network.Stream, biscuitBytes []by
}
// Verify the router's biscuit using the control plane keys
- b, err := identity.VerifyBiscuit(resp.Biscuit, expectedRouter, trustedKeys, n.BiscuitTimeout)
+ b, verifiedKey, err := identity.VerifyBiscuitAndGetKey(resp.Biscuit, expectedRouter, trustedKeys, n.BiscuitTimeout)
if err != nil {
return false, fmt.Errorf("%w: failed to verify router biscuit: %w", ErrFatalAuth, err)
}
- // Enforce role("router") inside the biscuit
- authorizer, err := b.Authorizer(trustedKeys[0], identity.AuthorizerOptions(n.BiscuitTimeout)...)
+ // Enforce role("router") inside the biscuit, under the key that verified:
+ // with several valid keys loaded (rotation grace) the first is not
+ // necessarily the signer.
+ authorizer, err := b.Authorizer(verifiedKey, identity.AuthorizerOptions(n.BiscuitTimeout)...)
if err != nil {
return false, fmt.Errorf("authorizer instantiation failed: %w", err)
}