Agent Mesh
Go a2aa2a-protocolagent-meshagentic-aiinferencemcpmeshmesh-networknetwork-securitynetworking-aip2p-network
do not use global varsa
Antonio Ojea90703666ef3f
diff --git a/cmd/sam-hub/main.go b/cmd/sam-hub/main.goindex 328b31a9..871ad7a0 100644--- a/cmd/sam-hub/main.go+++ b/cmd/sam-hub/main.go@@ -101,7 +101,7 @@ var (allowLoopbackFlag bool)-var AllowLoopback bool+var logger = golog.Logger("sam-hub")@@ -119,10 +119,11 @@ type Hub struct {limiter *rate.LimiterExternalAddrs []stringAllowedAudiences []string+ AllowLoopback bool}// NewHub starts a host supporting both QUIC and TCP (with TLS 1.3)-func NewHub(ctx context.Context, policy *api.PolicyConfig) (*Hub, error) {+func NewHub(ctx context.Context, policy *api.PolicyConfig, allowLoopback bool) (*Hub, error) {gater := newHubConnGate()// Connection Manager for DoS protection@@ -143,7 +144,7 @@ func NewHub(ctx context.Context, policy *api.PolicyConfig) (*Hub, error) {libp2p.EnableAutoNATv2(),libp2p.EnableNATService(),libp2p.AddrsFactory(func(addrs []multiaddr.Multiaddr) []multiaddr.Multiaddr {- if AllowLoopback {+ if allowLoopback {return addrs}var filtered []multiaddr.Multiaddr@@ -233,6 +234,7 @@ func NewHub(ctx context.Context, policy *api.PolicyConfig) (*Hub, error) {limiter: rate.NewLimiter(rate.Limit(EnrollRateLimit), EnrollBurst),ExternalAddrs: externalMultiaddrs,AllowedAudiences: auds,+ AllowLoopback: allowLoopback,}h.Network().Notify(¬ifier{hub: hub})@@ -675,8 +677,6 @@ func main() {Short: "Sovereign Agent Mesh - Multi-Transport Hub",Run: func(cmd *cobra.Command, args []string) {ctx := cmd.Context()- AllowLoopback = allowLoopbackFlag-// Initialize loggingif os.Getenv("LOG_FORMAT") == "json" {_ = os.Setenv("GOLOG_LOG_FMT", "json")@@ -694,7 +694,7 @@ func main() {logger.Fatal(err)}- h, err := NewHub(ctx, policyConfig)+ h, err := NewHub(ctx, policyConfig, allowLoopbackFlag)if err != nil {logger.Fatal(err)}diff --git a/cmd/sam-hub/main_test.go b/cmd/sam-hub/main_test.goindex d38b43e3..94472ad0 100644--- a/cmd/sam-hub/main_test.go+++ b/cmd/sam-hub/main_test.go@@ -261,7 +261,4 @@ func TestHandleInfoHTTP(t *testing.T) {}}-func init() {- AllowLoopback = true-}diff --git a/cmd/sam-hub/server.go b/cmd/sam-hub/server.goindex 000b3674..b55cfd1d 100644--- a/cmd/sam-hub/server.go+++ b/cmd/sam-hub/server.go@@ -181,7 +181,7 @@ func handleRegisterHTTP(h *Hub) http.HandlerFunc {}} else {for _, addr := range h.Host.Addrs() {- if !AllowLoopback && isLoopbackOrLinkLocal(addr) {+ if !h.AllowLoopback && isLoopbackOrLinkLocal(addr) {continue}hubAddrs = append(hubAddrs, addr.String()+"/p2p/"+h.Host.ID().String())diff --git a/cmd/sam-node/gate_test.go b/cmd/sam-node/gate_test.goindex 1ae2425b..fde70fd1 100644--- a/cmd/sam-node/gate_test.go+++ b/cmd/sam-node/gate_test.go@@ -112,7 +112,7 @@ func startBareNode(t *testing.T, ctx context.Context) (*SamNode, func()) {t.Fatal(err)}node, err := NewSamNode(ctx, priv, nil, nil, store, "test-mesh", "1s",- []string{"/ip4/127.0.0.1/tcp/0"}, false, &NodeConfigComplete{}, 24*time.Hour)+ []string{"/ip4/127.0.0.1/tcp/0"}, false, &NodeConfigComplete{}, 24*time.Hour, true)if err != nil {t.Fatal(err)}diff --git a/cmd/sam-node/main.go b/cmd/sam-node/main.goindex 7b7aad27..7d912ef5 100644--- a/cmd/sam-node/main.go+++ b/cmd/sam-node/main.go@@ -92,8 +92,6 @@ func main() {Short: "Start the sovereign mesh node",Run: func(cmd *cobra.Command, args []string) {ctx := cmd.Context()- AllowLoopback = allowLoopbackFlag-// Initialize logginggolog.SetAllLoggers(golog.LevelInfo)if logLevelFlag != "" {@@ -179,7 +177,7 @@ func main() {logger.Fatal("Hub public key not found in store and not provided. Cannot verify peers.")}priv := getOrGenerateKey(store)- node, err = NewSamNode(context.Background(), priv, hubPubKey, hubAddrs, store, meshFlag, discoveryIntervalFlag, listenAddrs, enableRelayFlag, nodeConfig, keyGracePeriodFlag)+ node, err = NewSamNode(context.Background(), priv, hubPubKey, hubAddrs, store, meshFlag, discoveryIntervalFlag, listenAddrs, enableRelayFlag, nodeConfig, keyGracePeriodFlag, allowLoopbackFlag)if err != nil {logger.Fatalf("Failed to start mesh node: %v", err)}@@ -218,7 +216,7 @@ func main() {priv := getOrGenerateKey(store)enrollCtx, enrollCancel := context.WithCancel(context.Background())- node, err = NewSamNode(enrollCtx, priv, nil, initHubAddrs, store, meshFlag, discoveryIntervalFlag, listenAddrs, enableRelayFlag, nodeConfig, keyGracePeriodFlag)+ node, err = NewSamNode(enrollCtx, priv, nil, initHubAddrs, store, meshFlag, discoveryIntervalFlag, listenAddrs, enableRelayFlag, nodeConfig, keyGracePeriodFlag, allowLoopbackFlag)if err != nil {enrollCancel()logger.Fatalf("Failed to initialize node for enrollment: %v", err)@@ -257,7 +255,7 @@ func main() {newHubAddrs = append(newHubAddrs, ma)}- node, err = NewSamNode(context.Background(), priv, hubPubKey, newHubAddrs, store, meshFlag, discoveryIntervalFlag, listenAddrs, enableRelayFlag, nodeConfig, keyGracePeriodFlag)+ node, err = NewSamNode(context.Background(), priv, hubPubKey, newHubAddrs, store, meshFlag, discoveryIntervalFlag, listenAddrs, enableRelayFlag, nodeConfig, keyGracePeriodFlag, allowLoopbackFlag)if err != nil {logger.Fatalf("Failed to start mesh node after enrollment: %v", err)}@@ -303,8 +301,6 @@ func main() {Args: cobra.MaximumNArgs(1),Run: func(cmd *cobra.Command, args []string) {ctx := cmd.Context()- AllowLoopback = allowLoopbackFlag-targetHub := ""if len(args) > 0 {targetHub = args[0]@@ -399,7 +395,7 @@ func main() {}priv := getOrGenerateKey(store)- node, err := NewSamNode(context.Background(), priv, nil, initHubAddrs, store, meshFlag, discoveryIntervalFlag, []string{"/ip4/0.0.0.0/udp/0/quic-v1", "/ip4/0.0.0.0/tcp/0"}, enableRelayFlag, nodeConfig, keyGracePeriodFlag)+ node, err := NewSamNode(context.Background(), priv, nil, initHubAddrs, store, meshFlag, discoveryIntervalFlag, []string{"/ip4/0.0.0.0/udp/0/quic-v1", "/ip4/0.0.0.0/tcp/0"}, enableRelayFlag, nodeConfig, keyGracePeriodFlag, allowLoopbackFlag)if err != nil {logger.Fatalf("Failed to initialize node for enrollment: %v", err)}diff --git a/cmd/sam-node/main_test.go b/cmd/sam-node/main_test.goindex fe200ecd..dfbbd48a 100644--- a/cmd/sam-node/main_test.go+++ b/cmd/sam-node/main_test.go@@ -49,7 +49,4 @@ func TestGetOrGenerateKey(t *testing.T) {}}-func init() {- AllowLoopback = true-}diff --git a/cmd/sam-node/node.go b/cmd/sam-node/node.goindex f9923190..217fcd09 100644--- a/cmd/sam-node/node.go+++ b/cmd/sam-node/node.go@@ -73,7 +73,7 @@ type TrustedKey struct {ReceivedAt time.Time}-var AllowLoopback bool+type SamNode struct {Host host.Host@@ -93,10 +93,11 @@ type SamNode struct {rateLimiter *PeerRateLimiterservices *ServiceRegistryBoundHTTPAddr string+ AllowLoopback bool}// NewSamNode creates a new Agent instance secured with the 4-layer pipeline.-func NewSamNode(ctx context.Context, privKey crypto.PrivKey, hubPubKey ed25519.PublicKey, hubAddrs []multiaddr.Multiaddr, store *Store, meshID string, discoveryInterval string, listenAddrs []string, enableRelay bool, nodeConfig *NodeConfigComplete, keyGracePeriod time.Duration) (*SamNode, error) {+func NewSamNode(ctx context.Context, privKey crypto.PrivKey, hubPubKey ed25519.PublicKey, hubAddrs []multiaddr.Multiaddr, store *Store, meshID string, discoveryInterval string, listenAddrs []string, enableRelay bool, nodeConfig *NodeConfigComplete, keyGracePeriod time.Duration, allowLoopback bool) (*SamNode, error) {var trustedKeys []TrustedKeyif len(hubPubKey) > 0 {trustedKeys = []TrustedKey{{Key: hubPubKey, ReceivedAt: time.Now()}}@@ -108,7 +109,8 @@ func NewSamNode(ctx context.Context, privKey crypto.PrivKey, hubPubKey ed25519.PknownPeers: make(map[string]bool),receivedMsgs: make(map[string][]string),topics: make(map[string]*pubsub.Topic),- LocalPolicy: nodeConfig,+ LocalPolicy: nodeConfig,+ AllowLoopback: allowLoopback,}var err error@@ -156,7 +158,7 @@ func NewSamNode(ctx context.Context, privKey crypto.PrivKey, hubPubKey ed25519.Plibp2p.EnableNATService(),libp2p.ConnectionManager(cm),libp2p.AddrsFactory(func(addrs []multiaddr.Multiaddr) []multiaddr.Multiaddr {- if AllowLoopback {+ if allowLoopback {return addrs}var filtered []multiaddr.Multiaddrdiff --git a/cmd/sam-node/proxy_test.go b/cmd/sam-node/proxy_test.goindex 1eeaeed8..0f61af06 100644--- a/cmd/sam-node/proxy_test.go+++ b/cmd/sam-node/proxy_test.go@@ -53,7 +53,7 @@ func TestDatapathIntegration(t *testing.T) {// Pre-populate stores with dummy keys to avoid enrollment failure if required// For this test, we assume we can run without full enrollment if we bypass AuthHandler- nodeA, err := NewSamNode(ctx, privA, nil, nil, storeA, "test-mesh", "1s", []string{"/ip4/127.0.0.1/tcp/0"}, false, &NodeConfigComplete{}, 24*time.Hour)+ nodeA, err := NewSamNode(ctx, privA, nil, nil, storeA, "test-mesh", "1s", []string{"/ip4/127.0.0.1/tcp/0"}, false, &NodeConfigComplete{}, 24*time.Hour, true)if err != nil {t.Fatal(err)}@@ -63,7 +63,7 @@ func TestDatapathIntegration(t *testing.T) {}}()- nodeB, err := NewSamNode(ctx, privB, nil, nil, storeB, "test-mesh", "1s", []string{"/ip4/127.0.0.1/tcp/0"}, false, &NodeConfigComplete{}, 24*time.Hour)+ nodeB, err := NewSamNode(ctx, privB, nil, nil, storeB, "test-mesh", "1s", []string{"/ip4/127.0.0.1/tcp/0"}, false, &NodeConfigComplete{}, 24*time.Hour, true)if err != nil {t.Fatal(err)}@@ -212,13 +212,13 @@ func TestStdioDatapathIntegration(t *testing.T) {}defer func() { _ = storeB.Close() }()- nodeA, err := NewSamNode(ctx, privA, nil, nil, storeA, "test-mesh", "1s", []string{"/ip4/127.0.0.1/tcp/0"}, false, &NodeConfigComplete{}, 24*time.Hour)+ nodeA, err := NewSamNode(ctx, privA, nil, nil, storeA, "test-mesh", "1s", []string{"/ip4/127.0.0.1/tcp/0"}, false, &NodeConfigComplete{}, 24*time.Hour, true)if err != nil {t.Fatal(err)}defer func() { _ = nodeA.Host.Close() }()- nodeB, err := NewSamNode(ctx, privB, nil, nil, storeB, "test-mesh", "1s", []string{"/ip4/127.0.0.1/tcp/0"}, false, &NodeConfigComplete{}, 24*time.Hour)+ nodeB, err := NewSamNode(ctx, privB, nil, nil, storeB, "test-mesh", "1s", []string{"/ip4/127.0.0.1/tcp/0"}, false, &NodeConfigComplete{}, 24*time.Hour, true)if err != nil {t.Fatal(err)}diff --git a/cmd/sam-node/sidecar_test.go b/cmd/sam-node/sidecar_test.goindex ed1ce99a..382c310f 100644--- a/cmd/sam-node/sidecar_test.go+++ b/cmd/sam-node/sidecar_test.go@@ -502,7 +502,7 @@ func TestRegisterService_PopulatesAggregatedTools(t *testing.T) {t.Fatal(err)}node, err := NewSamNode(ctx, priv, nil, nil, store, "test-mesh", "1s",- []string{"/ip4/127.0.0.1/tcp/0"}, false, &NodeConfigComplete{}, 24*time.Hour)+ []string{"/ip4/127.0.0.1/tcp/0"}, false, &NodeConfigComplete{}, 24*time.Hour, true)if err != nil {t.Fatal(err)}@@ -554,7 +554,7 @@ func TestUnregisterService_DetachesAggregation(t *testing.T) {t.Fatal(err)}node, err := NewSamNode(ctx, priv, nil, nil, store, "test-mesh", "1s",- []string{"/ip4/127.0.0.1/tcp/0"}, false, &NodeConfigComplete{}, 24*time.Hour)+ []string{"/ip4/127.0.0.1/tcp/0"}, false, &NodeConfigComplete{}, 24*time.Hour, true)if err != nil {t.Fatal(err)}diff --git a/cmd/sam-node/static_service_test.go b/cmd/sam-node/static_service_test.goindex 2cff1a3d..5ba02c92 100644--- a/cmd/sam-node/static_service_test.go+++ b/cmd/sam-node/static_service_test.go@@ -95,7 +95,7 @@ func TestStaticServiceRegistrationRequiresConnection(t *testing.T) {}// 4. Create Node with empty hub addrs initially- node, err := NewSamNode(context.Background(), priv, nil, []multiaddr.Multiaddr{}, store, "test-mesh", "100ms", []string{"/ip4/127.0.0.1/tcp/0"}, false, nil, 24*time.Hour)+ node, err := NewSamNode(context.Background(), priv, nil, []multiaddr.Multiaddr{}, store, "test-mesh", "100ms", []string{"/ip4/127.0.0.1/tcp/0"}, false, nil, 24*time.Hour, true)if err != nil {t.Fatalf("failed to create node: %v", err)}@@ -168,7 +168,7 @@ func TestStaticServiceRegistrationCommandFailure(t *testing.T) {}// 4. Create Node with empty hub addrs initially- node, err := NewSamNode(context.Background(), priv, nil, []multiaddr.Multiaddr{}, store, "test-mesh", "100ms", []string{"/ip4/127.0.0.1/tcp/0"}, false, nil, 24*time.Hour)+ node, err := NewSamNode(context.Background(), priv, nil, []multiaddr.Multiaddr{}, store, "test-mesh", "100ms", []string{"/ip4/127.0.0.1/tcp/0"}, false, nil, 24*time.Hour, true)if err != nil {t.Fatalf("failed to create node: %v", err)}diff --git a/tests/integration/catalog_test.go b/tests/integration/catalog_test.goindex 54d284cc..921f9fdb 100644--- a/tests/integration/catalog_test.go+++ b/tests/integration/catalog_test.go@@ -19,7 +19,7 @@ func startBackgroundNode(t *testing.T, nodeBin string, hubAddr string, homeDir s"HOME="+homeDir,"XDG_CONFIG_HOME="+filepath.Join(homeDir, ".config"),)- allArgs := append([]string{"run", "--hub", hubAddr, "--jwt", "test-jwt", "--bind-addr", "127.0.0.1:0", "--api-token", "test-token"}, args...)+ allArgs := append([]string{"run", "--hub", hubAddr, "--jwt", "test-jwt", "--bind-addr", "127.0.0.1:0", "--api-token", "test-token", "--allow-loopback"}, args...)cmd := exec.Command(nodeBin, allArgs...)cmd.Env = envdiff --git a/tests/integration/multimaster_test.go b/tests/integration/multimaster_test.goindex 6ca60a67..36a4710c 100644--- a/tests/integration/multimaster_test.go+++ b/tests/integration/multimaster_test.go@@ -64,6 +64,7 @@ roles: {}"--bind-address", "127.0.0.1:0","--policy-file", policyFile,"--keys-db", filepath.Join(tmpDir, "keysA.db"),+ "--allow-loopback",)var stdoutA, stderrA safeBuffercmdA.Stdout = &stdoutA@@ -80,6 +81,7 @@ roles: {}"--bind-address", "127.0.0.1:0","--policy-file", policyFile,"--keys-db", filepath.Join(tmpDir, "keysB.db"),+ "--allow-loopback",)var stdoutB, stderrB safeBuffercmdB.Stdout = &stdoutB