Agent Mesh
Go a2aa2a-protocolagent-meshagentic-aiinferencemcpmeshmesh-networknetwork-securitynetworking-aip2p-network
mobile: re-enroll with the refresh token saved at enrollment
Tomas Tormo8be1296d4185
diff --git a/internal/node/enroll.go b/internal/node/enroll.goindex 0fb9d4aa..09701cf0 100644--- a/internal/node/enroll.go+++ b/internal/node/enroll.go@@ -119,11 +119,10 @@ func (n *SamNode) enrollHTTP(ctx context.Context, controlPlaneURL, jwt string, preturn n.processEnrollResponse(resp)}-// recoverStaleIdentity re-enrolls over HTTP with a JWT obtained from the-// stored refresh token, keeping the node's PeerID. It must not touch n.Host:-// it runs before the host exists, and router connection happens in the-// normal startup path afterwards.-func (n *SamNode) recoverStaleIdentity(ctx context.Context) error {+// ReEnrollWithRefreshToken re-enrolls over HTTP with a JWT from the stored+// refresh token, keeping the PeerID. Must not touch n.Host: startup recovery+// runs it before the host exists, and the mobile app on a never-started node.+func (n *SamNode) ReEnrollWithRefreshToken(ctx context.Context) error {controlPlaneURL, err := n.Store.LoadControlPlaneURL()if err != nil || controlPlaneURL == "" {return fmt.Errorf("no control plane URL in store")diff --git a/internal/node/node.go b/internal/node/node.goindex f402e053..c67c296f 100644--- a/internal/node/node.go+++ b/internal/node/node.go@@ -356,7 +356,7 @@ func (n *SamNode) Start(ctx context.Context) error {// period while offline): try silent re-enrollment with the// stored refresh token before giving up.logger.Warnf("Loaded identity fails role requirement %q: %v; attempting recovery via stored refresh token", n.config.RequiredRole, roleErr)- if recErr := n.recoverStaleIdentity(ctx); recErr != nil {+ if recErr := n.ReEnrollWithRefreshToken(ctx); recErr != nil {return fmt.Errorf("loaded identity fails role requirement %q (refresh-token recovery failed: %v): %w", n.config.RequiredRole, recErr, roleErr)}logger.Info("Identity recovered via refresh-token re-enrollment.")diff --git a/mobile/sam-node-app/lib/main.dart b/mobile/sam-node-app/lib/main.dartindex 47e8cb8a..8fb19ba2 100644--- a/mobile/sam-node-app/lib/main.dart+++ b/mobile/sam-node-app/lib/main.dart@@ -28,9 +28,17 @@ Future<String?> _isolatedFetchControlPlaneInfo(String url) => Isolate.run(() {}});-Future<String?> _isolatedEnroll(String dataDir, String controlPlaneText, String jwtText, bool allowLoopback, String labelsText) => Isolate.run(() {+Future<String?> _isolatedEnroll(String dataDir, String controlPlaneText, String jwtText, bool allowLoopback, String labelsText, String refreshToken) => Isolate.run(() {try {- return SamNodeLib().enroll(dataDir, controlPlaneText, jwtText, allowLoopback, labelsText);+ return SamNodeLib().enroll(dataDir, controlPlaneText, jwtText, allowLoopback, labelsText, refreshToken);+ } catch (e) {+ return e.toString();+ }+});++Future<String?> _isolatedReEnroll(String dataDir, String labelsText) => Isolate.run(() {+ try {+ return SamNodeLib().reEnroll(dataDir, labelsText);} catch (e) {return e.toString();}@@ -73,6 +81,8 @@ class _NodeControlPageState extends State<NodeControlPage> {final _controlPlaneController =TextEditingController(text: 'https://bananas.sam-mesh.dev');final _jwtController = TextEditingController();+ // Saved by the FFI at enrollment so Re-enroll can skip the browser.+ String _refreshToken = '';final _tokenController = TextEditingController(text: 'secret-token');// Labels are attested at enrollment; changing them requires re-enrolling.// EnrollNode in the FFI writes them to this file; read back at launch.@@ -289,7 +299,9 @@ class _NodeControlPageState extends State<NodeControlPage> {'response_type': 'code','client_id': clientId,'redirect_uri': redirectUri,- 'scope': 'openid email profile',+ 'scope': 'openid email profile offline_access',+ 'access_type': 'offline',+ 'prompt': 'consent','state': state,'code_challenge': challenge,'code_challenge_method': 'S256',@@ -392,6 +404,7 @@ class _NodeControlPageState extends State<NodeControlPage> {if (jwt == null) {throw Exception('No token received');}+ _refreshToken = tokenData['refresh_token'] ?? '';setState(() {_jwtController.text = jwt;@@ -459,7 +472,7 @@ class _NodeControlPageState extends State<NodeControlPage> {headers: {'Content-Type': 'application/x-www-form-urlencoded'},body: {'client_id': clientId,- 'scope': 'openid email profile',+ 'scope': 'openid email profile offline_access',if (audience != null && audience.isNotEmpty) 'audience': audience,},);@@ -516,6 +529,7 @@ class _NodeControlPageState extends State<NodeControlPage> {final data = jsonDecode(response.body);final jwt = data['id_token'] ?? data['access_token'];if (jwt != null) {+ _refreshToken = data['refresh_token'] ?? '';setState(() {_jwtController.text = jwt;_status = 'Token obtained via Device Flow! Enrolling...';@@ -632,7 +646,8 @@ class _NodeControlPageState extends State<NodeControlPage> {final controlPlaneText = _controlPlaneController.text;final jwtText = _jwtController.text;final labelsText = _labelsController.text.trim();- final err = await _isolatedEnroll(dataDir, controlPlaneText, jwtText, true, labelsText);+ final err = await _isolatedEnroll(+ dataDir, controlPlaneText, jwtText, true, labelsText, _refreshToken);setState(() {if (err != null) {@@ -644,10 +659,27 @@ class _NodeControlPageState extends State<NodeControlPage> {});}- // The Config tab has no status card, so surface the outcome inline.+ // Silent path first: the refresh token saved at enrollment buys a JWT.+ // Any failure (none saved, expired, revoked) falls back to the browser.Future<void> _reEnroll() async {- await _loginAndEnroll();+ setState(() {+ _loggingIn = true;+ _status = 'Re-enrolling...';+ });+ final appDir = await getApplicationDocumentsDirectory();+ final err = await _isolatedReEnroll(+ '${appDir.path}/sam_data', _labelsController.text.trim());if (!mounted) return;+ if (err == null) {+ setState(() {+ _loggingIn = false;+ _status = 'Re-enrolled';+ });+ } else {+ debugPrint('DEBUG: silent re-enroll failed, using the browser: $err');+ await _loginAndEnroll();+ if (!mounted) return;+ }ScaffoldMessenger.of(context).showSnackBar(SnackBar(content: Text(_status)));}@@ -1032,8 +1064,9 @@ class _NodeControlPageState extends State<NodeControlPage> {TextStyle(fontWeight: FontWeight.bold, fontSize: 16)),const SizedBox(height: 6),const Text(- 'Attested by the control plane. Changing them means '- 'logging in again; the node keeps its identity.',+ 'Attested by the control plane. Re-enroll re-attests '+ 'them with the saved login; the browser opens only if '+ 'that session expired. The node keeps its identity.',style: TextStyle(fontSize: 12, color: Colors.grey),),const SizedBox(height: 10),diff --git a/mobile/sam-node-app/lib/sam_ffi.dart b/mobile/sam-node-app/lib/sam_ffi.dartindex e6cf9118..d8096c79 100644--- a/mobile/sam-node-app/lib/sam_ffi.dart+++ b/mobile/sam-node-app/lib/sam_ffi.dart@@ -18,13 +18,20 @@ typedef EnrollNodeC = ffi.Pointer<Utf8> Function(ffi.Pointer<Utf8> controlPlaneURL,ffi.Pointer<Utf8> jwt,ffi.Int8 allowLoopback,- ffi.Pointer<Utf8> labels);+ ffi.Pointer<Utf8> labels,+ ffi.Pointer<Utf8> refreshToken);typedef EnrollNodeDart = ffi.Pointer<Utf8> Function(ffi.Pointer<Utf8> dataDir,ffi.Pointer<Utf8> controlPlaneURL,ffi.Pointer<Utf8> jwt,int allowLoopback,- ffi.Pointer<Utf8> labels);+ ffi.Pointer<Utf8> labels,+ ffi.Pointer<Utf8> refreshToken);++typedef ReEnrollNodeC = ffi.Pointer<Utf8> Function(+ ffi.Pointer<Utf8> dataDir, ffi.Pointer<Utf8> labels);+typedef ReEnrollNodeDart = ffi.Pointer<Utf8> Function(+ ffi.Pointer<Utf8> dataDir, ffi.Pointer<Utf8> labels);typedef FetchControlPlaneInfoJSONC = ffi.Pointer<Utf8> Function(ffi.Pointer<Utf8> controlPlaneURL);typedef FetchControlPlaneInfoJSONDart = ffi.Pointer<Utf8> Function(ffi.Pointer<Utf8> controlPlaneURL);@@ -44,6 +51,7 @@ class SamNodeLib {late StopNodeDart _stopNode;late GetNodeIDDart _getNodeID;late EnrollNodeDart _enrollNode;+ late ReEnrollNodeDart _reEnrollNode;late FetchControlPlaneInfoJSONDart _fetchControlPlaneInfoJSON;late IsEnrolledDart _isEnrolled;late GetMeshInfoDart _getMeshInfo;@@ -62,6 +70,7 @@ class SamNodeLib {_stopNode = _dylib.lookupFunction<StopNodeC, StopNodeDart>('StopNode');_getNodeID = _dylib.lookupFunction<GetNodeIDC, GetNodeIDDart>('GetNodeID');_enrollNode = _dylib.lookupFunction<EnrollNodeC, EnrollNodeDart>('EnrollNode');+ _reEnrollNode = _dylib.lookupFunction<ReEnrollNodeC, ReEnrollNodeDart>('ReEnrollNode');_fetchControlPlaneInfoJSON = _dylib.lookupFunction<FetchControlPlaneInfoJSONC, FetchControlPlaneInfoJSONDart>('FetchControlPlaneInfoJSON');_isEnrolled = _dylib.lookupFunction<IsEnrolledC, IsEnrolledDart>('IsEnrolled');_getMeshInfo = _dylib.lookupFunction<GetMeshInfoC, GetMeshInfoDart>('GetMeshInfo');@@ -96,19 +105,36 @@ class SamNodeLib {return goID;}- String? enroll(String dataDir, String controlPlaneURL, String jwt, bool allowLoopback, String labels) {+ String? enroll(String dataDir, String controlPlaneURL, String jwt, bool allowLoopback, String labels, String refreshToken) {final cDataDir = dataDir.toNativeUtf8();final cControlPlaneURL = controlPlaneURL.toNativeUtf8();final cJWT = jwt.toNativeUtf8();final cAllowLoopback = allowLoopback ? 1 : 0;final cLabels = labels.toNativeUtf8();+ final cRefreshToken = refreshToken.toNativeUtf8();- final cErr = _enrollNode(cDataDir, cControlPlaneURL, cJWT, cAllowLoopback, cLabels);+ final cErr = _enrollNode(cDataDir, cControlPlaneURL, cJWT, cAllowLoopback, cLabels, cRefreshToken);calloc.free(cDataDir);calloc.free(cControlPlaneURL);calloc.free(cJWT);calloc.free(cLabels);+ calloc.free(cRefreshToken);++ if (cErr.address == 0) return null;+ final goErr = cErr.toDartString();+ _freeString(cErr);+ return goErr;+ }++ String? reEnroll(String dataDir, String labels) {+ final cDataDir = dataDir.toNativeUtf8();+ final cLabels = labels.toNativeUtf8();++ final cErr = _reEnrollNode(cDataDir, cLabels);++ calloc.free(cDataDir);+ calloc.free(cLabels);if (cErr.address == 0) return null;final goErr = cErr.toDartString();diff --git a/mobile/sam-node-ffi/ffi/ffi.go b/mobile/sam-node-ffi/ffi/ffi.goindex 4a524ac1..ea844084 100644--- a/mobile/sam-node-ffi/ffi/ffi.go+++ b/mobile/sam-node-ffi/ffi/ffi.go@@ -339,6 +339,13 @@ func GetNodeID() string {// has no equivalent: it re-reads them from its config file on every run.const labelsFile = "labels"+func saveEnrolledLabels(dataDir, labels string) error {+ if err := os.WriteFile(filepath.Join(dataDir, labelsFile), []byte(labels), 0600); err != nil {+ return fmt.Errorf("failed to save labels: %w", err)+ }+ return nil+}+func loadEnrolledLabels(dataDir string) (map[string]string, error) {raw, err := os.ReadFile(filepath.Join(dataDir, labelsFile))if errors.Is(err, os.ErrNotExist) {@@ -353,7 +360,7 @@ func loadEnrolledLabels(dataDir string) (map[string]string, error) {// EnrollNode enrolls a node. Labels are comma-separated key=value claims,// minted into the node's Biscuit here; changing them means enrolling again,// which reuses the stored key so the PeerID survives.-func EnrollNode(dataDir string, controlPlaneURL string, jwt string, allowLoopback bool, labels string) error {+func EnrollNode(dataDir string, controlPlaneURL string, jwt string, allowLoopback bool, labels string, refreshToken string) error {parsedLabels, err := api.ParseLabels(labels)if err != nil {return fmt.Errorf("invalid labels: %w", err)@@ -420,13 +427,16 @@ func EnrollNode(dataDir string, controlPlaneURL string, jwt string, allowLoopbac// Saved only once the control plane accepted them, so a rejected// re-enrollment cannot leave this file ahead of the Biscuit.- if err := os.WriteFile(filepath.Join(dataDir, labelsFile), []byte(labels), 0600); err != nil {- return fmt.Errorf("failed to save labels: %w", err)+ if err := saveEnrolledLabels(dataDir, labels); err != nil {+ return err}if err := store.SaveControlPlaneURL(controlPlaneURL); err != nil {return fmt.Errorf("failed to save control plane URL: %w", err)}+ if refreshToken != "" {+ saveRefreshSession(enrollCtx, store, controlPlaneURL, refreshToken)+ }_, _, _, err = node.SyncMeshConfig(enrollCtx, store)if err != nil {@@ -538,3 +548,53 @@ func CallRemoteTool(peerIDStr string, toolName string, argsJSON string) string {return string(jsonBytes)}++// saveRefreshSession stores what ReEnrollNode needs to buy a JWT later.+// Failures only cost the silent path, so they are logged, not returned.+func saveRefreshSession(ctx context.Context, store *node.Store, controlPlaneURL, refreshToken string) {+ if err := store.SaveRefreshToken(refreshToken); err != nil {+ logger.Warnf("Failed to save refresh token: %v", err)+ return+ }+ info, err := node.FetchControlPlaneInfo(ctx, controlPlaneURL)+ if err != nil {+ logger.Warnf("Failed to fetch control plane info for OIDC config: %v", err)+ return+ }+ if err := store.SaveOIDCConfig(info.OidcIssuer, info.ClientId, info.Audience); err != nil {+ logger.Warnf("Failed to save OIDC config: %v", err)+ }+}++// ReEnrollNode re-attests labels without a browser: the refresh token saved+// at enrollment buys a JWT and the stored key keeps the PeerID. Fails when+// no token was saved or it expired; the app then falls back to the browser.+func ReEnrollNode(dataDir string, labels string) error {+ if activeNode != nil || unauthSrv != nil {+ return errors.New("stop the node before re-enrolling")+ }+ parsedLabels, err := api.ParseLabels(labels)+ if err != nil {+ return fmt.Errorf("invalid labels: %w", err)+ }+ store, err := node.NewStore(dataDir)+ if err != nil {+ return fmt.Errorf("failed to open store: %w", err)+ }+ defer func() { _ = store.Close() }()++ meshNode, err := node.NewSamNode(node.Options{+ PrivKey: node.GetOrGenerateKey(store),+ Store: store,+ AllowLoopback: true,+ ListenAddrs: []string{"/ip4/127.0.0.1/tcp/0"},+ NodeConfig: &node.NodeConfigComplete{Labels: parsedLabels},+ })+ if err != nil {+ return fmt.Errorf("failed to create node for re-enrollment: %w", err)+ }+ if err := meshNode.ReEnrollWithRefreshToken(context.Background()); err != nil {+ return fmt.Errorf("re-enrollment failed: %w", err)+ }+ return saveEnrolledLabels(dataDir, labels)+}diff --git a/mobile/sam-node-ffi/ffi/ffi_test.go b/mobile/sam-node-ffi/ffi/ffi_test.goindex 93f7e433..28f1048a 100644--- a/mobile/sam-node-ffi/ffi/ffi_test.go+++ b/mobile/sam-node-ffi/ffi/ffi_test.go@@ -26,9 +26,11 @@ import ("github.com/biscuit-auth/biscuit-go/v2""github.com/google/sam/api"+ "github.com/google/sam/internal/node""github.com/libp2p/go-libp2p"dht "github.com/libp2p/go-libp2p-kad-dht""github.com/libp2p/go-libp2p/core/network"+ "github.com/libp2p/go-libp2p/core/peer""github.com/libp2p/go-msgio""google.golang.org/protobuf/proto")@@ -106,7 +108,7 @@ func TestMobileFFILifecycle(t *testing.T) {// 2. Mobile EnrollmenttmpDir := t.TempDir()- err = EnrollNode(tmpDir, httpServer.URL, "dummy-jwt", true, "region=eu-west-1")+ err = EnrollNode(tmpDir, httpServer.URL, "dummy-jwt", true, "region=eu-west-1", "")if err != nil {t.Fatalf("EnrollNode failed: %v", err)}@@ -209,10 +211,89 @@ func TestEnrollNodeRejectedLeavesNoLabels(t *testing.T) {defer srv.Close()dir := t.TempDir()- if err := EnrollNode(dir, srv.URL, "dummy-jwt", true, "region=eu-west-1"); err == nil {+ if err := EnrollNode(dir, srv.URL, "dummy-jwt", true, "region=eu-west-1", ""); err == nil {t.Fatal("expected enrollment to fail")}if got, err := loadEnrolledLabels(dir); err != nil || got != nil {t.Fatalf("labels must not be persisted after a rejected enrollment, got %v, %v", got, err)}}++// Re-enrollment buys a JWT with the stored refresh token and re-attests the+// new labels under the same PeerID, with no browser involved.+func TestReEnrollNodeUsesStoredRefreshToken(t *testing.T) {+ cpPubKey, cpPrivKey, err := ed25519.GenerateKey(rand.Reader)+ if err != nil {+ t.Fatal(err)+ }+ var registered api.EnrollRequest+ var srv *httptest.Server+ mux := http.NewServeMux()+ mux.HandleFunc("/.well-known/openid-configuration", func(w http.ResponseWriter, r *http.Request) {+ _ = json.NewEncoder(w).Encode(map[string]string{"issuer": srv.URL, "token_endpoint": srv.URL + "/token"})+ })+ mux.HandleFunc("/token", func(w http.ResponseWriter, r *http.Request) {+ if r.FormValue("grant_type") != "refresh_token" || r.FormValue("refresh_token") != "stored" {+ http.Error(w, "bad grant", http.StatusBadRequest)+ return+ }+ _ = json.NewEncoder(w).Encode(map[string]string{"id_token": "fresh-jwt", "refresh_token": "rotated"})+ })+ mux.HandleFunc("/register", func(w http.ResponseWriter, r *http.Request) {+ body, _ := io.ReadAll(r.Body)+ _ = proto.Unmarshal(body, ®istered)+ resp := &api.EnrollResponse{+ BiscuitToken: mintMockBiscuit(t, registered.PeerId, cpPrivKey, api.RoleNode),+ ControlPlanePublicKey: cpPubKey,+ RouterAddresses: []string{"/ip4/127.0.0.1/tcp/1"},+ }+ data, _ := proto.Marshal(resp)+ w.Header().Set("Content-Type", "application/x-protobuf")+ _, _ = w.Write(data)+ })+ srv = httptest.NewServer(mux)+ defer srv.Close()++ dir := t.TempDir()+ store, err := node.NewStore(dir)+ if err != nil {+ t.Fatal(err)+ }+ if err := store.SaveControlPlaneURL(srv.URL); err != nil {+ t.Fatal(err)+ }+ if err := store.SaveRefreshToken("stored"); err != nil {+ t.Fatal(err)+ }+ if err := store.SaveOIDCConfig(srv.URL, "mock-client", ""); err != nil {+ t.Fatal(err)+ }+ want, err := peer.IDFromPublicKey(node.GetOrGenerateKey(store).GetPublic())+ if err != nil {+ t.Fatal(err)+ }+ _ = store.Close()++ if err := ReEnrollNode(dir, "region=us-east-1"); err != nil {+ t.Fatalf("ReEnrollNode failed: %v", err)+ }+ if registered.Jwt != "fresh-jwt" || registered.PeerId != want.String() || registered.Labels["region"] != "us-east-1" {+ t.Fatalf("unexpected enroll request: jwt=%q peer=%q labels=%v", registered.Jwt, registered.PeerId, registered.Labels)+ }+ if got, err := loadEnrolledLabels(dir); err != nil || got["region"] != "us-east-1" {+ t.Fatalf("expected re-enrolled labels persisted, got %v, %v", got, err)+ }+ store, err = node.NewStore(dir)+ if err != nil {+ t.Fatal(err)+ }+ defer func() { _ = store.Close() }()+ if tok, err := store.LoadRefreshToken(); err != nil || tok != "rotated" {+ t.Fatalf("expected rotated refresh token saved, got %q, %v", tok, err)+ }++ // Nothing saved means nothing to re-enroll with; the app opens the browser.+ if err := ReEnrollNode(t.TempDir(), "region=us-east-1"); err == nil {+ t.Fatal("expected re-enrollment without a refresh token to fail")+ }+}diff --git a/mobile/sam-node-ffi/main.go b/mobile/sam-node-ffi/main.goindex 622526f5..204a7092 100644--- a/mobile/sam-node-ffi/main.go+++ b/mobile/sam-node-ffi/main.go@@ -55,14 +55,24 @@ func GetNodeID() *C.char {}//export EnrollNode-func EnrollNode(dataDir *C.char, controlPlaneURL *C.char, jwt *C.char, allowLoopback C.char, labels *C.char) *C.char {+func EnrollNode(dataDir *C.char, controlPlaneURL *C.char, jwt *C.char, allowLoopback C.char, labels *C.char, refreshToken *C.char) *C.char {goDataDir := C.GoString(dataDir)goControlPlaneURL := C.GoString(controlPlaneURL)goJWT := C.GoString(jwt)goAllowLoopback := allowLoopback != 0goLabels := C.GoString(labels)+ goRefreshToken := C.GoString(refreshToken)- err := ffi.EnrollNode(goDataDir, goControlPlaneURL, goJWT, goAllowLoopback, goLabels)+ err := ffi.EnrollNode(goDataDir, goControlPlaneURL, goJWT, goAllowLoopback, goLabels, goRefreshToken)+ if err != nil {+ return C.CString(err.Error())+ }+ return nil+}++//export ReEnrollNode+func ReEnrollNode(dataDir *C.char, labels *C.char) *C.char {+ err := ffi.ReEnrollNode(C.GoString(dataDir), C.GoString(labels))if err != nil {return C.CString(err.Error())}