Skip to content

Agent Mesh

enforce freshness boundary on token refresh

Ibrahim13fca5299ce8
diff --git a/internal/controlplane/biscuit_ttl_test.go b/internal/controlplane/biscuit_ttl_test.go
index bf1917f4..77d1127d 100644
--- a/internal/controlplane/biscuit_ttl_test.go
+++ b/internal/controlplane/biscuit_ttl_test.go
@@ -118,7 +118,7 @@ func registerNode(t *testing.T, cpURL, jwtToken string) (crypto.PrivKey, peer.ID
func refreshNode(t *testing.T, cpURL string, priv crypto.PrivKey, currentBiscuit []byte) *api.TokenRefreshResponse {
t.Helper()
- timestamp := time.Now().Unix()
+ timestamp := time.Now().UnixMilli()
sig, err := priv.Sign([]byte(fmt.Sprintf("%d", timestamp)))
if err != nil {
t.Fatal(err)
diff --git a/internal/controlplane/server.go b/internal/controlplane/server.go
index df17449c..853bafec 100644
--- a/internal/controlplane/server.go
+++ b/internal/controlplane/server.go
@@ -676,6 +676,19 @@ func (s *Server) HandleRefresh(w http.ResponseWriter, r *http.Request) {
return
}
+ const refreshChallengeMaxAge = 5 * time.Minute
+ if req.Timestamp <= 0 {
+ http.Error(w, "missing or invalid timestamp", http.StatusBadRequest)
+ return
+ }
+ challengeTime := time.UnixMilli(req.Timestamp)
+ now := time.Now()
+ if now.Sub(challengeTime) > refreshChallengeMaxAge || challengeTime.Sub(now) > refreshChallengeMaxAge {
+ logger.Warnw("Stale or invalid challenge timestamp", "peer_id", nodeRecord.PeerID, "timestamp", req.Timestamp)
+ http.Error(w, "stale or invalid challenge timestamp", http.StatusUnauthorized)
+ return
+ }
+
challengeData := []byte(fmt.Sprintf("%d", req.Timestamp))
ok, err := pubKey.Verify(challengeData, req.ChallengeSignature)
if err != nil || !ok {
diff --git a/internal/controlplane/server_test.go b/internal/controlplane/server_test.go
index 357e627f..543c7fea 100644
--- a/internal/controlplane/server_test.go
+++ b/internal/controlplane/server_test.go
@@ -38,6 +38,7 @@ import (
"github.com/biscuit-auth/biscuit-go/v2/datalog"
"github.com/golang-jwt/jwt/v5"
"github.com/google/sam/api"
+ "github.com/google/sam/internal/identity"
"github.com/google/sam/internal/node"
"github.com/google/sam/internal/storage"
"github.com/libp2p/go-libp2p/core/crypto"
@@ -924,6 +925,93 @@ func TestEnrollmentWorkflow(t *testing.T) {
}
}
+func TestHandleRefresh_RejectsStaleTimestamp(t *testing.T) {
+ t.Parallel()
+
+ srv, store, cpURL := setupTestServer(t, "")
+ defer func() {
+ _ = srv.Close()
+ _ = store.Close()
+ }()
+
+ ctx := context.Background()
+ cpPriv, _, err := store.GetCurrentKey(ctx)
+ if err != nil {
+ t.Fatalf("GetCurrentKey: %v", err)
+ }
+
+ priv, pub, err := crypto.GenerateKeyPair(crypto.Ed25519, -1)
+ if err != nil {
+ t.Fatalf("GenerateKeyPair: %v", err)
+ }
+ nodePeer, err := peer.IDFromPrivateKey(priv)
+ if err != nil {
+ t.Fatalf("IDFromPrivateKey: %v", err)
+ }
+ pubKeyBytes, err := crypto.MarshalPublicKey(pub)
+ if err != nil {
+ t.Fatalf("MarshalPublicKey: %v", err)
+ }
+
+ biscuitBytes, err := identity.MintBootstrapBiscuitToken(
+ cpPriv,
+ nodePeer,
+ api.RoleNode,
+ time.Now().Add(api.BiscuitTokenTTL),
+ nil,
+ nil,
+ )
+ if err != nil {
+ t.Fatalf("MintBootstrapBiscuitToken: %v", err)
+ }
+
+ if err := store.EnrollNode(ctx, &storage.EnrolledNode{
+ PeerID: nodePeer.String(),
+ PublicKey: pubKeyBytes,
+ Biscuit: biscuitBytes,
+ Role: api.RoleNode,
+ EnrollmentType: "Bootstrap",
+ EnrolledAt: time.Now(),
+ ExpiresAt: time.Now().Add(api.OIDCSessionTTL),
+ }); err != nil {
+ t.Fatalf("EnrollNode: %v", err)
+ }
+
+ staleTimestamp := time.Now().Add(-2 * time.Hour).UnixMilli()
+ challengeData := []byte(fmt.Sprintf("%d", staleTimestamp))
+ challengeSig, err := priv.Sign(challengeData)
+ if err != nil {
+ t.Fatalf("Sign: %v", err)
+ }
+
+ refreshReq := &api.TokenRefreshRequest{
+ ChallengeSignature: challengeSig,
+ Timestamp: staleTimestamp,
+ }
+ refreshData, err := proto.Marshal(refreshReq)
+ if err != nil {
+ t.Fatalf("Marshal: %v", err)
+ }
+
+ req, err := http.NewRequest(http.MethodPost, cpURL+"/refresh", bytes.NewReader(refreshData))
+ if err != nil {
+ t.Fatalf("NewRequest: %v", err)
+ }
+ req.Header.Set("Authorization", "Bearer "+base64.StdEncoding.EncodeToString(biscuitBytes))
+ req.Header.Set("Content-Type", "application/x-protobuf")
+
+ resp, err := http.DefaultClient.Do(req)
+ if err != nil {
+ t.Fatalf("Do: %v", err)
+ }
+ defer func() { _ = resp.Body.Close() }()
+
+ if resp.StatusCode != http.StatusUnauthorized {
+ body, _ := io.ReadAll(resp.Body)
+ t.Fatalf("expected stale-timestamp refresh to be rejected with 401, got %s: %s", resp.Status, body)
+ }
+}
+
func TestTokenRefreshAndRevocation(t *testing.T) {
issuer, mintToken := startCustomMockOIDC(t)
srv, store, cpURL := setupTestServer(t, issuer)