Agent Mesh
Go a2aa2a-protocolagent-meshagentic-aiinferencemcpmeshmesh-networknetwork-securitynetworking-aip2p-network
fail fast
Antonio Ojeaec2fc35957d9
diff --git a/.github/k8s/sam-node-template.yaml b/.github/k8s/sam-node-template.yamlindex a302361a..ff47374e 100644--- a/.github/k8s/sam-node-template.yaml+++ b/.github/k8s/sam-node-template.yaml@@ -62,6 +62,7 @@ spec:- "--config=/etc/sam/sam-node.yaml"- "--hub=http://sam-hub-internal-${ENV_NAME}.sam-${ENV_NAME}.svc.cluster.local"- "--jwt-path=/var/run/secrets/tokens/sam-token"+ - "--api-token=secret-token"ports:- containerPort: 8080resources:diff --git a/cmd/sam-node/main.go b/cmd/sam-node/main.goindex b69f4b98..7dad48a8 100644--- a/cmd/sam-node/main.go+++ b/cmd/sam-node/main.go@@ -230,7 +230,7 @@ func main() {// Register static services from configif nodeConfig != nil && len(nodeConfig.Services) > 0 {if err := node.RegisterStaticServices(context.Background(), nodeConfig.Services); err != nil {- logger.Errorf("Failed to register static services: %v", err)+ logger.Fatalf("Failed to register static services: %v", err)}}@@ -240,7 +240,9 @@ func main() {node.Host.SetStreamHandler(api.AuthProtocolID, node.HandleAuthHandshake)// Start Sidecar API Server (multiplexed with MCP)- startSidecarServer(node, bindAddrFlag, apiTokenFlag, tlsCertFlag, tlsKeyFlag, tlsCAFlag)+ if err := startSidecarServer(node, bindAddrFlag, apiTokenFlag, tlsCertFlag, tlsKeyFlag, tlsCAFlag); err != nil {+ logger.Fatalf("Failed to start sidecar server: %v", err)+ }fmt.Printf("SAM Node Online.\nPeerID: %s\nListening on: %v\n", node.Host.ID(), node.Host.Addrs())diff --git a/cmd/sam-node/sidecar.go b/cmd/sam-node/sidecar.goindex 7d3a3faa..74d35b10 100644--- a/cmd/sam-node/sidecar.go+++ b/cmd/sam-node/sidecar.go@@ -31,7 +31,7 @@ import (libp2phttp "github.com/libp2p/go-libp2p-http")-func startSidecarServer(node *SamNode, addr, token, certFile, keyFile, caFile string) {+func startSidecarServer(node *SamNode, addr, token, certFile, keyFile, caFile string) error {mux := http.NewServeMux()// Public endpoints@@ -62,16 +62,14 @@ func startSidecarServer(node *SamNode, addr, token, certFile, keyFile, caFile stlistener, err := net.Listen("tcp", addr)if err != nil {- logger.Errorf("Failed to listen on %s: %v", addr, err)- return+ return fmt.Errorf("failed to listen on %s: %w", addr, err)}actualAddr := listener.Addr().String()node.BoundHTTPAddr = actualAddrif (certFile != "") != (keyFile != "") {- logger.Errorf("Both --tls-cert and --tls-key must be provided to enable TLS")- return+ return fmt.Errorf("both --tls-cert and --tls-key must be provided to enable TLS")}if certFile != "" && keyFile != "" {@@ -80,8 +78,7 @@ func startSidecarServer(node *SamNode, addr, token, certFile, keyFile, caFile stif caFile != "" {caCert, err := os.ReadFile(caFile)if err != nil {- logger.Errorf("Failed to read CA cert: %v", err)- return+ return fmt.Errorf("failed to read CA cert: %w", err)}caCertPool := x509.NewCertPool()caCertPool.AppendCertsFromPEM(caCert)@@ -91,8 +88,7 @@ func startSidecarServer(node *SamNode, addr, token, certFile, keyFile, caFile st}if !isMTLS && token == "" {- logger.Errorf("Token is mandatory when not using mTLS")- return+ return fmt.Errorf("token is mandatory when not using mTLS")}server.TLSConfig = tlsConfig@@ -104,8 +100,7 @@ func startSidecarServer(node *SamNode, addr, token, certFile, keyFile, caFile st}()} else {if token == "" {- logger.Errorf("Token is mandatory when not using mTLS")- return+ return fmt.Errorf("token is mandatory when not using mTLS")}logger.Infof("Starting MCP server on TCP address %s", actualAddr)go func() {@@ -114,6 +109,7 @@ func startSidecarServer(node *SamNode, addr, token, certFile, keyFile, caFile st}}()}+ return nil}func handleHealthz(w http.ResponseWriter, r *http.Request) {diff --git a/cmd/sam-node/sidecar_test.go b/cmd/sam-node/sidecar_test.goindex 24a0f37c..031615b2 100644--- a/cmd/sam-node/sidecar_test.go+++ b/cmd/sam-node/sidecar_test.go@@ -18,9 +18,9 @@ import ("bytes""context""encoding/json"- "google.golang.org/protobuf/encoding/protojson""net/http""net/http/httptest"+ "strings""testing""time"@@ -28,6 +28,7 @@ import ("github.com/libp2p/go-libp2p"dht "github.com/libp2p/go-libp2p-kad-dht""github.com/libp2p/go-libp2p/core/peer"+ "google.golang.org/protobuf/encoding/protojson")func TestWithAuth(t *testing.T) {@@ -344,3 +345,24 @@ func TestHandleRegisterService_Validation(t *testing.T) {})}}++func TestStartSidecarServer_TokenMandatory(t *testing.T) {+ node := &SamNode{}++ // Test case: No token, no TLS+ err := startSidecarServer(node, "127.0.0.1:0", "", "", "", "")+ if err == nil {+ t.Fatal("Expected startSidecarServer to fail without token and TLS, but it succeeded")+ }+ if !strings.Contains(err.Error(), "token is mandatory when not using mTLS") {+ t.Fatalf("Expected error to contain 'token is mandatory when not using mTLS', got: %v", err)+ }++ // Test case: Token provided, should not fail immediately+ err = startSidecarServer(node, "127.0.0.1:0", "some-token", "", "", "")+ if err != nil {+ if strings.Contains(err.Error(), "token is mandatory when not using mTLS") {+ t.Fatalf("Did not expect 'token is mandatory' error when token is provided, got: %v", err)+ }+ }+}diff --git a/cmd/sam-node/static_service_test.go b/cmd/sam-node/static_service_test.goindex de4d84c8..e3cb0d71 100644--- a/cmd/sam-node/static_service_test.go+++ b/cmd/sam-node/static_service_test.go@@ -139,3 +139,61 @@ func TestStaticServiceRegistrationRequiresConnection(t *testing.T) {t.Fatalf("Expected RegisterStaticServices to succeed after enrollment, but failed: %v", err)}}++func TestStaticServiceRegistrationCommandFailure(t *testing.T) {+ // 1. Setup mock hub+ _, hubURL := startMockLibp2pHub(t)++ // 2. Create temp store+ tmpDir := t.TempDir()+ store, err := NewStore(tmpDir)+ if err != nil {+ t.Fatalf("failed to create store: %v", err)+ }++ // 3. Create dummy keys+ priv, _, err := crypto.GenerateEd25519Key(rand.Reader)+ if err != nil {+ t.Fatalf("failed to generate libp2p key: %v", err)+ }++ // 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)+ if err != nil {+ t.Fatalf("failed to create node: %v", err)+ }+ defer func() {+ if err := node.Host.Close(); err != nil {+ t.Errorf("failed to close node host: %v", err)+ }+ }()++ // 5. Enroll and connect to hub (which sets up DHT and hub connection)+ oldHubAddr := hubAddr+ hubAddr = hubURL+ defer func() { hubAddr = oldHubAddr }()++ ctx := context.Background()+ err = node.Enroll(ctx, "dummy-jwt")+ if err != nil {+ t.Fatalf("failed to enroll: %v", err)+ }++ // 6. Try to register a service with a non-existent command+ services := []api.ServiceConfig{+ {+ Type: "mcp",+ Name: "test-stdio-fail",+ Description: "Test Stdio Failure",+ Command: []string{"/non-existent/binary"},+ },+ }++ err = node.RegisterStaticServices(ctx, services)+ if err == nil {+ t.Fatal("Expected RegisterStaticServices to fail with non-existent command, but it succeeded")+ }+ if !strings.Contains(err.Error(), "failed to create stdio bridge") {+ t.Fatalf("Expected error to contain 'failed to create stdio bridge', got: %v", err)+ }+}diff --git a/tests/e2e/auth_flows.bats b/tests/e2e/auth_flows.batsindex e8456114..b6b4e063 100644--- a/tests/e2e/auth_flows.bats+++ b/tests/e2e/auth_flows.bats@@ -111,7 +111,8 @@ teardown() {"sam-node:local" \run \--hub "http://sam-hub:9090" \- --jwt-path "/var/run/secrets/tokens/sa-token"+ --jwt-path "/var/run/secrets/tokens/sa-token" \+ --api-token "secret-token"mesh_wait_for_log "${node_name}" "SAM Node Online" 20diff --git a/tests/e2e/kind_wi.bats b/tests/e2e/kind_wi.batsindex 297d92cb..adef8741 100644--- a/tests/e2e/kind_wi.bats+++ b/tests/e2e/kind_wi.bats@@ -183,6 +183,8 @@ spec:- "http://sam-hub:9090"- "--jwt-path"- "/var/run/secrets/tokens/sam-token"+ - "--api-token"+ - "secret-token"volumeMounts:- name: sam-tokenmountPath: /var/run/secrets/tokensdiff --git a/tests/e2e/watch.bats b/tests/e2e/watch.batsindex dd4d761b..186da575 100644--- a/tests/e2e/watch.bats+++ b/tests/e2e/watch.bats@@ -23,7 +23,7 @@ teardown() {@test "sam-node run with stored identity reaches online state" {log_file="$TEST_TMPDIR/run.log"- "$SAM_NODE_BINARY" run --listen /ip4/127.0.0.1/udp/0/quic-v1 --listen /ip4/127.0.0.1/tcp/0 >"$log_file" 2>&1 &+ "$SAM_NODE_BINARY" run --listen /ip4/127.0.0.1/udp/0/quic-v1 --listen /ip4/127.0.0.1/tcp/0 --api-token "dummy-token" --bind-addr "127.0.0.1:0" >"$log_file" 2>&1 &pid=$!online=""@@ -38,6 +38,11 @@ teardown() {kill "$pid" >/dev/null 2>&1 || truewait "$pid" >/dev/null 2>&1 || true+ if [[ "$online" != "yes" ]]; then+ echo "Test failed. Node logs:"+ cat "$log_file"+ fi+[[ "$online" == "yes" ]]}