Skip to content

Agent Mesh

fix router reenrollment

Antonio Ojea288f59525635
diff --git a/internal/router/router.go b/internal/router/router.go
index af3c2a78..3499bcda 100644
--- a/internal/router/router.go
+++ b/internal/router/router.go
@@ -456,6 +456,15 @@ func (r *Router) enrollBootstrap(peerID peer.ID) error {
return nil
}
+func (r *Router) reEnroll() error {
+ if r.config.BootstrapToken != "" {
+ return r.enrollBootstrap(r.Host.ID())
+ } else if r.config.OIDCToken != "" {
+ return r.enroll(r.Host.ID())
+ }
+ return fmt.Errorf("no enrollment token available for re-enrollment")
+}
+
func (r *Router) syncKeys() error {
client := &http.Client{Timeout: 10 * time.Second}
resp, err := client.Get(r.config.ControlPlaneURL + "/keys")
@@ -578,6 +587,17 @@ func (r *Router) renewLease() {
}
defer func() { _ = resp.Body.Close() }()
+ 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)
+ } else {
+ logger.Info("Successfully re-enrolled after 401 Unauthorized lease renewal")
+ }
+ 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))
@@ -901,6 +921,12 @@ func (r *Router) RefreshEnrollment(ctx context.Context) error {
}
defer func() { _ = resp.Body.Close() }()
+ if resp.StatusCode == http.StatusUnauthorized {
+ body, _ := io.ReadAll(resp.Body)
+ logger.Warnf("Proactive biscuit refresh rejected (401 Unauthorized: %s), attempting re-enrollment...", string(body))
+ return r.reEnroll()
+ }
+
if resp.StatusCode == http.StatusForbidden {
logger.Errorf("Refresh rejected: Router is banned (403 Forbidden). Hard-killing router.")
if r.Host != nil {
diff --git a/internal/router/router_test.go b/internal/router/router_test.go
index a73389bd..bdcfdaac 100644
--- a/internal/router/router_test.go
+++ b/internal/router/router_test.go
@@ -457,3 +457,59 @@ func TestRouterProactiveTokenRefresh(t *testing.T) {
t.Errorf("expected refreshed expiration %v to be after initial expiration %v", r.biscuitExpiration, initialExpiration)
}
}
+
+func TestRouterLeaseRenewalReEnrollOn401(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-reenroll-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/expiration
+ r.keysMu.Lock()
+ r.biscuitToken = []byte("invalid-corrupted-biscuit")
+ r.keysMu.Unlock()
+
+ // Call renewLease which should fail with 401, trigger reEnroll, and succeed
+ r.renewLease()
+
+ // Verify that biscuitToken was replaced with a valid non-corrupted token
+ r.keysMu.RLock()
+ currentToken := r.biscuitToken
+ r.keysMu.RUnlock()
+
+ if bytes.Equal(currentToken, []byte("invalid-corrupted-biscuit")) {
+ t.Error("expected biscuitToken to be updated after 401 re-enrollment, but it remained corrupted")
+ }
+}
+