Agent Mesh
Go a2aa2a-protocolagent-meshagentic-aiinferencemcpmeshmesh-networknetwork-securitynetworking-aip2p-network
standalone: compare router peer IDs as decoded values in the /info inference
Antonio Ojea8443c004e725
diff --git a/internal/standalone/standalone.go b/internal/standalone/standalone.goindex 0f811016..c52a8287 100644--- a/internal/standalone/standalone.go+++ b/internal/standalone/standalone.go@@ -42,6 +42,7 @@ import ("github.com/google/agentmesh/internal/storage"golog "github.com/ipfs/go-log/v2""github.com/libp2p/go-libp2p/core/crypto"+ "github.com/libp2p/go-libp2p/core/peer""github.com/multiformats/go-multiaddr""google.golang.org/protobuf/encoding/protojson""google.golang.org/protobuf/proto"@@ -820,11 +821,13 @@ func prependInferredRouterAddr(path string, body []byte, inferredAddr string) ([// flat list (candidatesFromInfo), so the entry for this router must// carry the inferred address too or the member dials only what the// router could announce itself, which behind a PaaS front end is its- // loopback listener.- peerID := inferredAddrPeerID(inferredAddr)- for _, r := range msg.Routers {- if r.GetPeerId() == peerID {- r.Addresses = prepend(r.Addresses)+ // loopback listener. Peer IDs are compared as decoded values, never+ // as strings: a peer ID has several valid string encodings.+ if info, err := peer.AddrInfoFromString(inferredAddr); err == nil {+ for _, r := range msg.Routers {+ if id, err := peer.Decode(r.GetPeerId()); err == nil && id == info.ID {+ r.Addresses = prepend(r.Addresses)+ }}}b, err := proto.Marshal(&msg)@@ -850,17 +853,6 @@ func prependInferredRouterAddr(path string, body []byte, inferredAddr string) ([}}-// inferredAddrPeerID returns the peer ID an inferred multiaddr ends in-// (`.../p2p/<peerID>`), or "" when it has none.-func inferredAddrPeerID(addr string) string {- const sep = "/p2p/"- i := strings.LastIndex(addr, sep)- if i < 0 {- return ""- }- return addr[i+len(sep):]-}-// inferredRequestMultiaddr derives `/dns4/<host>/tcp/<port>/ws(s)/p2p/<peerID>`// from an HTTP request when the request either arrived over HTTPS (TLS or// X-Forwarded-Proto: https) or names a non-loopback host.diff --git a/internal/standalone/standalone_test.go b/internal/standalone/standalone_test.goindex e34d40d9..2a551e80 100644--- a/internal/standalone/standalone_test.go+++ b/internal/standalone/standalone_test.go@@ -169,9 +169,12 @@ func TestPrependInferredRouterAddr(t *testing.T) {const inferred = "/dns4/agentmesh-one-xyz.a.run.app/tcp/443/wss/p2p/12D3KooWBzUDQCkZhz2rWrYBhpjcCH8VnrRNcwCW6DoF36iADYrY"const local = "/ip4/127.0.0.1/tcp/8080/ws/p2p/12D3KooWBzUDQCkZhz2rWrYBhpjcCH8VnrRNcwCW6DoF36iADYrY"- enrollIn, _ := proto.Marshal(&api.BootstrapEnrollResponse{+ enrollIn, err := proto.Marshal(&api.BootstrapEnrollResponse{RouterAddresses: []string{local},})+ if err != nil {+ t.Fatalf("Marshal BootstrapEnrollResponse: %v", err)+ }enrollOutBytes, ok := prependInferredRouterAddr("/enroll", enrollIn, inferred)if !ok {t.Fatal("prependInferredRouterAddr(/enroll) returned false")@@ -184,10 +187,13 @@ func TestPrependInferredRouterAddr(t *testing.T) {t.Fatalf("BootstrapEnrollResponse.RouterAddresses = %v, want [%s %s]", enrollOut.RouterAddresses, inferred, local)}- regIn, _ := proto.Marshal(&api.EnrollResponse{+ regIn, err := proto.Marshal(&api.EnrollResponse{BiscuitToken: []byte("tok"),RouterAddresses: []string{local},})+ if err != nil {+ t.Fatalf("Marshal EnrollResponse: %v", err)+ }regOutBytes, ok := prependInferredRouterAddr("/register", regIn, inferred)if !ok {t.Fatal("prependInferredRouterAddr(/register) returned false")@@ -204,13 +210,17 @@ func TestPrependInferredRouterAddr(t *testing.T) {// router gets the inferred address, another router's entry is untouched.const otherPeer = "12D3KooWDk5pWkyxVERi6kt3TyRZCaXWqg441QEQxaGkn5rWHB21"const otherAddr = "/dns4/router-b.example.com/tcp/443/wss/p2p/" + otherPeer- infoIn, _ := proto.Marshal(&api.ControlPlaneInfoResponse{+ infoIn, err := proto.Marshal(&api.ControlPlaneInfoResponse{RouterAddresses: []string{local},Routers: []*api.RouterInfo{{PeerId: "12D3KooWBzUDQCkZhz2rWrYBhpjcCH8VnrRNcwCW6DoF36iADYrY", Addresses: []string{local}},{PeerId: otherPeer, Addresses: []string{otherAddr}},+ {PeerId: "not-a-peer-id", Addresses: []string{"/ip4/10.0.0.1/tcp/1/ws"}},},})+ if err != nil {+ t.Fatalf("Marshal ControlPlaneInfoResponse: %v", err)+ }infoOutBytes, ok := prependInferredRouterAddr("/info", infoIn, inferred)if !ok {t.Fatal("prependInferredRouterAddr(/info) returned false")@@ -222,8 +232,8 @@ func TestPrependInferredRouterAddr(t *testing.T) {if len(infoOut.RouterAddresses) != 2 || infoOut.RouterAddresses[0] != inferred || infoOut.RouterAddresses[1] != local {t.Fatalf("ControlPlaneInfoResponse.RouterAddresses = %v, want [%s %s]", infoOut.RouterAddresses, inferred, local)}- if len(infoOut.Routers) != 2 {- t.Fatalf("ControlPlaneInfoResponse.Routers has %d entries, want 2", len(infoOut.Routers))+ if len(infoOut.Routers) != 3 {+ t.Fatalf("ControlPlaneInfoResponse.Routers has %d entries, want 3", len(infoOut.Routers))}if got := infoOut.Routers[0].Addresses; len(got) != 2 || got[0] != inferred || got[1] != local {t.Fatalf("Routers[0].Addresses = %v, want [%s %s]", got, inferred, local)@@ -231,6 +241,9 @@ func TestPrependInferredRouterAddr(t *testing.T) {if got := infoOut.Routers[1].Addresses; len(got) != 1 || got[0] != otherAddr {t.Fatalf("Routers[1].Addresses = %v, want [%s] (another router's entry must not change)", got, otherAddr)}+ if got := infoOut.Routers[2].Addresses; len(got) != 1 || got[0] != "/ip4/10.0.0.1/tcp/1/ws" {+ t.Fatalf("Routers[2].Addresses = %v, want the entry with an undecodable peer id untouched", got)+ }if returnsRouterAddresses("/refresh") {t.Fatal("returnsRouterAddresses(/refresh) = true, want false")