Skip to content

Agent Mesh

storage: a node enrolled without a last-seen instant is seen now

Antonio Ojea03a374cd4097
diff --git a/internal/controlplane/key_rotation_test.go b/internal/controlplane/key_rotation_test.go
index efb6fd4c..6a7bc723 100644
--- a/internal/controlplane/key_rotation_test.go
+++ b/internal/controlplane/key_rotation_test.go
@@ -87,7 +87,11 @@ func TestRotateKeysIfDueFollowsTheStoredDeadline(t *testing.T) {
if got := keys(); got != 2 {
t.Fatalf("a check past the deadline did not rotate: %d keys, want 2", got)
}
- if next, _ = store.NextKeyRotation(ctx); !next.Equal(late.Add(interval).Truncate(time.Millisecond)) {
+ next, err = store.NextKeyRotation(ctx)
+ if err != nil {
+ t.Fatal(err)
+ }
+ if !next.Equal(late.Add(interval).Truncate(time.Millisecond)) {
t.Fatalf("deadline after the late rotation = %s, want %s", next, late.Add(interval))
}
srv.rotateKeysIfDue(late.Add(time.Minute))
diff --git a/internal/storage/round_trip_test.go b/internal/storage/round_trip_test.go
index 7a0512e9..25b2d812 100644
--- a/internal/storage/round_trip_test.go
+++ b/internal/storage/round_trip_test.go
@@ -435,6 +435,34 @@ func TestCountEnrollmentRequestsByStatus(t *testing.T) {
}
}
+// A node written without a last-seen instant is seen now, not at the zero
+// time: the silent-member sweep would otherwise collect it on the control
+// plane's first sweep, which raced with every test that enrolled a node
+// this way (TestUserStatusAndTenancy failed so in CI).
+func TestEnrollNodeWithoutEnrolledAtIsSeenNow(t *testing.T) {
+ store := newTestStore(t)
+ ctx := context.Background()
+ before := time.Now().Add(-time.Second)
+ node := &EnrolledNode{PeerID: "fresh", PublicKey: []byte("pub"), Biscuit: []byte("b"), Role: api.RoleNode}
+ if err := store.EnrollNode(ctx, node); err != nil {
+ t.Fatal(err)
+ }
+ got, err := store.GetNode(ctx, "fresh")
+ if err != nil {
+ t.Fatal(err)
+ }
+ if got.EnrolledAt.Before(before) {
+ t.Fatalf("EnrolledAt = %s, want about now", got.EnrolledAt)
+ }
+ regular, ephemeral, err := store.DeleteSilentBootstrapNodes(ctx, time.Now().Add(-30*24*time.Hour), time.Now().Add(-time.Hour))
+ if err != nil {
+ t.Fatal(err)
+ }
+ if regular != 0 || ephemeral != 0 {
+ t.Fatalf("the sweep deleted regular=%d ephemeral=%d rows; a node enrolled now is not silent", regular, ephemeral)
+ }
+}
+
func TestDeleteExpiredRouterLeases(t *testing.T) {
store := newTestStore(t)
ctx := context.Background()
diff --git a/internal/storage/sql_store.go b/internal/storage/sql_store.go
index 6a266743..266e7dd1 100644
--- a/internal/storage/sql_store.go
+++ b/internal/storage/sql_store.go
@@ -927,6 +927,9 @@ func (s *SQLStore) EnrollNode(ctx context.Context, node *EnrolledNode) error {
if err != nil {
return fmt.Errorf("failed to marshal labels: %w", err)
}
+ if node.EnrolledAt.IsZero() {
+ node.EnrolledAt = time.Now()
+ }
var query string
if s.isPostgres() {
diff --git a/internal/storage/sql_store_test.go b/internal/storage/sql_store_test.go
index 7ffd234b..31040ddf 100644
--- a/internal/storage/sql_store_test.go
+++ b/internal/storage/sql_store_test.go
@@ -256,18 +256,34 @@ func TestScheduleKeyRotationIfUnset(t *testing.T) {
if scheduled {
t.Fatal("a second schedule replaced the deadline; want it kept")
}
- if next, _ = store.NextKeyRotation(ctx); !next.Equal(t0.Add(interval)) {
+ next, err = store.NextKeyRotation(ctx)
+ if err != nil {
+ t.Fatal(err)
+ }
+ if !next.Equal(t0.Add(interval)) {
t.Fatalf("deadline = %s, want %s", next, t0.Add(interval))
}
// Not due before the deadline, due at it; a claim moves it one interval on.
- if claimed, _ := store.ClaimKeyRotation(ctx, t0.Add(interval-time.Second), interval); claimed {
+ claimed, err := store.ClaimKeyRotation(ctx, t0.Add(interval-time.Second), interval)
+ if err != nil {
+ t.Fatal(err)
+ }
+ if claimed {
t.Fatal("claim before the deadline succeeded")
}
- if claimed, _ := store.ClaimKeyRotation(ctx, t0.Add(interval), interval); !claimed {
+ claimed, err = store.ClaimKeyRotation(ctx, t0.Add(interval), interval)
+ if err != nil {
+ t.Fatal(err)
+ }
+ if !claimed {
t.Fatal("claim at the deadline failed")
}
- if next, _ = store.NextKeyRotation(ctx); !next.Equal(t0.Add(2 * interval)) {
+ next, err = store.NextKeyRotation(ctx)
+ if err != nil {
+ t.Fatal(err)
+ }
+ if !next.Equal(t0.Add(2 * interval)) {
t.Fatalf("deadline after the claim = %s, want %s", next, t0.Add(2*interval))
}
}
diff --git a/internal/storage/storage.go b/internal/storage/storage.go
index b6724ced..80ccb070 100644
--- a/internal/storage/storage.go
+++ b/internal/storage/storage.go
@@ -269,7 +269,9 @@ type Store interface {
// ListUsers retrieves all registered users.
ListUsers(ctx context.Context) ([]User, error)
- // EnrollNode registers or updates a node enrollment.
+ // EnrollNode registers or updates a node enrollment. EnrolledAt is when
+ // the member was last seen; unset, it is recorded as now, never as the
+ // zero time, which the silent-member sweep would read as decades ago.
EnrollNode(ctx context.Context, node *EnrolledNode) error
// GetNode retrieves node enrollment details.