Agent Mesh
Go a2aa2a-protocolagent-meshagentic-aiinferencemcpmeshmesh-networknetwork-securitynetworking-aip2p-network
fix(router): eliminate stack recursion in renewLease and add regression test
Antonio Ojeafc1b6769a88a
diff --git a/internal/router/router.go b/internal/router/router.goindex d1fff235..99599f3a 100644--- a/internal/router/router.go+++ b/internal/router/router.go@@ -649,84 +649,85 @@ func (r *Router) runLeaseRenewalLoop() {}func (r *Router) renewLease() {- r.keysMu.RLock()- biscuit := r.biscuitToken- r.keysMu.RUnlock()-- if len(biscuit) == 0 {- logger.Warn("Cannot renew lease: router is not enrolled (no biscuit)")- return- }+ for attempt := 0; attempt < 2; attempt++ {+ r.keysMu.RLock()+ biscuit := r.biscuitToken+ r.keysMu.RUnlock()- var addrs []string- if len(r.config.ExternalAddrs) > 0 {- for _, addr := range r.config.ExternalAddrs {- addrs = append(addrs, addr+"/p2p/"+r.Host.ID().String())+ if len(biscuit) == 0 {+ logger.Warn("Cannot renew lease: router is not enrolled (no biscuit)")+ return}- } else {- for _, addr := range r.Host.Addrs() {- addrs = append(addrs, addr.String()+"/p2p/"+r.Host.ID().String())++ var addrs []string+ if len(r.config.ExternalAddrs) > 0 {+ for _, addr := range r.config.ExternalAddrs {+ addrs = append(addrs, addr+"/p2p/"+r.Host.ID().String())+ }+ } else {+ for _, addr := range r.Host.Addrs() {+ addrs = append(addrs, addr.String()+"/p2p/"+r.Host.ID().String())+ }}- }- var connectedPeers []string- if r.Host != nil && r.Host.Network() != nil {- for _, p := range r.Host.Network().Peers() {- connectedPeers = append(connectedPeers, p.String())+ var connectedPeers []string+ if r.Host != nil && r.Host.Network() != nil {+ for _, p := range r.Host.Network().Peers() {+ connectedPeers = append(connectedPeers, p.String())+ }+ }+ var dhtSize int32+ if r.DHT != nil && r.DHT.RoutingTable() != nil {+ dhtSize = int32(r.DHT.RoutingTable().Size())}- }- var dhtSize int32- if r.DHT != nil && r.DHT.RoutingTable() != nil {- dhtSize = int32(r.DHT.RoutingTable().Size())- }- req := &api.RouterLeaseRequest{- PeerId: r.Host.ID().String(),- Addresses: addrs,- Biscuit: biscuit,- ConnectedPeers: connectedPeers,- DhtSize: dhtSize,- }- data, _ := proto.Marshal(req)+ req := &api.RouterLeaseRequest{+ PeerId: r.Host.ID().String(),+ Addresses: addrs,+ Biscuit: biscuit,+ ConnectedPeers: connectedPeers,+ DhtSize: dhtSize,+ }+ data, _ := proto.Marshal(req)- client := &http.Client{Timeout: 10 * time.Second}- resp, err := client.Post(r.config.ControlPlaneURL+"/routers/lease", "application/x-protobuf", bytes.NewReader(data))- if err != nil {- logger.Errorf("Failed to renew lease with control plane: %v", err)- return- }- defer func() { _ = resp.Body.Close() }()+ client := &http.Client{Timeout: 10 * time.Second}+ resp, err := client.Post(r.config.ControlPlaneURL+"/routers/lease", "application/x-protobuf", bytes.NewReader(data))+ if err != nil {+ logger.Errorf("Failed to renew lease with control plane: %v", err)+ return+ }- if resp.StatusCode == http.StatusUnauthorized {body, _ := io.ReadAll(resp.Body)- logger.Warnf("Control plane lease renewal rejected (401 Unauthorized: %s), attempting re-enrollment...", string(body))- if err := r.reEnroll(); err != nil {- logger.Errorf("Re-enrollment failed after 401 Unauthorized lease renewal: %v", err)+ _ = resp.Body.Close()++ if resp.StatusCode == http.StatusUnauthorized && attempt == 0 {+ logger.Warnf("Control plane lease renewal rejected (401 Unauthorized: %s), attempting re-enrollment...", string(body))+ if err := r.reEnroll(); err != nil {+ logger.Errorf("Re-enrollment failed after 401 Unauthorized lease renewal: %v", err)+ return+ }+ logger.Info("Successfully re-enrolled after 401 Unauthorized lease renewal, retrying lease renewal...")+ continue+ }++ if resp.StatusCode != http.StatusOK {+ logger.Errorf("Control plane lease renewal rejected, status %s: %s", resp.Status, string(body))return}- logger.Info("Successfully re-enrolled after 401 Unauthorized lease renewal, retrying lease renewal...")- r.renewLease()- return- }- if resp.StatusCode != http.StatusOK {- body, _ := io.ReadAll(resp.Body)- logger.Errorf("Control plane lease renewal rejected, status %s: %s", resp.Status, string(body))- return- }+ var leaseResp api.RouterLeaseResponse+ if err := proto.Unmarshal(body, &leaseResp); err != nil {+ logger.Errorf("Failed to parse lease response: %v", err)+ return+ }- var leaseResp api.RouterLeaseResponse- body, _ := io.ReadAll(resp.Body)- if err := proto.Unmarshal(body, &leaseResp); err != nil {- logger.Errorf("Failed to parse lease response: %v", err)+ if !leaseResp.Success {+ logger.Errorf("Lease renewal failed: %s", leaseResp.Error)+ } else {+ logger.Debugf("Lease renewed successfully. Expires at: %s", time.Unix(leaseResp.ExpiresAt, 0))+ }return}-- if !leaseResp.Success {- logger.Errorf("Lease renewal failed: %s", leaseResp.Error)- } else {- logger.Debugf("Lease renewed successfully. Expires at: %s", time.Unix(leaseResp.ExpiresAt, 0))- }}func (r *Router) runFederationLoop() {diff --git a/internal/router/router_test.go b/internal/router/router_test.goindex 4adc0367..aa3a2536 100644--- a/internal/router/router_test.go+++ b/internal/router/router_test.go@@ -520,6 +520,35 @@ func TestRouterLeaseRenewalReEnrollOn401(t *testing.T) {}}+func TestRouterLeaseRenewalRepeated401Terminates(t *testing.T) {+ serverCalls := 0+ ts := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {+ serverCalls+++ http.Error(w, "Unauthorized", http.StatusUnauthorized)+ }))+ defer ts.Close()++ h, err := libp2p.New(libp2p.ListenAddrStrings("/ip4/127.0.0.1/tcp/0"))+ if err != nil {+ t.Fatalf("failed to create libp2p host: %v", err)+ }+ defer func() { _ = h.Close() }()++ r := &Router{+ Host: h,+ biscuitToken: []byte("dummy-biscuit"),+ config: Options{+ ControlPlaneURL: ts.URL,+ },+ }++ r.renewLease()++ if serverCalls > 2 {+ t.Errorf("renewLease made %d HTTP calls; expected at most 2 calls before terminating", serverCalls)+ }+}+func TestRouterReEnrollUninitializedHostGuard(t *testing.T) {r := &Router{}err := r.reEnroll()