Agent Mesh
Go a2aa2a-protocolagent-meshagentic-aiinferencemcpmeshmesh-networknetwork-securitynetworking-aip2p-network
Fix router re-enroll process
Tomas Tormo961667d00674
diff --git a/internal/router/router.go b/internal/router/router.goindex c4fd72c6..04fdb1a0 100644--- a/internal/router/router.go+++ b/internal/router/router.go@@ -471,6 +471,19 @@ func (r *Router) enrollBootstrap(peerID peer.ID) error {return nil}+// refreshOIDCToken re-reads the JWT from disk.+func (r *Router) refreshOIDCToken() error {+ if r.config.JWTPath == "" {+ return nil+ }+ tokenData, err := os.ReadFile(r.config.JWTPath)+ if err != nil {+ return fmt.Errorf("failed to re-read JWT from path %s: %w", r.config.JWTPath, err)+ }+ r.config.OIDCToken = strings.TrimSpace(string(tokenData))+ return nil+}+func (r *Router) reEnroll() error {r.enrollMu.Lock()defer r.enrollMu.Unlock()@@ -481,7 +494,11 @@ func (r *Router) reEnroll() error {if r.config.BootstrapToken != "" {return r.enrollBootstrap(r.Host.ID())- } else if r.config.OIDCToken != "" {+ }+ if err := r.refreshOIDCToken(); err != nil {+ return err+ }+ if r.config.OIDCToken != "" {return r.enroll(r.Host.ID())}return fmt.Errorf("no enrollment token available for re-enrollment")diff --git a/internal/router/router_test.go b/internal/router/router_test.goindex 149ac411..57814732 100644--- a/internal/router/router_test.go+++ b/internal/router/router_test.go@@ -26,6 +26,7 @@ import ("math/big""net/http""net/http/httptest"+ "os""path/filepath""testing""time"@@ -684,3 +685,38 @@ func TestRouterGossipSubBannedEvent(t *testing.T) {t.Errorf("expected peer %s to be stored in bannedPeers blocklist upon receiving MeshEvent_BANNED", bannedPeerIDStr)}}++func TestRouterRefreshOIDCTokenRereadsRotatedFile(t *testing.T) {+ jwtPath := filepath.Join(t.TempDir(), "sam-token")+ if err := os.WriteFile(jwtPath, []byte("token-at-startup\n"), 0o600); err != nil {+ t.Fatalf("write token: %v", err)+ }++ r := &Router{config: Options{JWTPath: jwtPath}}+ if err := r.refreshOIDCToken(); err != nil {+ t.Fatalf("refreshOIDCToken: %v", err)+ }+ if r.config.OIDCToken != "token-at-startup" {+ t.Fatalf("OIDCToken = %q, want %q", r.config.OIDCToken, "token-at-startup")+ }++ if err := os.WriteFile(jwtPath, []byte("token-after-rotation\n"), 0o600); err != nil {+ t.Fatalf("rotate token: %v", err)+ }+ if err := r.refreshOIDCToken(); err != nil {+ t.Fatalf("refreshOIDCToken after rotation: %v", err)+ }+ if r.config.OIDCToken != "token-after-rotation" {+ t.Fatalf("OIDCToken = %q, want %q", r.config.OIDCToken, "token-after-rotation")+ }+}++func TestRouterRefreshOIDCTokenNoPath(t *testing.T) {+ r := &Router{config: Options{OIDCToken: "static-token"}}+ if err := r.refreshOIDCToken(); err != nil {+ t.Fatalf("refreshOIDCToken with no JWTPath: %v", err)+ }+ if r.config.OIDCToken != "static-token" {+ t.Fatalf("OIDCToken = %q, want it untouched", r.config.OIDCToken)+ }+}