R57: FIFO eviction; keep fresh replay JTIs in cache

review_r57_shard_eviction_test.go

@@ -0,0 +1,53 @@
+package traefikoidc
+
+import (
+	"fmt"
+	"testing"
+	"time"
+)
+
+// TestShardedCacheFIFOEvictionRetainsNewest guards against the pre-fix eviction
+// policy in evictFromShardLocked, which (a) over-evicted by +10 per Set at
+// capacity (each shard sat ~9 slots under its cap) and (b) deleted entries in
+// random Go map-iteration order, so a just-written, still-valid-TTL entry
+// (e.g. a fresh replay-protection JTI) could be dropped immediately —
+// truncating the replay window.
+func TestShardedCacheFIFOEvictionRetainsNewest(t *testing.T) {
+	cache := NewShardedCache(4, 400) // maxPerShard = 100
+
+	// Collect 100 filler keys + 1 trigger key that all hash into ONE shard,
+	// giving deterministic control over capacity pressure.
+	var shard *cacheShard
+	fillers := make([]string, 0, 100)
+	var trigger string
+	for i := 0; len(fillers) < 100 || trigger == ""; i++ {
+		k := fmt.Sprintf("key-%d", i)
+		s := cache.getShard(k)
+		if shard == nil {
+			shard = s
+			continue
+		}
+		if s == shard {
+			if len(fillers) < 100 {
+				fillers = append(fillers, k)
+			} else if trigger == "" {
+				trigger = k
+			}
+		}
+	}
+
+	for _, k := range fillers {
+		cache.Set(k, true, time.Minute)
+	}
+
+	// This write hits the shard at capacity: it must evict the OLDEST and
+	// place the newcomer, keeping the shard full.
+	cache.Set(trigger, true, time.Minute)
+
+	if !cache.Exists(trigger) {
+		t.Fatalf("capacity-triggering write evicted the just-written newest entry (random over-eviction)")
+	}
+	if n := cache.Size(); n != 100 {
+		t.Fatalf("shard size = %d, want 100 (old code over-evicted below capacity)", n)
+	}
+}

sharded_cache.go

@@ -2,6 +2,7 @@ package traefikoidc
 
 import (
 	"hash/fnv"
+	"sort"
 	"sync"
 	"time"
 )
@@ -19,12 +20,19 @@ type ShardedCache struct {
 type cacheShard struct {
 	items map[string]*shardedCacheItem
 	mu    sync.RWMutex
+	// nextSeq is a monotonically increasing insertion counter used to evict
+	// the OLDEST entries first (FIFO). without an explicit order, Go map
+	// iteration order is random, so the old eviction could drop a just-
+	// written still-valid entry (e.g. a fresh replay-protection JTI) before
+	// its TTL had any effect.
+	nextSeq uint64
 }
 
 // shardedCacheItem represents an item in the sharded cache with expiration.
 type shardedCacheItem struct {
 	value     interface{}
 	expiresAt time.Time
+	seq       uint64 // insertion order; lower = older
 }
 
 // NewShardedCache creates a new sharded cache with the specified number of shards.
@@ -108,7 +116,9 @@ func (c *ShardedCache) Set(key string, value interface{}, ttl time.Duration) {
 	shard.items[key] = &shardedCacheItem{
 		value:     value,
 		expiresAt: expiresAt,
+		seq:       shard.nextSeq,
 	}
+	shard.nextSeq++
 	shard.mu.Unlock()
 }
 
@@ -147,16 +157,22 @@ func (c *ShardedCache) evictFromShardLocked(shard *cacheShard) {
 		}
 	}
 
-	// If still over capacity, remove some items (FIFO approximation via map iteration)
+	// If still over capacity, evict the OLDEST entries (lowest insertion seq)
-	// This is an approximation since Go maps don't maintain insertion order
+	// until we're at capacity. Evicting by insertion order keeps fresh, still-
-	remaining := len(shard.items) - c.maxPerShard + 10 // Leave some headroom
+	// valid items (e.g. replay-protection JTIs) alive for their full TTL,
+	// unlike the previous random-over-eviction which dropped a just-written
+	// entry and left each shard ~9 slots under capacity.
+	remaining := len(shard.items) - c.maxPerShard + 1
 	if remaining > 0 {
+		oldest := make([]string, 0, len(shard.items))
 		for key := range shard.items {
-			delete(shard.items, key)
+			oldest = append(oldest, key)
-			remaining--
-			if remaining <= 0 {
-				break
 		}
+		sort.Slice(oldest, func(i, j int) bool {
+			return shard.items[oldest[i]].seq < shard.items[oldest[j]].seq
+		})
+		for _, key := range oldest[:remaining] {
+			delete(shard.items, key)
 		}
 	}
 }