Agent Mesh
Go a2aa2a-protocolagent-meshagentic-aiinferencemcpmeshmesh-networknetwork-securitynetworking-aip2p-network
address reviews
Antonio Ojea22eb562feb57
diff --git a/cmd/sam-node/connection_monitor.go b/cmd/sam-node/connection_monitor.goindex 7c72ae79..42c9af47 100644--- a/cmd/sam-node/connection_monitor.go+++ b/cmd/sam-node/connection_monitor.go@@ -8,7 +8,6 @@ import (type hubConnectionManager interface {IsConnected() bool- HubPeerIDString() stringLoadHubConfig() ([]byte, []string, error)ConnectAndAuthWithHub(ctx context.Context, addr multiaddr.Multiaddr) errorLoadHubURL() (string, error)@@ -33,7 +32,7 @@ func checkHubConnection(ctx context.Context, mgr hubConnectionManager) (stable breturn true, false}- logger.Warnf("[Monitor] Disconnected from Hub %s. Attempting to reconnect...", mgr.HubPeerIDString())+ logger.Warn("[Monitor] Disconnected from Hub. Attempting to reconnect...")var p2pAddrs []multiaddr.Multiaddrif _, storedAddrs, err := mgr.LoadHubConfig(); err == nil {diff --git a/cmd/sam-node/connection_monitor_test.go b/cmd/sam-node/connection_monitor_test.goindex 75eaf622..15369821 100644--- a/cmd/sam-node/connection_monitor_test.go+++ b/cmd/sam-node/connection_monitor_test.go@@ -28,10 +28,6 @@ func (m *mockHubConnectionManager) IsConnected() bool {return m.connected}-func (m *mockHubConnectionManager) HubPeerIDString() string {- return m.peerID-}-func (m *mockHubConnectionManager) LoadHubConfig() ([]byte, []string, error) {return nil, m.storedAddrs, m.hubConfigErr}diff --git a/cmd/sam-node/node.go b/cmd/sam-node/node.goindex 3899cabb..312d8a0c 100644--- a/cmd/sam-node/node.go+++ b/cmd/sam-node/node.go@@ -115,6 +115,7 @@ type SamNode struct {PubSub *pubsub.PubSubStore *StoreHubPeerID peer.ID+ authenticatedHubs map[peer.ID]boolpeerLastEventTime map[string]int64receivedMsgs map[string][]stringtopics map[string]*pubsub.Topic@@ -166,7 +167,7 @@ func stripP2pFromDnsaddr(addr multiaddr.Multiaddr) multiaddr.Multiaddr {parts := multiaddr.Split(addr)var components []multiaddr.Multiaddrerfor _, p := range parts {- if p.Protocol().Code != multiaddr.P_P2P {+ if _, err := p.ValueForProtocol(multiaddr.P_P2P); err != nil {components = append(components, multiaddr.Multiaddr{p})}}@@ -219,6 +220,7 @@ func NewSamNode(ctx context.Context, cfg SamNodeConfig) (*SamNode, error) {peerLastEventTime: make(map[string]int64),receivedMsgs: make(map[string][]string),topics: make(map[string]*pubsub.Topic),+ authenticatedHubs: make(map[peer.ID]bool),LocalPolicy: cfg.NodeConfig,AllowLoopback: cfg.AllowLoopback,TrustHubRBAC: cfg.TrustHubRBAC,@@ -516,11 +518,17 @@ func (n *SamNode) startReprovideLoop(ctx context.Context, interval time.Duration}func (n *SamNode) IsConnected() bool {- return n.HubPeerID != "" && n.Host.Network().Connectedness(n.HubPeerID) == network.Connected-}--func (n *SamNode) HubPeerIDString() string {- return n.HubPeerID.String()+ n.mu.Lock()+ defer n.mu.Unlock()+ if len(n.authenticatedHubs) == 0 {+ return false+ }+ for pid := range n.authenticatedHubs {+ if n.Host.Network().Connectedness(pid) == network.Connected {+ return true+ }+ }+ return false}func (n *SamNode) LoadHubConfig() ([]byte, []string, error) {@@ -633,6 +641,15 @@ func (n *SamNode) ConnectAndAuthWithHub(ctx context.Context, addr multiaddr.MultresolvedAddrs = []multiaddr.Multiaddr{addr}}+ // Load biscuit from store once before the loop+ biscuitBytes, err := n.Store.LoadIdentity()+ if err != nil {+ return fmt.Errorf("%w: failed to load identity from store: %w", ErrFatalAuth, err)+ }+ if len(biscuitBytes) == 0 {+ return fmt.Errorf("%w: no identity biscuit found in store", ErrFatalAuth)+ }+var connected boolvar lastFatalErr errorvar errs []error@@ -652,19 +669,6 @@ func (n *SamNode) ConnectAndAuthWithHub(ctx context.Context, addr multiaddr.Multcontinue}- // Load biscuit from store- biscuitBytes, err := n.Store.LoadIdentity()- if err != nil {- lastFatalErr = fmt.Errorf("%w: failed to load identity from store: %w", ErrFatalAuth, err)- errs = append(errs, lastFatalErr)- continue- }- if len(biscuitBytes) == 0 {- lastFatalErr = fmt.Errorf("%w: no identity biscuit found in store", ErrFatalAuth)- errs = append(errs, lastFatalErr)- continue- }-// Open auth streams, err := n.Host.NewStream(ctx, addrInfo.ID, api.AuthProtocolID)if err != nil {@@ -674,7 +678,7 @@ func (n *SamNode) ConnectAndAuthWithHub(ctx context.Context, addr multiaddr.Multsuccess, err := n.performHubAuthHandshake(s, biscuitBytes)if err != nil {- _ = s.Close()+ _ = s.Reset()errs = append(errs, fmt.Errorf("handshake failed with hub %s: %w", resolved, err))if errors.Is(err, ErrFatalAuth) {lastFatalErr = err@@ -684,6 +688,9 @@ func (n *SamNode) ConnectAndAuthWithHub(ctx context.Context, addr multiaddr.Mult_ = s.Close()if success {+ n.mu.Lock()+ n.authenticatedHubs[addrInfo.ID] = true+ n.mu.Unlock()n.HubPeerID = addrInfo.IDlogger.Infof("[AuthN] Successfully authenticated with hub via libp2p: %s", addrInfo.ID)connected = true