Skip to content

Agent Mesh

remove premature optimization to save identities

Antonio Ojea0f253c5ec4e9
diff --git a/cmd/sam-node/middleware_test.go b/cmd/sam-node/middleware_test.go
index 235fc73b..ad238fd6 100644
--- a/cmd/sam-node/middleware_test.go
+++ b/cmd/sam-node/middleware_test.go
@@ -445,7 +445,7 @@ func TestVerifyEvent(t *testing.T) {
}
}
-func TestHandleAuthHandshakeCache(t *testing.T) {
+func TestVerifyBiscuitCache(t *testing.T) {
pub, priv, err := ed25519.GenerateKey(nil)
if err != nil {
t.Fatal(err)
@@ -474,39 +474,15 @@ func TestHandleAuthHandshakeCache(t *testing.T) {
cache, _ := lru.New[string, string](10)
- dir := t.TempDir()
- store, err := NewStore(dir)
- if err != nil {
- t.Fatal(err)
- }
- defer func() { _ = store.Close() }()
-
node := &SamNode{
trustedKeys: []TrustedKey{{Key: pub, ReceivedAt: time.Now()}},
verificationCache: cache,
- Store: store,
- }
-
- pr1, pw1 := io.Pipe()
-
- serverStream := &mockStream{r: pr1, w: io.Discard, protocol: api.AuthProtocolID, conn: &mockConn{remotePeer: dummyPeer}}
-
- go func() {
- node.HandleAuthHandshake(serverStream)
- }()
-
- writer := msgio.NewVarintWriter(pw1)
- envelope := &api.AuthFrame{Biscuit: tokenBytes}
- envelopeBytes, _ := proto.Marshal(envelope)
- if err := writer.WriteMsg(envelopeBytes); err != nil {
- t.Fatal(err)
}
- time.Sleep(1 * time.Second)
-
- _, err = store.GetVerifiedIdentity(dummyPeer)
+ // Case 1: Fresh verification (uncached)
+ _, err = node.verifyBiscuit(tokenBytes, dummyPeer)
if err != nil {
- t.Fatalf("Expected identity to be saved, got err: %v", err)
+ t.Fatalf("Expected verifyBiscuit to succeed, got err: %v", err)
}
tokenHash := sha256.Sum256(tokenBytes)
@@ -516,35 +492,16 @@ func TestHandleAuthHandshakeCache(t *testing.T) {
t.Fatal("Expected token to be in verification cache with correct key")
}
- // Now corrupt keys and try again.
+ // Case 2: Key rotation - corrupt keys and try again.
+ // Even if the token is in the cache, it should fail if the key that verified it is no longer trusted.
node.keysMu.Lock()
invalidKey := make([]byte, ed25519.PublicKeySize)
copy(invalidKey, []byte("invalid-key"))
node.trustedKeys = []TrustedKey{{Key: invalidKey, ReceivedAt: time.Now()}}
node.keysMu.Unlock()
- dir2 := t.TempDir()
- store2, _ := NewStore(dir2)
- defer func() { _ = store2.Close() }()
-
- node.Store = store2
-
- pr5, pw5 := io.Pipe()
- serverStream3 := &mockStream{r: pr5, w: io.Discard, protocol: api.AuthProtocolID, conn: &mockConn{remotePeer: dummyPeer}}
-
- go func() {
- node.HandleAuthHandshake(serverStream3)
- }()
-
- writer3 := msgio.NewVarintWriter(pw5)
- if err := writer3.WriteMsg(envelopeBytes); err != nil {
- t.Fatal(err)
- }
-
- time.Sleep(1 * time.Second)
-
- _, err = store2.GetVerifiedIdentity(dummyPeer)
+ _, err = node.verifyBiscuit(tokenBytes, dummyPeer)
if err == nil {
- t.Fatal("Expected identity to NOT be saved via cache hit with invalid key")
+ t.Fatal("Expected verifyBiscuit to FAIL after key rotation, but it succeeded")
}
}
diff --git a/cmd/sam-node/node.go b/cmd/sam-node/node.go
index 13d1dfe2..95adb6e1 100644
--- a/cmd/sam-node/node.go
+++ b/cmd/sam-node/node.go
@@ -551,27 +551,7 @@ func (n *SamNode) HandleAuthHandshake(s network.Stream) {
return
}
- // Query for the standard facts we mapped in the Hub
- // user_id, user_email, group, mesh_id
- // Note: We use the authorizer to extract these values from the Datalog state
- identity := VerifiedIdentity{
- RawBiscuit: exchange.Biscuit,
- // In a full implementation, you would use authorizer.Query()
- // to extract specific strings like user_id and group.
- NodeID: remotePeer.String(), // Placeholder for Datalog query result
- UserID: "extracted_id", // Placeholder for Datalog query result
- UserEmail: "extracted_email", // Placeholder for Datalog query result
- MeshID: "extracted_mesh", // Placeholder for Datalog query result
- }
-
- // 5. Save to the persistent session cache (BoltDB)
- // Once saved here, the ConnectionGater and Middleware will "recognize" this peer.
- if err := n.Store.SaveVerifiedIdentity(remotePeer, identity); err != nil {
- logger.Errorf("[AuthN] Store error for %s: %v", remotePeer, err)
- return
- }
-
- logger.Infof("[AuthN] Successfully authenticated peer %s (%s)", remotePeer, identity.UserEmail)
+ logger.Infof("[AuthN] Successfully authenticated peer %s", remotePeer)
}
func (n *SamNode) verifyBiscuit(biscuitData []byte, remotePeer peer.ID) (*biscuit.Biscuit, error) {
diff --git a/cmd/sam-node/store.go b/cmd/sam-node/store.go
index 83f56351..8ce4e406 100644
--- a/cmd/sam-node/store.go
+++ b/cmd/sam-node/store.go
@@ -20,8 +20,6 @@ import (
"os"
"path/filepath"
- "math/rand"
-
"github.com/libp2p/go-libp2p/core/peer"
"go.etcd.io/bbolt"
)
@@ -60,9 +58,6 @@ func NewStore(dir string) (*Store, error) {
if _, err := tx.CreateBucketIfNotExists([]byte(bucketIdentity)); err != nil {
return err
}
- if _, err := tx.CreateBucketIfNotExists([]byte(bucketVerifiedPeers)); err != nil {
- return err
- }
if _, err := tx.CreateBucketIfNotExists([]byte(bucketBannedPeers)); err != nil {
return err
}
@@ -165,18 +160,10 @@ func (s *Store) Close() error {
}
const (
- bucketVerifiedPeers = "verified_peers"
bucketBannedPeers = "banned_peers"
)
-// VerifiedIdentity is the "Visitor Badge" saved after Layer 3
-type VerifiedIdentity struct {
- NodeID string `json:"node"`
- UserID string `json:"user"`
- UserEmail string `json:"email"`
- MeshID string `json:"namespace"`
- RawBiscuit []byte `json:"raw_biscuit"`
-}
+
// IsBanned checks local store to see if this peer is banned.
func (s *Store) IsBanned(p peer.ID) bool {
@@ -194,50 +181,4 @@ func (s *Store) IsBanned(p peer.ID) bool {
return banned
}
-func (s *Store) SaveVerifiedIdentity(p peer.ID, identity VerifiedIdentity) error {
- return s.db.Update(func(tx *bbolt.Tx) error {
- b := tx.Bucket([]byte(bucketVerifiedPeers))
- if b == nil {
- var err error
- b, err = tx.CreateBucketIfNotExists([]byte(bucketVerifiedPeers))
- if err != nil {
- return err
- }
- }
- // Enforce bound
- keyN := b.Stats().KeyN
- if keyN >= 10000 {
- // Delete a random entry to be fair
- randIdx := rand.Intn(keyN)
- c := b.Cursor()
- k, _ := c.First()
- for i := 0; i < randIdx && k != nil; i++ {
- k, _ = c.Next()
- }
- if k != nil {
- if err := b.Delete(k); err != nil {
- return err
- }
- }
- }
-
- data, _ := json.Marshal(identity)
- return b.Put([]byte(p.String()), data)
- })
-}
-func (s *Store) GetVerifiedIdentity(p peer.ID) (*VerifiedIdentity, error) {
- var identity VerifiedIdentity
- err := s.db.View(func(tx *bbolt.Tx) error {
- b := tx.Bucket([]byte(bucketVerifiedPeers))
- if b == nil {
- return fmt.Errorf("peer auth store is not initialized")
- }
- data := b.Get([]byte(p.String()))
- if data == nil {
- return fmt.Errorf("peer not authenticated")
- }
- return json.Unmarshal(data, &identity)
- })
- return &identity, err
-}