Agent Mesh
Go a2aa2a-protocolagent-meshagentic-aiinferencemcpmeshmesh-networknetwork-securitynetworking-aip2p-network
fix(node): prevent store close race in control plane sync loop
Antonio Ojeafcfe69362a5e
diff --git a/internal/node/controlplane.go b/internal/node/controlplane.goindex f2ce3248..14a8e661 100644--- a/internal/node/controlplane.go+++ b/internal/node/controlplane.go@@ -48,10 +48,12 @@ func (n *SamNode) controlPlane(controlPlaneURL string) *cpclient.Client {}priv := n.config.PrivKeyif priv == nil && n.Store != nil {- if kb, err := n.Store.LoadKey(); err == nil && len(kb) > 0 {- priv, _ = crypto.UnmarshalPrivateKey(kb)- } else {- priv = GetOrGenerateKey(n.Store)+ if kb, err := n.Store.LoadKey(); err == nil {+ if len(kb) > 0 {+ priv, _ = crypto.UnmarshalPrivateKey(kb)+ } else {+ priv = GetOrGenerateKey(n.Store)+ }}}if priv != nil {diff --git a/internal/node/controlplane_test.go b/internal/node/controlplane_test.goindex 5c7e4154..ef0cb514 100644--- a/internal/node/controlplane_test.go+++ b/internal/node/controlplane_test.go@@ -384,11 +384,12 @@ func TestControlPlaneSyncLoop(t *testing.T) {t.Fatal(err)}+ priv := GetOrGenerateKey(store)n := &SamNode{Store: store,trustedKeys: []TrustedKey{{Key: oldPub, ReceivedAt: time.Now()}},controlPlaneSyncTrigger: make(chan struct{}, 1),- config: Options{ControlPlaneSyncJitter: time.Millisecond},+ config: Options{PrivKey: priv, ControlPlaneSyncJitter: time.Millisecond},}n.SetIdentityCache([]byte("identity"))ctx, cancel := context.WithCancel(context.Background())diff --git a/internal/node/enroll.go b/internal/node/enroll.goindex fad67434..67f55bcb 100644--- a/internal/node/enroll.go+++ b/internal/node/enroll.go@@ -50,25 +50,29 @@ func expireUnix(t *timestamppb.Timestamp) int64 {// GetOrGenerateKey retrieves a persistent private key or creates one if it's the first runfunc GetOrGenerateKey(s *Store) crypto.PrivKey {- kb, _ := s.LoadKey()- if len(kb) == 0 {- logger.Info("[Store] Generating new Peer Identity...")- priv, _, err := crypto.GenerateKeyPair(crypto.Ed25519, -1)- if err != nil {- logger.Fatalf("Failed to generate key: %v", err)- }- raw, err := crypto.MarshalPrivateKey(priv)- if err != nil {- logger.Fatalf("Failed to marshal private key: %v", err)- }- if err := s.SaveKey(raw); err != nil {- logger.Fatalf("Failed to save key: %v", err)+ kb, err := s.LoadKey()+ if err == nil && len(kb) > 0 {+ priv, unmarshalErr := crypto.UnmarshalPrivateKey(kb)+ if unmarshalErr != nil {+ logger.Fatalf("Corrupt key in store: %v", unmarshalErr)}return priv}- priv, err := crypto.UnmarshalPrivateKey(kb)+ logger.Info("[Store] Generating new Peer Identity...")+ priv, _, genErr := crypto.GenerateKeyPair(crypto.Ed25519, -1)+ if genErr != nil {+ logger.Fatalf("Failed to generate key: %v", genErr)+ }if err != nil {- logger.Fatalf("Corrupt key in store: %v", err)+ logger.Warnf("Skipping key persistence because store is unavailable: %v", err)+ return priv+ }+ raw, marshalErr := crypto.MarshalPrivateKey(priv)+ if marshalErr != nil {+ logger.Fatalf("Failed to marshal private key: %v", marshalErr)+ }+ if saveErr := s.SaveKey(raw); saveErr != nil {+ logger.Warnf("Failed to save key: %v", saveErr)}return priv}