Agent Mesh
Go a2aa2a-protocolagent-meshagentic-aiinferencemcpmeshmesh-networknetwork-securitynetworking-aip2p-network
fix(router): address PR review comments for deadlock, data races, host guard, and immediate lease renewal
Antonio Ojea176990d84d94
diff --git a/internal/router/router.go b/internal/router/router.goindex 3499bcda..42a2157a 100644--- a/internal/router/router.go+++ b/internal/router/router.go@@ -94,6 +94,7 @@ type Router struct {biscuitExpiration time.TimetrustedPublicKeys []ed25519.PublicKeykeysMu sync.RWMutex+ enrollMu sync.MutexprivKey crypto.PrivKey// Control contexts@@ -320,9 +321,9 @@ func (r *Router) enroll(peerID peer.ID) error {return err}+ r.keysMu.Lock()r.biscuitToken = enrollResp.BiscuitTokenr.biscuitExpiration = time.Unix(enrollResp.Expiration, 0)- r.keysMu.Lock()r.trustedPublicKeys = []ed25519.PublicKey{enrollResp.HubPublicKey}r.keysMu.Unlock()@@ -442,9 +443,9 @@ func (r *Router) enrollBootstrap(peerID peer.ID) error {return fmt.Errorf("enrollment not approved (status: %v)", enrollResp.Status)}+ r.keysMu.Lock()r.biscuitToken = enrollResp.BiscuitTokenr.biscuitExpiration = time.Unix(enrollResp.Expiration, 0)- r.keysMu.Lock()r.trustedPublicKeys = []ed25519.PublicKey{enrollResp.HubPublicKey}r.keysMu.Unlock()@@ -457,6 +458,13 @@ func (r *Router) enrollBootstrap(peerID peer.ID) error {}func (r *Router) reEnroll() error {+ r.enrollMu.Lock()+ defer r.enrollMu.Unlock()++ if r.Host == nil {+ return fmt.Errorf("cannot re-enroll: router host is not initialized")+ }+if r.config.BootstrapToken != "" {return r.enrollBootstrap(r.Host.ID())} else if r.config.OIDCToken != "" {@@ -543,7 +551,11 @@ func (r *Router) runLeaseRenewalLoop() {}func (r *Router) renewLease() {- if len(r.biscuitToken) == 0 {+ 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}@@ -573,7 +585,7 @@ func (r *Router) renewLease() {req := &api.RouterLeaseRequest{PeerId: r.Host.ID().String(),Addresses: addrs,- Biscuit: r.biscuitToken,+ Biscuit: biscuit,ConnectedPeers: connectedPeers,DhtSize: dhtSize,}@@ -592,9 +604,10 @@ func (r *Router) renewLease() {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)- } else {- logger.Info("Successfully re-enrolled after 401 Unauthorized lease renewal")+ return}+ logger.Info("Successfully re-enrolled after 401 Unauthorized lease renewal, retrying lease renewal...")+ r.renewLease()return}@@ -738,10 +751,14 @@ func (r *Router) HandleAuthHandshake(s network.Stream) {logger.Infof("[AuthN] Successfully authenticated peer %s", remotePeer)// Send mutual response (our biscuit)+ r.keysMu.RLock()+ ourBiscuit := r.biscuitToken+ r.keysMu.RUnlock()+writer := msgio.NewVarintWriter(s)resp := &api.AuthResponse{Success: true,- Biscuit: r.biscuitToken,+ Biscuit: ourBiscuit,}respBytes, _ := proto.Marshal(resp)if err := writer.WriteMsg(respBytes); err != nil {@@ -879,10 +896,11 @@ func isLoopbackOrLinkLocal(addr multiaddr.Multiaddr) bool {// RefreshEnrollment trades the expiring biscuit token for a new one using a cryptographic challenge.func (r *Router) RefreshEnrollment(ctx context.Context) error {- r.keysMu.Lock()- defer r.keysMu.Unlock()+ r.keysMu.RLock()+ currentBiscuit := r.biscuitToken+ r.keysMu.RUnlock()- if len(r.biscuitToken) == 0 {+ if len(currentBiscuit) == 0 {return fmt.Errorf("router not enrolled (no biscuit)")}@@ -910,8 +928,7 @@ func (r *Router) RefreshEnrollment(ctx context.Context) error {return fmt.Errorf("failed to create http request: %w", err)}httpReq.Header.Set("Content-Type", "application/x-protobuf")- // Set current biscuit in authorization header- b64Biscuit := base64.StdEncoding.EncodeToString(r.biscuitToken)+ b64Biscuit := base64.StdEncoding.EncodeToString(currentBiscuit)httpReq.Header.Set("Authorization", "Bearer "+b64Biscuit)client := &http.Client{Timeout: 10 * time.Second}@@ -954,9 +971,12 @@ func (r *Router) RefreshEnrollment(ctx context.Context) error {return fmt.Errorf("refresh error: %s", refreshResp.ErrorMessage)}- // Update local biscuit token and expiration+ // Update local biscuit token and expiration under lock+ r.keysMu.Lock()r.biscuitToken = refreshResp.BiscuitTokenr.biscuitExpiration = time.Unix(refreshResp.ExpiresAt, 0)+ r.keysMu.Unlock()+logger.Infof("Router biscuit token refreshed successfully.")return nil}diff --git a/internal/router/router_test.go b/internal/router/router_test.goindex bdcfdaac..7acb266f 100644--- a/internal/router/router_test.go+++ b/internal/router/router_test.go@@ -513,3 +513,74 @@ func TestRouterLeaseRenewalReEnrollOn401(t *testing.T) {}}+func TestRouterReEnrollUninitializedHostGuard(t *testing.T) {+ r := &Router{}+ err := r.reEnroll()+ if err == nil {+ t.Fatal("expected reEnroll to return error when r.Host is nil, got nil")+ }+ expectedMsg := "cannot re-enroll: router host is not initialized"+ if err.Error() != expectedMsg {+ t.Fatalf("expected error %q, got %q", expectedMsg, err.Error())+ }+}++func TestRouterProactiveRefreshReEnrollOn401(t *testing.T) {+ issuer, mintToken := startCustomMockOIDC(t)+ cp, cpStore, cpURL := setupControlPlane(t, issuer)+ defer func() {+ _ = cp.Close()+ _ = cpStore.Close()+ }()++ tempDir := t.TempDir()+ routerKeyPath := filepath.Join(tempDir, "router.key")++ routerJWT := mintToken(map[string]interface{}{+ "sub": "router-refresh-401-test",+ "groups": []string{"routers"},+ })++ rOpts := Options{+ ControlPlaneURL: cpURL,+ ListenAddrs: []string{"/ip4/127.0.0.1/tcp/0"},+ KeysSyncInterval: 20 * time.Second,+ LeaseRenewInterval: 20 * time.Second,+ OIDCToken: routerJWT,+ KeysDBPath: routerKeyPath,+ AllowLoopback: true,+ BiscuitTimeout: 1 * time.Second,+ }++ r, err := NewRouter(context.Background(), rOpts)+ if err != nil {+ t.Fatalf("failed to create router: %v", err)+ }++ if err := r.Start(); err != nil {+ t.Fatalf("failed to start router: %v", err)+ }+ defer func() { _ = r.Close() }()++ // Corrupt router's biscuit token to simulate key rotation+ r.keysMu.Lock()+ r.biscuitToken = []byte("stale-biscuit-signed-by-purged-key")+ r.keysMu.Unlock()++ // Trigger proactive refresh which should fail with 401, trigger reEnroll, and succeed+ err = r.RefreshEnrollment(context.Background())+ if err != nil {+ t.Fatalf("expected RefreshEnrollment to recover via reEnroll, but got error: %v", err)+ }++ // Verify that biscuitToken was replaced with a valid fresh token+ r.keysMu.RLock()+ currentToken := r.biscuitToken+ r.keysMu.RUnlock()++ if bytes.Equal(currentToken, []byte("stale-biscuit-signed-by-purged-key")) {+ t.Error("expected biscuitToken to be updated after 401 refresh fallback, but it remained stale")+ }+}++