Skip to content

fix: Increase Scan count and move Scan outside of mutex lock to avoid slow calls timing out (#17645) #21926

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Apr 10, 2025
Merged

fix: Increase Scan count and move Scan outside of mutex lock to avoid slow calls timing out (#17645) #21926

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2dc6073
Increase Scan count and move Scan outside of mutex lock to avoid slow…
sethgupton-mastery Feb 20, 2025
29b93c5
Merge branch 'master' into scan-lock
sethgupton-mastery Feb 26, 2025
8f7c7f6
Merge branch 'master' into scan-lock
sethgupton-mastery Mar 3, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 24 additions & 14 deletions util/session/state.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,21 +18,23 @@ const (
)

type userStateStorage struct {
attempts map[string]LoginAttempts
redis *redis.Client
revokedTokens map[string]bool
lock sync.RWMutex
resyncDuration time.Duration
attempts map[string]LoginAttempts
redis *redis.Client
revokedTokens map[string]bool
recentRevokedTokens map[string]bool
lock sync.RWMutex
resyncDuration time.Duration
}

var _ UserStateStorage = &userStateStorage{}

func NewUserStateStorage(redis *redis.Client) *userStateStorage {
return &userStateStorage{
attempts: map[string]LoginAttempts{},
revokedTokens: map[string]bool{},
resyncDuration: time.Hour,
redis: redis,
attempts: map[string]LoginAttempts{},
revokedTokens: map[string]bool{},
recentRevokedTokens: map[string]bool{},
resyncDuration: time.Second * 15,
redis: redis,
}
}

Expand Down Expand Up @@ -63,6 +65,7 @@ func (storage *userStateStorage) watchRevokedTokens(ctx context.Context) {
case val := <-ch:
storage.lock.Lock()
storage.revokedTokens[val.Payload] = true
storage.recentRevokedTokens[val.Payload] = true
storage.lock.Unlock()
}
}
Expand All @@ -78,10 +81,8 @@ func (storage *userStateStorage) loadRevokedTokensSafe() {
}

func (storage *userStateStorage) loadRevokedTokens() error {
storage.lock.Lock()
defer storage.lock.Unlock()
storage.revokedTokens = map[string]bool{}
iterator := storage.redis.Scan(context.Background(), 0, revokedTokenPrefix+"*", -1).Iterator()
redisRevokedTokens := map[string]bool{}
iterator := storage.redis.Scan(context.Background(), 0, revokedTokenPrefix+"*", 10000).Iterator()
for iterator.Next(context.Background()) {
parts := strings.Split(iterator.Val(), "|")
if len(parts) != 2 {
Expand All @@ -90,12 +91,20 @@ func (storage *userStateStorage) loadRevokedTokens() error {
iterator.Val())
continue
}
storage.revokedTokens[parts[1]] = true
redisRevokedTokens[parts[1]] = true
}
if iterator.Err() != nil {
return iterator.Err()
}

storage.lock.Lock()
defer storage.lock.Unlock()
storage.revokedTokens = redisRevokedTokens
for recentRevokedToken := range storage.recentRevokedTokens {
storage.revokedTokens[recentRevokedToken] = true
}
storage.recentRevokedTokens = map[string]bool{}

return nil
}

Expand All @@ -112,6 +121,7 @@ func (storage *userStateStorage) SetLoginAttempts(attempts map[string]LoginAttem
func (storage *userStateStorage) RevokeToken(ctx context.Context, id string, expiringAt time.Duration) error {
storage.lock.Lock()
storage.revokedTokens[id] = true
storage.recentRevokedTokens[id] = true
storage.lock.Unlock()
if err := storage.redis.Set(ctx, revokedTokenPrefix+id, "", expiringAt).Err(); err != nil {
return err
Expand Down
Loading