Agent Mesh
Go a2aa2a-protocolagent-meshagentic-aiinferencemcpmeshmesh-networknetwork-securitynetworking-aip2p-network
fix tls
Antonio Ojea49861ecdbed6
diff --git a/.github/k8s/sam-hub-template.yaml b/.github/k8s/sam-hub-template.yamlindex b332b62f..524e9fee 100644--- a/.github/k8s/sam-hub-template.yaml+++ b/.github/k8s/sam-hub-template.yaml@@ -139,3 +139,6 @@ spec:- port: metricsinterval: 30spath: /metrics+ scheme: https+ tls:+ insecureSkipVerify: truediff --git a/cmd/sam-hub/main.go b/cmd/sam-hub/main.goindex 66403963..c5ab671c 100644--- a/cmd/sam-hub/main.go+++ b/cmd/sam-hub/main.go@@ -140,7 +140,7 @@ type Hub struct {}// NewHub starts a host supporting both QUIC and TCP (with TLS 1.3)-func NewHub(ctx context.Context, policy *api.PolicyConfig, allowLoopback bool, mux *http.ServeMux) (*Hub, error) {+func NewHub(ctx context.Context, policy *api.PolicyConfig, allowLoopback bool, mux *http.ServeMux, serverTlsConfig *tls.Config) (*Hub, error) {// Connection Manager for DoS protectioncm, err := connmgr.NewConnManager(LowWaterMark, HighWaterMark, connmgr.WithGracePeriod(ConnGracePeriod))@@ -169,7 +169,11 @@ func NewHub(ctx context.Context, policy *api.PolicyConfig, allowLoopback bool, m}),}if mux != nil {- opts = append(opts, libp2p.Transport(websocket.New, websocket.WithHTTPHandler(mux)))+ if serverTlsConfig != nil {+ opts = append(opts, libp2p.Transport(websocket.New, websocket.WithHTTPHandler(mux), websocket.WithTLSConfig(serverTlsConfig)))+ } else {+ opts = append(opts, libp2p.Transport(websocket.New, websocket.WithHTTPHandler(mux)))+ }}h, err := libp2p.New(opts...)@@ -628,7 +632,19 @@ func main() {if strings.Contains(host, ":") {ipVersion = "ip6"}- wsAddr := fmt.Sprintf("/%s/%s/tcp/%s/ws", ipVersion, host, port)+ var serverTlsConfig *tls.Config+ wsScheme := "ws"+ if tlsCertFile != "" && tlsKeyFile != "" {+ cert, err := tls.LoadX509KeyPair(tlsCertFile, tlsKeyFile)+ if err != nil {+ logger.Fatalf("Failed to load TLS cert: %v", err)+ }+ serverTlsConfig = &tls.Config{+ Certificates: []tls.Certificate{cert},+ }+ wsScheme = "wss"+ }+ wsAddr := fmt.Sprintf("/%s/%s/tcp/%s/%s", ipVersion, host, port, wsScheme)listenAddrs = append(listenAddrs, wsAddr)var hRef atomic.Pointer[Hub]@@ -675,7 +691,7 @@ func main() {}})- h, err := NewHub(ctx, policyConfig, allowLoopbackFlag, mux)+ h, err := NewHub(ctx, policyConfig, allowLoopbackFlag, mux, serverTlsConfig)if err != nil {logger.Fatal(err)}@@ -684,12 +700,6 @@ func main() {// Start key rotation if enabledh.startRotation(ctx)- // We don't start a separate HTTP server unless TLS is specifically required for admin separately,- // but WithHTTPHandler already shares the port on the websocket listener.- if tlsCertFile != "" && tlsKeyFile != "" {- logger.Warn("Separate TLS server not supported via CLI when using WithHTTPHandler. Ignoring tlsCertFile.")- }-logger.Infof("SAM Hub Online (QUIC + TCP + WS on %s)", bindAddress)isHubReady.Store(true)logger.Infof("MeshID: %s", h.MeshID)