Agent Mesh
Go a2aa2a-protocolagent-meshagentic-aiinferencemcpmeshmesh-networknetwork-securitynetworking-aip2p-network
Address code review feedback on PR #131
Antonio Ojea20a13eb1fd10
diff --git a/.github/k8s/sam-hub-template.yaml b/.github/k8s/sam-hub-template.yamlindex 7a88f531..e107c723 100644--- a/.github/k8s/sam-hub-template.yaml+++ b/.github/k8s/sam-hub-template.yaml@@ -113,8 +113,6 @@ data:bindings:- user: "system:serviceaccount:sam-canary-${ENV_NAME}:sam-node-sa"role: "sam-canary"- - user: "[email protected]"- role: "sam-canary"roles:sam-canary:mcp:diff --git a/cmd/sam-node/middleware.go b/cmd/sam-node/middleware.goindex 848e7d0a..71873c20 100644--- a/cmd/sam-node/middleware.go+++ b/cmd/sam-node/middleware.go@@ -33,6 +33,39 @@ import ("google.golang.org/protobuf/proto")+var (+ baselineRule1 biscuit.Policy+ baselineRule2 biscuit.Policy+ baselineRule3 biscuit.Policy+ baselineReplayCheck biscuit.Check+)++func init() {+ var err error+ rule1Str := fmt.Sprintf(`allow if operation($op), %s($op)`, api.FactMCPTool)+ baselineRule1, err = parser.FromStringPolicy(rule1Str)+ if err != nil {+ panic(fmt.Sprintf("failed to parse baseline rule 1: %v", err))+ }++ rule2Str := fmt.Sprintf(`allow if operation($op), %s("*")`, api.FactMCPTool)+ baselineRule2, err = parser.FromStringPolicy(rule2Str)+ if err != nil {+ panic(fmt.Sprintf("failed to parse baseline rule 2: %v", err))+ }++ baselineRule3, err = parser.FromStringPolicy(`allow if operation("/sam/catalog")`)+ if err != nil {+ panic(fmt.Sprintf("failed to parse baseline rule 3: %v", err))+ }++ replayCheckStr := `check if client_peer_id($id), connection_peer_id($id)`+ baselineReplayCheck, err = parser.FromStringCheck(replayCheckStr)+ if err != nil {+ panic(fmt.Sprintf("failed to parse replay check: %v", err))+ }+}+// RequestContext carries the security metadata for a specific stream requesttype RequestContext struct {PeerID peer.ID@@ -257,12 +290,7 @@ func (n *SamNode) Authorize(rawToken []byte, req RequestContext, pubKey ed25519.})// Enforce client_peer_id matches connection_peer_id- replayCheckStr := `check if client_peer_id($id), connection_peer_id($id)`- replayCheck, err := parser.FromStringCheck(replayCheckStr)- if err != nil {- return fmt.Errorf("failed to parse replay check: %w", err)- }- authorizer.AddCheck(replayCheck)+ authorizer.AddCheck(baselineReplayCheck)// Apply Pre-compiled Local Attenuationif n.LocalPolicy != nil {@@ -278,26 +306,9 @@ func (n *SamNode) Authorize(rawToken []byte, req RequestContext, pubKey ed25519.}// Baseline Rules- rule1Str := fmt.Sprintf(`allow if operation($op), %s($op)`, api.FactMCPTool)- rule1, err := parser.FromStringPolicy(rule1Str)- if err != nil {- return fmt.Errorf("failed to parse baseline rule 1: %w", err)- }- authorizer.AddPolicy(rule1)-- rule2Str := fmt.Sprintf(`allow if operation($op), %s("*")`, api.FactMCPTool)- rule2, err := parser.FromStringPolicy(rule2Str)- if err != nil {- return fmt.Errorf("failed to parse baseline rule 2: %w", err)- }- authorizer.AddPolicy(rule2)-- // the Service catalog is public for any authenticated node.- rule3, err := parser.FromStringPolicy(`allow if operation("/sam/catalog")`)- if err != nil {- return fmt.Errorf("failed to parse baseline rule 3: %w", err)- }- authorizer.AddPolicy(rule3)+ authorizer.AddPolicy(baselineRule1)+ authorizer.AddPolicy(baselineRule2)+ authorizer.AddPolicy(baselineRule3)return authorizer.Authorize()}diff --git a/cmd/sam-node/node.go b/cmd/sam-node/node.goindex 3f93cb7f..ed0ac4aa 100644--- a/cmd/sam-node/node.go+++ b/cmd/sam-node/node.go@@ -350,8 +350,15 @@ func NewSamNode(ctx context.Context, cfg SamNodeConfig) (*SamNode, error) {select {case <-ctx.Done():return- case e := <-sub.Out():- evt := e.(event.EvtLocalAddressesUpdated)+ case e, ok := <-sub.Out():+ if !ok {+ return+ }+ evt, ok := e.(event.EvtLocalAddressesUpdated)+ if !ok {+ logger.Warnf("[Network] Unexpected event type received: %T", e)+ continue+ }var addrs []multiaddr.Multiaddrfor _, a := range evt.Current {