Agent Mesh
Go a2aa2a-protocolagent-meshagentic-aiinferencemcpmeshmesh-networknetwork-securitynetworking-aip2p-network
fix(node): harden identity evidence handlers
Rhein1 / Agoragentic8aad83ca3fc1
diff --git a/internal/node/identity_evidence.go b/internal/node/identity_evidence.goindex bdf37876..fe5f331e 100644--- a/internal/node/identity_evidence.go+++ b/internal/node/identity_evidence.go@@ -90,11 +90,9 @@ func findSelectedKey(snapshots []trustedKeySnapshot, selected ed25519.PublicKey)}func (n *SamNode) stillTrustsKey(selected trustedKeySnapshot) bool {- current, err := n.trustedKeySnapshot()- if err != nil {- return false- }- for _, candidate := range current {+ n.keysMu.RLock()+ defer n.keysMu.RUnlock()+ for _, candidate := range n.trustedKeys {if candidate.Key.Equal(selected.Key) {return true}@@ -143,7 +141,11 @@ func handleIdentityEvidence(n *SamNode, w http.ResponseWriter, r *http.Request)writeEvidenceError(w, http.StatusMethodNotAllowed, "Method not allowed")return}- if n != nil && n.Host != nil && n.peerIsRevoked(n.Host.ID()) {+ if n == nil || n.Host == nil {+ writeEvidenceError(w, http.StatusServiceUnavailable, "Node is unavailable")+ return+ }+ if n.peerIsRevoked(n.Host.ID()) {writeEvidenceError(w, http.StatusForbidden, "Local identity is revoked")return}@@ -162,6 +164,10 @@ func handlePeerEvidence(n *SamNode, w http.ResponseWriter, r *http.Request) {writeEvidenceError(w, http.StatusMethodNotAllowed, "Method not allowed")return}+ if n == nil || n.Host == nil {+ writeEvidenceError(w, http.StatusServiceUnavailable, "Node is unavailable")+ return+ }const prefix = "/sam/peer/"remainder := strings.TrimPrefix(r.URL.Path, prefix)parts := strings.Split(remainder, "/")diff --git a/internal/node/identity_evidence_http_test.go b/internal/node/identity_evidence_http_test.goindex ab203bbc..da12f74e 100644--- a/internal/node/identity_evidence_http_test.go+++ b/internal/node/identity_evidence_http_test.go@@ -70,6 +70,58 @@ func TestIdentityEvidenceTrailingSlashReturnsNotFound(t *testing.T) {}}+func TestIdentityEvidenceHandlersRejectUnavailableNode(t *testing.T) {+ tests := []struct {+ name string+ handler func(*SamNode, http.ResponseWriter, *http.Request)+ node *SamNode+ path string+ }{+ {+ name: "identity nil node",+ handler: handleIdentityEvidence,+ path: "/sam/identity",+ },+ {+ name: "identity nil host",+ handler: handleIdentityEvidence,+ node: &SamNode{},+ path: "/sam/identity",+ },+ {+ name: "peer nil node",+ handler: handlePeerEvidence,+ path: "/sam/peer/unavailable/evidence",+ },+ {+ name: "peer nil host",+ handler: handlePeerEvidence,+ node: &SamNode{},+ path: "/sam/peer/unavailable/evidence",+ },+ }++ for _, tc := range tests {+ t.Run(tc.name, func(t *testing.T) {+ recorder := httptest.NewRecorder()+ tc.handler(tc.node, recorder, httptest.NewRequest(http.MethodGet, tc.path, nil))++ if recorder.Code != http.StatusServiceUnavailable {+ t.Fatalf("status = %d, body = %q, want %d", recorder.Code, recorder.Body.String(), http.StatusServiceUnavailable)+ }+ if got := strings.TrimSpace(recorder.Body.String()); got != "Node is unavailable" {+ t.Fatalf("body = %q, want %q", got, "Node is unavailable")+ }+ if got := recorder.Header().Get("Cache-Control"); got != "no-store" {+ t.Fatalf("Cache-Control = %q, want %q", got, "no-store")+ }+ if got := recorder.Header().Get("Content-Type"); got != "text/plain; charset=utf-8" {+ t.Fatalf("Content-Type = %q, want text/plain", got)+ }+ })+ }+}+func TestHandleIdentityEvidenceRejectsRevokedLocalPeer(t *testing.T) {node, _, _ := newIdentityEvidenceTestNode(t, nil)node.revokedPeers.Add(node.Host.ID().String(), time.Now().Unix())