Agent Mesh
Go a2aa2a-protocolagent-meshagentic-aiinferencemcpmeshmesh-networknetwork-securitynetworking-aip2p-network
node: enforce biscuit expiration in SamNode.Authorize
Antonio Ojeaefb2fc0e06c8
diff --git a/internal/node/mcp_handlers_test.go b/internal/node/mcp_handlers_test.goindex 9b345725..abfefef9 100644--- a/internal/node/mcp_handlers_test.go+++ b/internal/node/mcp_handlers_test.go@@ -48,6 +48,12 @@ func buildAndSaveBiscuit(node *SamNode, rootPriv ed25519.PrivateKey) error {}}); err != nil {return err}+ if err := builder.AddAuthorityFact(biscuit.Fact{Predicate: biscuit.Predicate{+ Name: api.FactExpiration,+ IDs: []biscuit.Term{biscuit.Date(time.Now().Add(time.Hour))},+ }}); err != nil {+ return err+ }bisc, err := builder.Build()if err != nil {return err@@ -454,6 +460,12 @@ func buildAndSaveCustomBiscuit(node *SamNode, rootPriv ed25519.PrivateKey, allowreturn err}}+ if err := builder.AddAuthorityFact(biscuit.Fact{Predicate: biscuit.Predicate{+ Name: api.FactExpiration,+ IDs: []biscuit.Term{biscuit.Date(time.Now().Add(time.Hour))},+ }}); err != nil {+ return err+ }bisc, err := builder.Build()if err != nil {return errdiff --git a/internal/node/middleware.go b/internal/node/middleware.goindex b41ac712..add58684 100644--- a/internal/node/middleware.go+++ b/internal/node/middleware.go@@ -19,6 +19,7 @@ import ("fmt""runtime/debug""sync/atomic"+ "time""github.com/biscuit-auth/biscuit-go/v2""github.com/google/sam/api"@@ -262,6 +263,15 @@ func (n *SamNode) Authorize(rawToken []byte, req RequestContext, pubKey ed25519.// Enforce client_peer_id matches connection_peer_idauthorizer.AddCheck(api.BaselineReplayCheck)+ // Inject the current time and enforce expiration, matching identity.VerifyBiscuit.+ authorizer.AddFact(biscuit.Fact{+ Predicate: biscuit.Predicate{+ Name: api.FactTime,+ IDs: []biscuit.Term{biscuit.Date(time.Now())},+ },+ })+ authorizer.AddCheck(api.ControlPlaneStaticTimeCheck)+// Inject facts from our own identity token to support target matchingif err := n.injectIdentityFacts(authorizer, pubKey); err != nil {return fmt.Errorf("failed to inject target facts: %w", err)diff --git a/internal/node/middleware_test.go b/internal/node/middleware_test.goindex 7f53f6ef..7befbed1 100644--- a/internal/node/middleware_test.go+++ b/internal/node/middleware_test.go@@ -140,6 +140,14 @@ func TestAuthorize(t *testing.T) {t.Fatal(err)}+ err = builder.AddAuthorityFact(biscuit.Fact{Predicate: biscuit.Predicate{+ Name: api.FactExpiration,+ IDs: []biscuit.Term{biscuit.Date(time.Now().Add(time.Hour))},+ }})+ if err != nil {+ t.Fatal(err)+ }+b, err := builder.Build()if err != nil {t.Fatal(err)@@ -166,6 +174,80 @@ func TestAuthorize(t *testing.T) {}}+// TestAuthorizeRejectsExpiredBiscuit reproduces #296: SamNode.Authorize did not+// inject the time(now) fact nor the ControlPlaneStaticTimeCheck, so an expired+// biscuit that would be rejected by identity.VerifyBiscuit was still accepted+// on the node dataplane.+func TestAuthorizeRejectsExpiredBiscuit(t *testing.T) {+ dir, err := os.MkdirTemp("", "middleware-test")+ if err != nil {+ t.Fatal(err)+ }+ defer func() {+ _ = os.RemoveAll(dir)+ }()++ store, err := NewStore(dir)+ if err != nil {+ t.Fatal(err)+ }+ defer func() {+ _ = store.Close()+ }()++ pub, priv, err := ed25519.GenerateKey(nil)+ if err != nil {+ t.Fatal(err)+ }++ dummyPeer := peer.ID("dummy-peer")++ builder := biscuit.NewBuilder(priv)+ _ = builder.AddAuthorityFact(biscuit.Fact{Predicate: biscuit.Predicate{Name: api.FactTargetUnrestricted}})+ _ = builder.AddAuthorityFact(biscuit.Fact{Predicate: biscuit.Predicate{+ Name: "node",+ IDs: []biscuit.Term{biscuit.String(dummyPeer.String())},+ }})+ _ = builder.AddAuthorityFact(biscuit.Fact{Predicate: biscuit.Predicate{+ Name: api.FactClientPeerID,+ IDs: []biscuit.Term{biscuit.String(dummyPeer.String())},+ }})+ _ = builder.AddAuthorityFact(biscuit.Fact{Predicate: biscuit.Predicate{+ Name: api.FactGrantedServiceExact,+ IDs: []biscuit.Term{biscuit.String(api.SystemNamespace), biscuit.String("/test/proto")},+ }})+ // Expired an hour ago.+ _ = builder.AddAuthorityFact(biscuit.Fact{Predicate: biscuit.Predicate{+ Name: api.FactExpiration,+ IDs: []biscuit.Term{biscuit.Date(time.Now().Add(-time.Hour))},+ }})++ b, err := builder.Build()+ if err != nil {+ t.Fatal(err)+ }++ tokenBytes, err := b.Serialize()+ if err != nil {+ t.Fatal(err)+ }++ node := &SamNode{+ Store: store,+ trustedKeys: []TrustedKey{{Key: pub, ReceivedAt: time.Now()}},+ BiscuitTimeout: 500 * time.Millisecond,+ }++ req := RequestContext{+ PeerID: dummyPeer,+ Protocol: "/test/proto",+ }++ if err := node.Authorize(tokenBytes, req, pub); err == nil {+ t.Fatal("Authorize succeeded with an expired biscuit; expiration is not enforced on the node dataplane")+ }+}+func TestBaselineRules(t *testing.T) {pub, priv, err := ed25519.GenerateKey(nil)if err != nil {@@ -274,6 +356,10 @@ func TestBaselineRules(t *testing.T) {Name: "node",IDs: []biscuit.Term{biscuit.String(dummyPeer.String())},}})+ _ = builder.AddAuthorityFact(biscuit.Fact{Predicate: biscuit.Predicate{+ Name: api.FactExpiration,+ IDs: []biscuit.Term{biscuit.Date(time.Now().Add(time.Hour))},+ }})// For the happy paths, add the matching client_peer_idif tt.name != "Baseline Replay Check Rejection: mismatched peer ID" {@@ -417,6 +503,14 @@ attenuation:t.Fatal(err)}+ err = builder.AddAuthorityFact(biscuit.Fact{Predicate: biscuit.Predicate{+ Name: api.FactExpiration,+ IDs: []biscuit.Term{biscuit.Date(time.Now().Add(time.Hour))},+ }})+ if err != nil {+ t.Fatal(err)+ }+tt.mintToken(t, builder)b, err := builder.Build()@@ -572,6 +666,7 @@ func TestWithBiscuitAuth_MutualBiscuit(t *testing.T) {{Predicate: biscuit.Predicate{Name: "client_peer_id", IDs: []biscuit.Term{biscuit.String(clientPeer.String())}}},{Predicate: biscuit.Predicate{Name: "granted_service_all_types"}},{Predicate: biscuit.Predicate{Name: "target_unrestricted"}},+ {Predicate: biscuit.Predicate{Name: api.FactExpiration, IDs: []biscuit.Term{biscuit.Date(time.Now().Add(time.Hour))}}},} {if err := builder.AddAuthorityFact(f); err != nil {t.Fatal(err)@@ -793,6 +888,10 @@ func TestMiddlewareTargetChecks(t *testing.T) {Name: api.FactNode,IDs: []biscuit.Term{biscuit.String(dummyPeer.String())},}})+ _ = builder.AddAuthorityFact(biscuit.Fact{Predicate: biscuit.Predicate{+ Name: api.FactExpiration,+ IDs: []biscuit.Term{biscuit.Date(time.Now().Add(time.Hour))},+ }})// Allow exact servicefactStr := fmt.Sprintf(`%s("mcp", "test_tool")`, api.FactGrantedServiceExact)fact, _ := parser.FromStringFact(factStr)