Agent Mesh
Go a2aa2a-protocolagent-meshagentic-aiinferencemcpmeshmesh-networknetwork-securitynetworking-aip2p-network
refactor(router): consolidate token resolution and enrollment logic
Antonio Ojea0a072d9000c0
diff --git a/internal/router/router.go b/internal/router/router.goindex 04fdb1a0..d1fff235 100644--- a/internal/router/router.go+++ b/internal/router/router.go@@ -148,35 +148,11 @@ func (r *Router) Start() error {return err}- if r.config.BootstrapToken == "" && r.config.BootstrapTokenPath != "" {- tokenData, err := os.ReadFile(r.config.BootstrapTokenPath)- if err != nil {- return fmt.Errorf("failed to read bootstrap token from path %s: %w", r.config.BootstrapTokenPath, err)- }- r.config.BootstrapToken = strings.TrimSpace(string(tokenData))- }-- if r.config.BootstrapToken != "" {- logger.Infof("Enrolling router %s with Control Plane at %s using Bootstrap Token...", peerID, r.config.ControlPlaneURL)- if err := r.enrollBootstrap(peerID); err != nil {- return fmt.Errorf("failed router bootstrap enrollment: %w", err)- }- } else {- if r.config.OIDCToken == "" && r.config.JWTPath != "" {- tokenData, err := os.ReadFile(r.config.JWTPath)- if err != nil {- return fmt.Errorf("failed to read JWT from path %s: %w", r.config.JWTPath, err)- }- r.config.OIDCToken = strings.TrimSpace(string(tokenData))- }-- if r.config.OIDCToken != "" {- logger.Infof("Enrolling router %s with Control Plane at %s using OIDC Token...", peerID, r.config.ControlPlaneURL)- if err := r.enroll(peerID); err != nil {- return fmt.Errorf("failed router enrollment: %w", err)- }- } else {+ if err := r.enrollWithTokens(peerID); err != nil {+ if strings.Contains(err.Error(), "no enrollment token available") {logger.Warn("Router started without OIDCToken or BootstrapToken. Enrollment bypassed. Expecting local keys sync.")+ } else {+ return err}}@@ -471,17 +447,42 @@ 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 == "" {+func (r *Router) enrollWithTokens(peerID peer.ID) error {+ // Always read the token from disk if a path is specified to handle rotation+ if r.config.BootstrapTokenPath != "" {+ tokenData, err := os.ReadFile(r.config.BootstrapTokenPath)+ if err != nil {+ return fmt.Errorf("failed to read bootstrap token from path %s: %w", r.config.BootstrapTokenPath, err)+ }+ r.config.BootstrapToken = strings.TrimSpace(string(tokenData))+ }++ if r.config.BootstrapToken != "" {+ logger.Infof("Enrolling router %s with Control Plane at %s using Bootstrap Token...", peerID, r.config.ControlPlaneURL)+ if err := r.enrollBootstrap(peerID); err != nil {+ return fmt.Errorf("failed router bootstrap enrollment: %w", err)+ }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)++ // Fallback to OIDC token+ if r.config.JWTPath != "" {+ tokenData, err := os.ReadFile(r.config.JWTPath)+ if err != nil {+ return fmt.Errorf("failed to read JWT from path %s: %w", r.config.JWTPath, err)+ }+ r.config.OIDCToken = strings.TrimSpace(string(tokenData))}- r.config.OIDCToken = strings.TrimSpace(string(tokenData))- return nil++ if r.config.OIDCToken != "" {+ logger.Infof("Enrolling router %s with Control Plane at %s using OIDC Token...", peerID, r.config.ControlPlaneURL)+ if err := r.enroll(peerID); err != nil {+ return fmt.Errorf("failed router enrollment: %w", err)+ }+ return nil+ }++ return fmt.Errorf("no enrollment token available")}func (r *Router) reEnroll() error {@@ -492,16 +493,7 @@ func (r *Router) reEnroll() error {return fmt.Errorf("cannot re-enroll: router host is not initialized")}- if r.config.BootstrapToken != "" {- return r.enrollBootstrap(r.Host.ID())- }- 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")+ return r.enrollWithTokens(r.Host.ID())}func (r *Router) syncKeys() error {diff --git a/internal/router/router_test.go b/internal/router/router_test.goindex 57814732..6bf02e51 100644--- a/internal/router/router_test.go+++ b/internal/router/router_test.go@@ -28,6 +28,7 @@ import ("net/http/httptest""os""path/filepath"+ "strings""testing""time"@@ -686,37 +687,58 @@ func TestRouterGossipSubBannedEvent(t *testing.T) {}}-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)- }+func TestRouterEnrollWithTokensResolution(t *testing.T) {+ mux := http.NewServeMux()+ mux.HandleFunc("/enroll", func(w http.ResponseWriter, r *http.Request) {+ w.WriteHeader(http.StatusOK)+ w.Write([]byte(`{"biscuit":"dummy-biscuit-bootstrap"}`))+ })+ mux.HandleFunc("/register", func(w http.ResponseWriter, r *http.Request) {+ w.WriteHeader(http.StatusOK)+ w.Write([]byte(`{"biscuit":"dummy-biscuit-oidc"}`))+ })+ srv := httptest.NewServer(mux)+ defer srv.Close()- 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")- }+ t.Run("BootstrapTokenPath updates BootstrapToken", func(t *testing.T) {+ path := filepath.Join(t.TempDir(), "bootstrap-token")+ os.WriteFile(path, []byte(" boot-123 \n"), 0o600)- 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")- }-}+ r := &Router{config: Options{BootstrapTokenPath: path, ControlPlaneURL: srv.URL}}+ priv, _, _ := crypto.GenerateKeyPair(crypto.Ed25519, -1)+ r.privKey = priv-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)- }+ err := r.enrollWithTokens(peer.ID("dummy"))+ if err == nil || !strings.Contains(err.Error(), "failed to unmarshal") {+ // We expect a proto unmarshal error because the dummy biscuit is just JSON,+ // but we want to assert the token was read correctly first.+ }+ if r.config.BootstrapToken != "boot-123" {+ t.Fatalf("expected BootstrapToken %q, got %q", "boot-123", r.config.BootstrapToken)+ }+ })++ t.Run("JWTPath updates OIDCToken", func(t *testing.T) {+ path := filepath.Join(t.TempDir(), "oidc-token")+ os.WriteFile(path, []byte(" oidc-123 \n"), 0o600)++ r := &Router{config: Options{JWTPath: path, ControlPlaneURL: srv.URL}}+ priv, _, _ := crypto.GenerateKeyPair(crypto.Ed25519, -1)+ r.privKey = priv++ err := r.enrollWithTokens(peer.ID("dummy"))+ if err == nil || !strings.Contains(err.Error(), "failed to unmarshal") {+ }+ if r.config.OIDCToken != "oidc-123" {+ t.Fatalf("expected OIDCToken %q, got %q", "oidc-123", r.config.OIDCToken)+ }+ })++ t.Run("No tokens returns error", func(t *testing.T) {+ r := &Router{config: Options{ControlPlaneURL: srv.URL}}+ err := r.enrollWithTokens(peer.ID("dummy"))+ if err == nil || err.Error() != "no enrollment token available" {+ t.Fatalf("expected 'no enrollment token available', got %v", err)+ }+ })}