Skip to content

Agent Mesh

allow to define services via config file

Antonio Ojea062b3efce142
diff --git a/api/policy.go b/api/policy.go
index 2ba0c665..93aa8a9a 100644
--- a/api/policy.go
+++ b/api/policy.go
@@ -20,10 +20,20 @@ type MCPPolicy struct {
AllowedTools []string `yaml:"allowed_tools"`
}
-// LocalPolicy defines the optional attenuation rules for a specific SAM Node.
-type LocalPolicy struct {
- Version string `yaml:"version"`
- Attenuation Attenuation `yaml:"attenuation"`
+type ServiceConfig struct {
+ Type string `yaml:"type"` // e.g., "mcp", "inference"
+ Name string `yaml:"name"`
+ Description string `yaml:"description"`
+ TargetURL string `yaml:"target_url,omitempty"`
+ Command []string `yaml:"command,omitempty"`
+ Env map[string]string `yaml:"env,omitempty"`
+}
+
+// NodeConfig defines the optional attenuation rules and static services for a specific SAM Node.
+type NodeConfig struct {
+ Version string `yaml:"version"`
+ Attenuation Attenuation `yaml:"attenuation"`
+ Services []ServiceConfig `yaml:"services"`
}
type Attenuation struct {
diff --git a/cmd/sam-node/config.go b/cmd/sam-node/config.go
index 12a64251..814f299e 100644
--- a/cmd/sam-node/config.go
+++ b/cmd/sam-node/config.go
@@ -11,17 +11,18 @@ import (
"gopkg.in/yaml.v2"
)
-type CompiledLocalPolicy struct {
+type NodeConfigComplete struct {
Policies []biscuit.Policy
Checks []biscuit.Check
Rules []biscuit.Rule
+ Services []api.ServiceConfig
}
-// LoadLocalPolicy loads the local policy configuration from the specified path.
+// LoadNodeConfig loads the node configuration from the specified path.
// If the file is missing, it returns an empty initialized config.
-func LoadLocalPolicy(path string) (*CompiledLocalPolicy, error) {
+func LoadNodeConfig(path string) (*NodeConfigComplete, error) {
if _, err := os.Stat(path); os.IsNotExist(err) {
- return &CompiledLocalPolicy{}, nil
+ return &NodeConfigComplete{}, nil
}
data, err := os.ReadFile(path)
@@ -29,12 +30,14 @@ func LoadLocalPolicy(path string) (*CompiledLocalPolicy, error) {
return nil, err
}
- var config api.LocalPolicy
+ var config api.NodeConfig
if err := yaml.Unmarshal(data, &config); err != nil {
return nil, err
}
- compiled := &CompiledLocalPolicy{}
+ complete := &NodeConfigComplete{
+ Services: config.Services,
+ }
for _, pStr := range config.Attenuation.Policies {
trimmed := strings.TrimRight(strings.TrimSpace(pStr), ";")
@@ -42,7 +45,7 @@ func LoadLocalPolicy(path string) (*CompiledLocalPolicy, error) {
if err != nil {
return nil, fmt.Errorf("invalid local policy syntax %q: %w", pStr, err)
}
- compiled.Policies = append(compiled.Policies, p)
+ complete.Policies = append(complete.Policies, p)
}
for _, cStr := range config.Attenuation.Checks {
@@ -51,7 +54,7 @@ func LoadLocalPolicy(path string) (*CompiledLocalPolicy, error) {
if err != nil {
return nil, fmt.Errorf("invalid local check syntax %q: %w", cStr, err)
}
- compiled.Checks = append(compiled.Checks, c)
+ complete.Checks = append(complete.Checks, c)
}
for _, rStr := range config.Attenuation.Rules {
@@ -60,8 +63,8 @@ func LoadLocalPolicy(path string) (*CompiledLocalPolicy, error) {
if err != nil {
return nil, fmt.Errorf("invalid local rule syntax %q: %w", rStr, err)
}
- compiled.Rules = append(compiled.Rules, r)
+ complete.Rules = append(complete.Rules, r)
}
- return compiled, nil
+ return complete, nil
}
diff --git a/cmd/sam-node/config_test.go b/cmd/sam-node/config_test.go
index fe25dcfa..4eeae0d6 100644
--- a/cmd/sam-node/config_test.go
+++ b/cmd/sam-node/config_test.go
@@ -6,8 +6,8 @@ import (
"testing"
)
-func TestLoadLocalPolicy(t *testing.T) {
- // 1. Test valid YAML
+func TestLoadNodeConfig(t *testing.T) {
+ // 1. Test valid YAML with policies and services
validYAML := `
version: "v1alpha1"
attenuation:
@@ -15,14 +15,25 @@ attenuation:
- 'deny if user("untrusted_sub_id");'
checks:
- 'check if time($time), $time < 2026-12-31T00:00:00Z;'
+services:
+ - type: "mcp"
+ name: "test-mcp"
+ description: "Test MCP Service"
+ target_url: "http://localhost:8080"
+ - type: "inference"
+ name: "test-inference"
+ description: "Test Inference Service"
+ command: ["python3", "-m", "llama"]
+ env:
+ MODEL_PATH: "/models/llama"
`
dir := t.TempDir()
- validFile := filepath.Join(dir, "local_policy.yaml")
+ validFile := filepath.Join(dir, "sam-node.yaml")
if err := os.WriteFile(validFile, []byte(validYAML), 0644); err != nil {
t.Fatal(err)
}
- config, err := LoadLocalPolicy(validFile)
+ config, err := LoadNodeConfig(validFile)
if err != nil {
t.Fatalf("expected no error, got %v", err)
}
@@ -32,10 +43,25 @@ attenuation:
if len(config.Checks) != 1 {
t.Errorf("expected 1 check, got %d", len(config.Checks))
}
+ if len(config.Services) != 2 {
+ t.Errorf("expected 2 services, got %d", len(config.Services))
+ }
+
+ // Verify service 1
+ s1 := config.Services[0]
+ if s1.Type != "mcp" || s1.Name != "test-mcp" || s1.TargetURL != "http://localhost:8080" {
+ t.Errorf("unexpected service 1: %+v", s1)
+ }
+
+ // Verify service 2
+ s2 := config.Services[1]
+ if s2.Type != "inference" || s2.Name != "test-inference" || len(s2.Command) != 3 || s2.Env["MODEL_PATH"] != "/models/llama" {
+ t.Errorf("unexpected service 2: %+v", s2)
+ }
// 2. Test missing file
missingFile := filepath.Join(dir, "nonexistent.yaml")
- config, err = LoadLocalPolicy(missingFile)
+ config, err = LoadNodeConfig(missingFile)
if err != nil {
t.Fatalf("expected no error for missing file, got %v", err)
}
diff --git a/cmd/sam-node/main.go b/cmd/sam-node/main.go
index 514c9c1a..983cfdc8 100644
--- a/cmd/sam-node/main.go
+++ b/cmd/sam-node/main.go
@@ -39,7 +39,7 @@ const (
DefaultMeshName = "public-mesh"
DefaultDiscoveryInterval = "2s"
DefaultHubURL = "http://localhost:8080"
- DefaultLocalPolicyFile = "local_policy.yaml"
+ DefaultConfigFile = "sam-node.yaml"
// Renewal timing defaults
DefaultRenewalFallback = 50 * time.Minute
@@ -62,7 +62,7 @@ var (
discoveryIntervalFlag string
enableRelayFlag bool
logLevelFlag string
- localPolicyFile string
+ configFile string
keyGracePeriodFlag time.Duration
apiTokenFlag string
@@ -104,9 +104,9 @@ func main() {
logger.Fatalf("Failed to open store: %v", err)
}
- localPolicy, err := LoadLocalPolicy(localPolicyFile)
+ nodeConfig, err := LoadNodeConfig(configFile)
if err != nil {
- logger.Fatalf("Failed to load local policy: %v", err)
+ logger.Fatalf("Failed to load node config: %v", err)
}
defer func() {
if err := store.Close(); err != nil {
@@ -167,7 +167,7 @@ func main() {
logger.Fatal("Hub public key not found in store and not provided. Cannot verify peers.")
}
priv := getOrGenerateKey(store)
- node, err = NewSamNode(context.Background(), priv, hubPubKey, hubAddrs, store, meshFlag, discoveryIntervalFlag, listenAddrs, enableRelayFlag, localPolicy, keyGracePeriodFlag)
+ node, err = NewSamNode(context.Background(), priv, hubPubKey, hubAddrs, store, meshFlag, discoveryIntervalFlag, listenAddrs, enableRelayFlag, nodeConfig, keyGracePeriodFlag)
if err != nil {
logger.Fatalf("Failed to start mesh node: %v", err)
}
@@ -192,13 +192,13 @@ func main() {
if len(hubAddrs) > 0 {
initHubAddrs = hubAddrs
} else {
- logger.Fatalf("Invalid hub address and no stored config: %v", err)
+ logger.Fatalf("Invalid hub address and no stored config: %v. You can use community maintained meshes like hub.sam-mesh.dev (Production) or bananas.sam-mesh.dev (Testnet)", err)
}
}
}
priv := getOrGenerateKey(store)
- node, err = NewSamNode(context.Background(), priv, nil, initHubAddrs, store, meshFlag, discoveryIntervalFlag, listenAddrs, enableRelayFlag, localPolicy, keyGracePeriodFlag)
+ node, err = NewSamNode(context.Background(), priv, nil, initHubAddrs, store, meshFlag, discoveryIntervalFlag, listenAddrs, enableRelayFlag, nodeConfig, keyGracePeriodFlag)
if err != nil {
logger.Fatalf("Failed to initialize node for enrollment: %v", err)
}
@@ -246,9 +246,9 @@ func main() {
logger.Fatalf("Failed to open store: %v", err)
}
- localPolicy, err := LoadLocalPolicy(localPolicyFile)
+ nodeConfig, err := LoadNodeConfig(configFile)
if err != nil {
- logger.Fatalf("Failed to load local policy: %v", err)
+ logger.Fatalf("Failed to load node config: %v", err)
}
defer func() {
if err := store.Close(); err != nil {
@@ -288,7 +288,7 @@ func main() {
}
priv := getOrGenerateKey(store)
- node, err := NewSamNode(context.Background(), priv, nil, initHubAddrs, store, meshFlag, discoveryIntervalFlag, listenAddrs, enableRelayFlag, localPolicy, keyGracePeriodFlag)
+ node, err := NewSamNode(context.Background(), priv, nil, initHubAddrs, store, meshFlag, discoveryIntervalFlag, listenAddrs, enableRelayFlag, nodeConfig, keyGracePeriodFlag)
if err != nil {
logger.Fatalf("Failed to initialize node for enrollment: %v", err)
}
@@ -320,7 +320,7 @@ func main() {
runCmd.Flags().StringVar(&tlsKeyFlag, "tls-key", "", "Path to TLS key for sidecar API")
runCmd.Flags().StringVar(&tlsCAFlag, "tls-ca", "", "Path to TLS CA for sidecar API mTLS")
rootCmd.PersistentFlags().StringVar(&hubAddr, "hub", DefaultHubURL, "Hub URL")
- rootCmd.PersistentFlags().StringVar(&localPolicyFile, "local-policy", DefaultLocalPolicyFile, "Path to local_policy.yaml")
+ rootCmd.PersistentFlags().StringVar(&configFile, "config", DefaultConfigFile, "Path to sam-node.yaml configuration file")
rootCmd.PersistentFlags().StringVar(&tokenURLFlag, "token-url", "", "OIDC Token URL")
rootCmd.AddCommand(runCmd)
diff --git a/cmd/sam-node/middleware_test.go b/cmd/sam-node/middleware_test.go
index ad238fd6..d0310227 100644
--- a/cmd/sam-node/middleware_test.go
+++ b/cmd/sam-node/middleware_test.go
@@ -279,7 +279,7 @@ attenuation:
t.Fatal(err)
}
- var localPolicy *CompiledLocalPolicy
+ var localPolicy *NodeConfigComplete
if tt.localPolicyYAML != "" {
dir := t.TempDir()
policyFile := filepath.Join(dir, "local_policy.yaml")
@@ -287,7 +287,7 @@ attenuation:
t.Fatal(err)
}
var err error
- localPolicy, err = LoadLocalPolicy(policyFile)
+ localPolicy, err = LoadNodeConfig(policyFile)
if err != nil {
t.Fatalf("failed to load local policy: %v", err)
}
diff --git a/cmd/sam-node/node.go b/cmd/sam-node/node.go
index 541022ca..69750994 100644
--- a/cmd/sam-node/node.go
+++ b/cmd/sam-node/node.go
@@ -20,6 +20,7 @@ import (
"crypto/ed25519"
"crypto/sha256"
"encoding/hex"
+ "errors"
"fmt"
"io"
"net/http"
@@ -91,7 +92,7 @@ type SamNode struct {
receivedMsgs map[string][]string
topics map[string]*pubsub.Topic
mu sync.Mutex
- LocalPolicy *CompiledLocalPolicy
+ LocalPolicy *NodeConfigComplete
revokedPeers *lru.Cache[string, int64]
verificationCache *lru.Cache[string, string]
trustedKeys []TrustedKey
@@ -103,7 +104,7 @@ type SamNode struct {
}
// NewSamNode creates a new Agent instance secured with the 4-layer pipeline.
-func NewSamNode(ctx context.Context, privKey crypto.PrivKey, hubPubKey ed25519.PublicKey, hubAddrs []multiaddr.Multiaddr, store *Store, meshID string, discoveryInterval string, listenAddrs []string, enableRelay bool, localPolicy *CompiledLocalPolicy, keyGracePeriod time.Duration) (*SamNode, error) {
+func NewSamNode(ctx context.Context, privKey crypto.PrivKey, hubPubKey ed25519.PublicKey, hubAddrs []multiaddr.Multiaddr, store *Store, meshID string, discoveryInterval string, listenAddrs []string, enableRelay bool, nodeConfig *NodeConfigComplete, keyGracePeriod time.Duration) (*SamNode, error) {
var trustedKeys []TrustedKey
if len(hubPubKey) > 0 {
trustedKeys = []TrustedKey{{Key: hubPubKey, ReceivedAt: time.Now()}}
@@ -116,7 +117,7 @@ func NewSamNode(ctx context.Context, privKey crypto.PrivKey, hubPubKey ed25519.P
receivedMsgs: make(map[string][]string),
topics: make(map[string]*pubsub.Topic),
services: make(map[string]*ServiceManifest),
- LocalPolicy: localPolicy,
+ LocalPolicy: nodeConfig,
}
var err error
@@ -248,6 +249,50 @@ func NewSamNode(ctx context.Context, privKey crypto.PrivKey, hubPubKey ed25519.P
// Start key pruning
node.startKeyPruning(ctx, keyGracePeriod)
+ // Register static services from config
+ if nodeConfig != nil {
+ var errs []error
+ for _, sCfg := range nodeConfig.Services {
+ sType, err := parseServiceType(sCfg.Type)
+ if err != nil {
+ logger.Errorf("[ServiceRegistry] Invalid service type %q for static service %s: %v", sCfg.Type, sCfg.Name, err)
+ errs = append(errs, fmt.Errorf("invalid service type %q for static service %s: %w", sCfg.Type, sCfg.Name, err))
+ continue
+ }
+
+ req := &api.RegisterServiceRequest{
+ Service: &api.ServiceInfo{
+ Type: sType,
+ Name: sCfg.Name,
+ Description: sCfg.Description,
+ },
+ }
+
+ if sCfg.TargetURL != "" {
+ req.Backend = &api.RegisterServiceRequest_TargetUrl{TargetUrl: sCfg.TargetURL}
+ } else if len(sCfg.Command) > 0 {
+ req.Backend = &api.RegisterServiceRequest_Command{
+ Command: &api.CommandBackend{
+ Command: sCfg.Command,
+ Env: sCfg.Env,
+ },
+ }
+ } else {
+ logger.Errorf("[ServiceRegistry] Static service %s has no backend specified", sCfg.Name)
+ errs = append(errs, fmt.Errorf("static service %s has no backend specified", sCfg.Name))
+ continue
+ }
+
+ if err := node.RegisterService(ctx, req); err != nil {
+ logger.Errorf("[ServiceRegistry] Failed to register static service %s: %v", sCfg.Name, err)
+ errs = append(errs, fmt.Errorf("failed to register static service %s: %w", sCfg.Name, err))
+ }
+ }
+ if len(errs) > 0 {
+ return nil, fmt.Errorf("failed to register static services: %w", errors.Join(errs...))
+ }
+ }
+
// Start Ingress HTTP Server
if err := node.StartIngressServer(ctx); err != nil {
return nil, fmt.Errorf("failed to start ingress server: %w", err)
diff --git a/cmd/sam-node/proxy_test.go b/cmd/sam-node/proxy_test.go
index feb1814b..09084f7b 100644
--- a/cmd/sam-node/proxy_test.go
+++ b/cmd/sam-node/proxy_test.go
@@ -53,7 +53,7 @@ func TestDatapathIntegration(t *testing.T) {
// Pre-populate stores with dummy keys to avoid enrollment failure if required
// For this test, we assume we can run without full enrollment if we bypass AuthHandler
- nodeA, err := NewSamNode(ctx, privA, nil, nil, storeA, "test-mesh", "1s", []string{"/ip4/127.0.0.1/tcp/0"}, false, &CompiledLocalPolicy{}, 24*time.Hour)
+ nodeA, err := NewSamNode(ctx, privA, nil, nil, storeA, "test-mesh", "1s", []string{"/ip4/127.0.0.1/tcp/0"}, false, &NodeConfigComplete{}, 24*time.Hour)
if err != nil {
t.Fatal(err)
}
@@ -63,7 +63,7 @@ func TestDatapathIntegration(t *testing.T) {
}
}()
- nodeB, err := NewSamNode(ctx, privB, nil, nil, storeB, "test-mesh", "1s", []string{"/ip4/127.0.0.1/tcp/0"}, false, &CompiledLocalPolicy{}, 24*time.Hour)
+ nodeB, err := NewSamNode(ctx, privB, nil, nil, storeB, "test-mesh", "1s", []string{"/ip4/127.0.0.1/tcp/0"}, false, &NodeConfigComplete{}, 24*time.Hour)
if err != nil {
t.Fatal(err)
}
@@ -212,13 +212,13 @@ func TestStdioDatapathIntegration(t *testing.T) {
}
defer func() { _ = storeB.Close() }()
- nodeA, err := NewSamNode(ctx, privA, nil, nil, storeA, "test-mesh", "1s", []string{"/ip4/127.0.0.1/tcp/0"}, false, &CompiledLocalPolicy{}, 24*time.Hour)
+ nodeA, err := NewSamNode(ctx, privA, nil, nil, storeA, "test-mesh", "1s", []string{"/ip4/127.0.0.1/tcp/0"}, false, &NodeConfigComplete{}, 24*time.Hour)
if err != nil {
t.Fatal(err)
}
defer func() { _ = nodeA.Host.Close() }()
- nodeB, err := NewSamNode(ctx, privB, nil, nil, storeB, "test-mesh", "1s", []string{"/ip4/127.0.0.1/tcp/0"}, false, &CompiledLocalPolicy{}, 24*time.Hour)
+ nodeB, err := NewSamNode(ctx, privB, nil, nil, storeB, "test-mesh", "1s", []string{"/ip4/127.0.0.1/tcp/0"}, false, &NodeConfigComplete{}, 24*time.Hour)
if err != nil {
t.Fatal(err)
}
diff --git a/tests/e2e/policy.bats b/tests/e2e/policy.bats
index 94d42b37..69cde7b9 100644
--- a/tests/e2e/policy.bats
+++ b/tests/e2e/policy.bats
@@ -218,7 +218,7 @@ EOF"
--bind-addr "0.0.0.0:8080" \
--api-token "secret-token" \
--mesh "e2e-mesh" \
- --local-policy "/etc/sam/local_policy.yaml" >/dev/null
+ --config "/etc/sam/local_policy.yaml" >/dev/null
MESH_CONTAINERS+=("${MESH_PREFIX}-node-1")
mesh_wait_for_log "${MESH_PREFIX}-node-1" "Successfully enrolled" 20