mirror of
https://github.com/J3vb/OwnCord.git
synced 2026-09-03 03:50:00 +03:00
Fixes all 109 golangci-lint findings (106 contextcheck, 1 gocritic,
2 gosec) that accumulated after D2 wired dbgen (whose queries take ctx)
under ctx-less db.DB wrappers while CI lint was quota-dead. No nolint
comments added; every finding fixed by genuinely threading context.
- db: all 138 hand-written db.DB methods take ctx first; the dbCtx()
Background shim is deleted; raw Query/QueryRow/Exec/Begin use their
Context variants; the four redundant ctx-less passthroughs removed.
db.Auditor/WriteAudit gain ctx.
- Seams: permissions.Checker (DB iface, HasChannelPerm,
RequireChannelAccess) and the service.Store interface mirror the new
signatures (ws.EventStore and plugin.PluginStore already did).
- Callers: api/admin handlers use r.Context(); ws per-message paths use
the connection ctx via DispatchV2; hub loops and startup wiring use
context.Background(); service methods thread ctx where they have one
and Background where no ctx exists. Public service surface reached by
ctx-holding chains (PermissionService.HasChannelPerm/GetRoleForUser/
RequireChannelAccess, message/dm/block/invite/profile methods) is now
ctx-first.
- Detached (context.WithoutCancel) where cancellation would break an
invariant, found by a 3-lens adversarial review of the diff:
* voice-leave background retries (a dead webhook/connection ctx killed
retry 2 before it ran, leaving ghost capacity-holding voice rows)
* rollbackVoiceJoin's compensating delete (its trigger IS the cancel)
* post-2FA-change DeleteOtherSessions and logout DeleteSession (the
security tail of a committed change must not die with the request)
* all api/ws audit writes (a banned user could suppress their own
login_blocked_banned row by aborting the request mid-bcrypt)
* admin backup VACUUM INTO (an interrupt left a truncated .db that
the backup list presented as restorable)
* post-commit message/edit refetches (a committed message must still
fan out when the sender disconnects)
* hub settings-cache refresh (one dead connection could pin stale
values for the 30s TTL)
- gocritic rangeValCopy fixed (index iteration); gosec G306 excluded in
config with justification (generated source must stay world-readable)
instead of flipping genprotocol output to 0o600.
Verified: gofmt/vet, all four build-tag variants, full suite, deadlock
pass, full -race pass, golangci-lint 0 issues uncapped.
Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
258 lines
7.2 KiB
Go
258 lines
7.2 KiB
Go
package auth
|
|
|
|
import (
|
|
"context"
|
|
"time"
|
|
|
|
"github.com/owncord/server/syncutil"
|
|
)
|
|
|
|
// entry records individual request timestamps for sliding-window limiting.
|
|
type entry struct {
|
|
timestamps []time.Time
|
|
}
|
|
|
|
// lockoutEntry records when a lockout expires.
|
|
type lockoutEntry struct {
|
|
expiresAt time.Time
|
|
}
|
|
|
|
// LockoutPersister is an optional persistence backend for lockout entries.
|
|
// When provided, lockouts survive server restarts. The interface uses only
|
|
// stdlib types to avoid circular dependencies between packages.
|
|
type LockoutPersister interface {
|
|
UpsertLockout(ctx context.Context, key string, expiresAt time.Time) error
|
|
DeleteLockout(ctx context.Context, key string) error
|
|
CleanupExpiredLockouts(ctx context.Context) error
|
|
// LoadActiveLockouts returns (keys, expiresAt) slices of equal length.
|
|
LoadActiveLockouts(ctx context.Context) (keys []string, expiresAt []time.Time, err error)
|
|
}
|
|
|
|
// RateLimiter is an in-memory, thread-safe sliding-window rate limiter with
|
|
// optional IP lockout support. When a LockoutStore is provided, lockout
|
|
// entries are persisted so they survive server restarts.
|
|
//
|
|
// NOTE (L2): The sliding-window counters and the PartialAuthStore /
|
|
// UsedTOTPCodeStore (in totp.go) are process-local. The server must run
|
|
// as a single instance. Horizontal scaling requires migrating these
|
|
// stores to a shared backend (e.g. Redis).
|
|
type RateLimiter struct {
|
|
mu syncutil.Mutex
|
|
windows map[string]*entry
|
|
lockouts map[string]*lockoutEntry
|
|
store LockoutPersister // nil = pure in-memory (tests, non-login limiters)
|
|
}
|
|
|
|
// NewRateLimiter returns an initialised RateLimiter with no persistence.
|
|
func NewRateLimiter() *RateLimiter {
|
|
return &RateLimiter{
|
|
windows: make(map[string]*entry),
|
|
lockouts: make(map[string]*lockoutEntry),
|
|
}
|
|
}
|
|
|
|
// NewPersistentRateLimiter returns a RateLimiter that persists lockouts via
|
|
// the provided store. It loads any active lockouts from the store on creation.
|
|
func NewPersistentRateLimiter(store LockoutPersister) *RateLimiter {
|
|
rl := &RateLimiter{
|
|
windows: make(map[string]*entry),
|
|
lockouts: make(map[string]*lockoutEntry),
|
|
store: store,
|
|
}
|
|
// Load surviving lockouts from the store. Constructor runs at startup
|
|
// with no request in flight, so background context.
|
|
if keys, expiresAt, err := store.LoadActiveLockouts(context.Background()); err == nil {
|
|
for i, key := range keys {
|
|
rl.lockouts[key] = &lockoutEntry{expiresAt: expiresAt[i]}
|
|
}
|
|
}
|
|
return rl
|
|
}
|
|
|
|
// Allow reports whether a request from key is permitted given the limit and
|
|
// window. It records the current request timestamp only when the request is
|
|
// permitted. Returns false when key is locked out or has exceeded limit within
|
|
// window.
|
|
func (r *RateLimiter) Allow(key string, limit int, window time.Duration) bool {
|
|
r.mu.Lock()
|
|
defer r.mu.Unlock()
|
|
|
|
// Lockout takes priority.
|
|
if lo, ok := r.lockouts[key]; ok {
|
|
if time.Now().Before(lo.expiresAt) {
|
|
return false
|
|
}
|
|
delete(r.lockouts, key)
|
|
}
|
|
|
|
now := time.Now()
|
|
cutoff := now.Add(-window)
|
|
|
|
e, ok := r.windows[key]
|
|
if !ok {
|
|
e = &entry{}
|
|
r.windows[key] = e
|
|
}
|
|
|
|
// Prune timestamps outside the current window.
|
|
valid := e.timestamps[:0]
|
|
for _, ts := range e.timestamps {
|
|
if ts.After(cutoff) {
|
|
valid = append(valid, ts)
|
|
}
|
|
}
|
|
e.timestamps = valid
|
|
|
|
if len(e.timestamps) >= limit {
|
|
return false
|
|
}
|
|
|
|
e.timestamps = append(e.timestamps, now)
|
|
return true
|
|
}
|
|
|
|
// Lockout prevents any requests from key for duration regardless of the
|
|
// sliding-window counter. When a LockoutStore is configured, the lockout
|
|
// is persisted so it survives server restarts. The persist write must land
|
|
// once the lockout is decided, so the caller's cancellation is detached
|
|
// (WithoutCancel) rather than aborting the write mid-request.
|
|
func (r *RateLimiter) Lockout(ctx context.Context, key string, duration time.Duration) {
|
|
r.mu.Lock()
|
|
defer r.mu.Unlock()
|
|
expiresAt := time.Now().Add(duration)
|
|
r.lockouts[key] = &lockoutEntry{expiresAt: expiresAt}
|
|
if r.store != nil {
|
|
_ = r.store.UpsertLockout(context.WithoutCancel(ctx), key, expiresAt)
|
|
}
|
|
}
|
|
|
|
// IsLockedOut reports whether key is currently under a lockout.
|
|
func (r *RateLimiter) IsLockedOut(key string) bool {
|
|
r.mu.Lock()
|
|
defer r.mu.Unlock()
|
|
lo, ok := r.lockouts[key]
|
|
if !ok {
|
|
return false
|
|
}
|
|
if time.Now().Before(lo.expiresAt) {
|
|
return true
|
|
}
|
|
delete(r.lockouts, key)
|
|
return false
|
|
}
|
|
|
|
// Check reports whether a request from key would be permitted given the limit
|
|
// and window, WITHOUT recording a new timestamp. Use this for read-only
|
|
// rate-limit checks where the caller wants to record (via Allow) only on
|
|
// specific outcomes such as verification failures.
|
|
func (r *RateLimiter) Check(key string, limit int, window time.Duration) bool {
|
|
r.mu.Lock()
|
|
defer r.mu.Unlock()
|
|
|
|
if lo, ok := r.lockouts[key]; ok {
|
|
if time.Now().Before(lo.expiresAt) {
|
|
return false
|
|
}
|
|
delete(r.lockouts, key)
|
|
}
|
|
|
|
cutoff := time.Now().Add(-window)
|
|
|
|
e, ok := r.windows[key]
|
|
if !ok {
|
|
return true
|
|
}
|
|
|
|
count := 0
|
|
for _, ts := range e.timestamps {
|
|
if ts.After(cutoff) {
|
|
count++
|
|
}
|
|
}
|
|
|
|
return count < limit
|
|
}
|
|
|
|
// Reset clears all rate-limit state (timestamps and lockout) for key.
|
|
// Like Lockout, the store delete must complete once decided (WithoutCancel).
|
|
func (r *RateLimiter) Reset(ctx context.Context, key string) {
|
|
r.mu.Lock()
|
|
defer r.mu.Unlock()
|
|
delete(r.windows, key)
|
|
delete(r.lockouts, key)
|
|
if r.store != nil {
|
|
_ = r.store.DeleteLockout(context.WithoutCancel(ctx), key)
|
|
}
|
|
}
|
|
|
|
// Cleanup evicts stale map entries to prevent unbounded memory growth.
|
|
//
|
|
// A windows entry is removed when every recorded timestamp is older than
|
|
// maxWindow — meaning the entry could not affect any future Allow call that
|
|
// uses a window equal to or shorter than maxWindow.
|
|
//
|
|
// A lockouts entry is removed when its expiry has passed.
|
|
//
|
|
// Pass defaultCleanupMaxWindow (15 minutes) for normal server operation, or
|
|
// a shorter duration in tests.
|
|
func (r *RateLimiter) Cleanup(maxWindow time.Duration) {
|
|
r.mu.Lock()
|
|
defer r.mu.Unlock()
|
|
|
|
cutoff := time.Now().Add(-maxWindow)
|
|
|
|
for key, e := range r.windows {
|
|
allStale := true
|
|
for _, ts := range e.timestamps {
|
|
if ts.After(cutoff) {
|
|
allStale = false
|
|
break
|
|
}
|
|
}
|
|
if allStale {
|
|
delete(r.windows, key)
|
|
}
|
|
}
|
|
|
|
now := time.Now()
|
|
for key, lo := range r.lockouts {
|
|
if now.After(lo.expiresAt) {
|
|
delete(r.lockouts, key)
|
|
}
|
|
}
|
|
|
|
if r.store != nil {
|
|
// Runs from the StartCleanup background goroutine — no request ctx.
|
|
_ = r.store.CleanupExpiredLockouts(context.Background())
|
|
}
|
|
}
|
|
|
|
// StartCleanup runs Cleanup on a ticker with the given interval until the
|
|
// stop channel is closed. It is intended to be called in a goroutine:
|
|
//
|
|
// stop := make(chan struct{})
|
|
// go rl.StartCleanup(5*time.Minute, 15*time.Minute, stop)
|
|
//
|
|
// Closing stop causes the goroutine to exit promptly.
|
|
func (r *RateLimiter) StartCleanup(interval, maxWindow time.Duration, stop <-chan struct{}) {
|
|
ticker := time.NewTicker(interval)
|
|
defer ticker.Stop()
|
|
|
|
for {
|
|
select {
|
|
case <-ticker.C:
|
|
r.Cleanup(maxWindow)
|
|
case <-stop:
|
|
return
|
|
}
|
|
}
|
|
}
|
|
|
|
// Len returns the number of entries currently stored in the windows and
|
|
// lockouts maps. It is primarily useful for testing and monitoring.
|
|
func (r *RateLimiter) Len() (windows, lockouts int) {
|
|
r.mu.Lock()
|
|
defer r.mu.Unlock()
|
|
return len(r.windows), len(r.lockouts)
|
|
}
|