Agent Mesh
Go a2aa2a-protocolagent-meshagentic-aiinferencemcpmeshmesh-networknetwork-securitynetworking-aip2p-network
api: extract /sam/catalog to api.CatalogTarget constant to prevent drift
Antonio Ojea217267a041db
diff --git a/api/constants.go b/api/constants.goindex 8a11e562..30beeb15 100644--- a/api/constants.go+++ b/api/constants.go@@ -26,6 +26,9 @@ const GossipEvents = "/sam/mesh/events/v1"const GossipHubSync = "/sam/hub/sync/v1"const AuthProtocolID protocol.ID = "/sam/auth/1.0.0"+// CatalogTarget is the special target service name used to retrieve tool catalogs from remote nodes.+const CatalogTarget = "/sam/catalog"+const DefaultAudience = "sam-mesh-audience"// Biscuit fact namesdiff --git a/cmd/sam-node/gate.go b/cmd/sam-node/gate.goindex 4bf7e82b..7eaf66dc 100644--- a/cmd/sam-node/gate.go+++ b/cmd/sam-node/gate.go@@ -27,6 +27,8 @@ import ("github.com/modelcontextprotocol/go-sdk/jsonrpc""github.com/modelcontextprotocol/go-sdk/mcp"++ "github.com/google/sam/api")var _ connmgr.ConnectionGater = (*nodeConnGate)(nil)@@ -75,7 +77,7 @@ func (g *nodeConnGate) InterceptSecured(dir network.Direction, p peer.ID, n netwfunc (n *SamNode) HandleMCPStream(s network.Stream, reqCtx RequestContext) {// If the TargetService is for a registered local backend, dumb-pipe proxy to it.target := reqCtx.Target- if target != "" && target != "/sam/catalog" {+ if target != "" && target != api.CatalogTarget {svc, ok := n.services.Get(target)if ok {mcpSvc, isMcp := svc.(*MCPService)diff --git a/cmd/sam-node/mcp.go b/cmd/sam-node/mcp.goindex 14796356..461cfc49 100644--- a/cmd/sam-node/mcp.go+++ b/cmd/sam-node/mcp.go@@ -302,7 +302,7 @@ func (n *SamNode) ConnectMCPSession(ctx context.Context, targetPeer peer.ID, tar}func (n *SamNode) callMCPToolOnce(ctx context.Context, targetPeer peer.ID, toolName string, params any) (*mcp.CallToolResult, error) {- targetService := "/sam/catalog"+ targetService := api.CatalogTargetoriginalToolName := toolNameif parts := strings.SplitN(toolName, ".", 2); len(parts) == 2 {targetService = parts[0]@@ -335,7 +335,7 @@ func (n *SamNode) callMCPToolOnce(ctx context.Context, targetPeer peer.ID, toolNfunc (n *SamNode) fetchRemoteServiceCatalog(ctx context.Context, peerID peer.ID, typeStr string) ([]*api.ServiceInfo, error) {n.preparePeerAddrs(ctx, peerID)- session, cleanup, err := n.ConnectMCPSession(ctx, peerID, "/sam/catalog")+ session, cleanup, err := n.ConnectMCPSession(ctx, peerID, api.CatalogTarget)if err != nil {return nil, err}diff --git a/cmd/sam-node/middleware.go b/cmd/sam-node/middleware.goindex 818a002e..174d7dc8 100644--- a/cmd/sam-node/middleware.go+++ b/cmd/sam-node/middleware.go@@ -54,7 +54,8 @@ func init() {panic(fmt.Sprintf("failed to parse baseline rule 2: %v", err))}- baselineRule3, err = parser.FromStringPolicy(`allow if operation("/sam/catalog")`)+ rule3Str := fmt.Sprintf(`allow if operation("%s")`, api.CatalogTarget)+ baselineRule3, err = parser.FromStringPolicy(rule3Str)if err != nil {panic(fmt.Sprintf("failed to parse baseline rule 3: %v", err))}