Agent Mesh
Go a2aa2a-protocolagent-meshagentic-aiinferencemcpmeshmesh-networknetwork-securitynetworking-aip2p-network
security: make OIDCClaimToFact map read-only using maps.Clone, resolving concurrency and bypass vulnerabilities
Antonio Ojea620a931e5890
diff --git a/api/constants.go b/api/constants.goindex f0703e4f..8a11e562 100644--- a/api/constants.go+++ b/api/constants.go@@ -14,7 +14,11 @@package api-import "github.com/libp2p/go-libp2p/core/protocol"+import (+ "maps"++ "github.com/libp2p/go-libp2p/core/protocol"+)const EnrollProtocolID protocol.ID = "/sam/enroll/1.0.0"const MCPProtocolID protocol.ID = "/sam/mcp/1.0.0"@@ -37,7 +41,7 @@ const (FactNetworkTarget = "allow_network_target")-// OIDCClaimToFact maps standard OIDC claims to their corresponding Biscuit facts.+// oidcClaimToFact maps standard OIDC claims to their corresponding Biscuit facts.//// Specification References:// - OIDC Claims: Standard JWT payload claims are defined in OpenID Connect Core 1.0 section 5.1:@@ -48,12 +52,18 @@ const (// How to add a new translation:// 1. Define a constant for the Biscuit fact name in the "Biscuit fact names" block above// (e.g., FactMyNewClaim = "my_new_fact").-// 2. Add an entry to the OIDCClaimToFact map below (e.g., "my_oidc_claim": FactMyNewClaim).+// 2. Add an entry to the oidcClaimToFact map below (e.g., "my_oidc_claim": FactMyNewClaim).// 3. Update translateClaimsToFacts in cmd/sam-hub/biscuit.go to handle parsing/type conversion// for the new fact if it uses a custom format (e.g. integer, date, list).// 4. Implement unit tests in cmd/sam-hub/biscuit_test.go covering the new mapping.-var OIDCClaimToFact = map[string]string{+var oidcClaimToFact = map[string]string{"sub": FactUser,"email": FactEmail,"groups": FactGroup,}++// OIDCClaimToFact returns a copy of the OIDC claims to Biscuit facts map.+// This ensures that the global map is immutable and thread-safe for concurrent readers.+func OIDCClaimToFact() map[string]string {+ return maps.Clone(oidcClaimToFact)+}diff --git a/cmd/sam-hub/biscuit.go b/cmd/sam-hub/biscuit.goindex 0026e62b..3f638294 100644--- a/cmd/sam-hub/biscuit.go+++ b/cmd/sam-hub/biscuit.go@@ -225,14 +225,15 @@ func (h *Hub) verifyBiscuit(biscuitData []byte, remotePeer peer.ID) (*biscuit.Bi}func translateClaimsToFacts(builder biscuit.Builder, claims map[string]any) error {- keys := make([]string, 0, len(api.OIDCClaimToFact))- for k := range api.OIDCClaimToFact {+ claimMap := api.OIDCClaimToFact()+ keys := make([]string, 0, len(claimMap))+ for k := range claimMap {keys = append(keys, k)}sort.Strings(keys)for _, claimKey := range keys {- factName := api.OIDCClaimToFact[claimKey]+ factName := claimMap[claimKey]val, ok := claims[claimKey]if !ok || val == nil {continuediff --git a/cmd/sam-hub/biscuit_test.go b/cmd/sam-hub/biscuit_test.goindex 0b9c5e95..df9e9b34 100644--- a/cmd/sam-hub/biscuit_test.go+++ b/cmd/sam-hub/biscuit_test.go@@ -16,6 +16,7 @@ package mainimport ("path/filepath"+ "sync""testing""time"@@ -587,3 +588,61 @@ func TestMintBiscuitToken_VariousClaimsTypes(t *testing.T) {})}}++func TestVerifyBiscuit_Concurrent(t *testing.T) {+ dir := t.TempDir()+ dbPath := filepath.Join(dir, "test.db")++ kr, err := NewKeyRing(dbPath, 24*time.Hour, nil)+ if err != nil {+ t.Fatal(err)+ }+ defer func() { _ = kr.Close() }()++ hub := &Hub{+ KeyRing: kr,+ Policy: &api.PolicyConfig{},+ BiscuitTimeout: 500 * time.Millisecond,+ }++ priv, _, err := crypto.GenerateKeyPair(crypto.Ed25519, -1)+ if err != nil {+ t.Fatal(err)+ }+ dummyPeer, err := peer.IDFromPrivateKey(priv)+ if err != nil {+ t.Fatal(err)+ }++ token := &oidc.IDToken{+ Expiry: time.Now().Add(1 * time.Hour),+ }+ claims := jwt.MapClaims{+ "sub": "user-123",+ "roles": []any{"admin"},+ }++ biscuitData, err := hub.mintBiscuitToken(claims, token, dummyPeer)+ if err != nil {+ t.Fatalf("mintBiscuitToken failed: %v", err)+ }++ // Spin up 50 goroutines performing verification concurrently to detect any data races on static check/policy globals+ const workers = 50+ var wg sync.WaitGroup+ wg.Add(workers)++ for i := 0; i < workers; i++ {+ go func() {+ defer wg.Done()+ for j := 0; j < 100; j++ {+ _, err := hub.verifyBiscuit(biscuitData, dummyPeer)+ if err != nil {+ t.Errorf("Concurrent verification failed: %v", err)+ return+ }+ }+ }()+ }+ wg.Wait()+}