The review of 4433688..0808779 (read-only, a separate agent) found one medium and some lows; all fixed here. Medium, proven by the reviewer: A1's userKey put the typed username into the limiter map whole, and the public forms had no body bound beyond net/http's 10 MiB for a parsed form - each refused request kept up to 10 MiB in memory for fifteen minutes. userKey now holds a 96-bit hash of the folded name, and sign-in, reset, a reset link's page and setup read at most 64 KiB (limitForm, http.MaxBytesReader). TestPublicFormsAreBoundedAndKeysShort. Lows: - Refund skipped the request that filled a bucket (count < max), so a right password at the ceiling left the shared address blocked; Refund now always undoes the Allow it follows. - The reset form did not give the address its attempt back when the name's bucket refused (sign-in did); it does. - A3's day of five links is spent only by a link that goes out, and the price of the pause - anyone knowing a username can pause that owner's reset for a day - is recorded in security.md. - longHeaderLine counted a trailing CR on a header's first line. - test.yml declares permissions: contents: read. Not changed, as the review's nits: the store matches names exactly while the limiter folds them (stricter, said in the comment now); a session from a longer window is honoured until its next Touch (the next request). go test ./internal/web/auth ./internal/milter. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
149 lines
3.9 KiB
Go
149 lines
3.9 KiB
Go
package auth
|
|
|
|
import (
|
|
"sync"
|
|
"time"
|
|
)
|
|
|
|
const defaultMaxBuckets = 4096
|
|
|
|
// blockedBucketCeiling is how far past maxBuckets the map may grow while every
|
|
// bucket in it is blocked. Blocked buckets are normally protected from
|
|
// eviction (see evictNearest), but protecting them unconditionally would let
|
|
// an attacker with many source addresses grow the map without bound — each
|
|
// address only has to fail max times. Past the ceiling blocked buckets are
|
|
// evicted too, nearest expiry first: bounded memory wins over holding every
|
|
// block, and the addresses that lose their bucket have to spend max attempts
|
|
// again to get back to blocked.
|
|
const blockedBucketCeiling = 4
|
|
|
|
// rateLimiter is a simple fixed-window per-key counter used to throttle the
|
|
// setup and login routes (security.md). Keys are client IPs.
|
|
type rateLimiter struct {
|
|
max int
|
|
window time.Duration
|
|
maxBuckets int
|
|
|
|
mu sync.Mutex
|
|
buckets map[string]*rlBucket
|
|
lastOverflow time.Time
|
|
}
|
|
|
|
type rlBucket struct {
|
|
count int
|
|
windowEnds time.Time
|
|
}
|
|
|
|
func newRateLimiter(max int, window time.Duration) *rateLimiter {
|
|
return &rateLimiter{
|
|
max: max,
|
|
window: window,
|
|
maxBuckets: defaultMaxBuckets,
|
|
buckets: make(map[string]*rlBucket),
|
|
}
|
|
}
|
|
|
|
func (r *rateLimiter) startSweeper() {
|
|
go func() {
|
|
ticker := time.NewTicker(r.window)
|
|
defer ticker.Stop()
|
|
for range ticker.C {
|
|
r.mu.Lock()
|
|
r.sweep(time.Now())
|
|
r.mu.Unlock()
|
|
}
|
|
}()
|
|
}
|
|
|
|
func (r *rateLimiter) Allow(key string) bool {
|
|
now := time.Now()
|
|
r.mu.Lock()
|
|
defer r.mu.Unlock()
|
|
|
|
b := r.buckets[key]
|
|
if b == nil || now.After(b.windowEnds) {
|
|
r.makeRoom(now)
|
|
r.buckets[key] = &rlBucket{count: 1, windowEnds: now.Add(r.window)}
|
|
r.sweep(now)
|
|
return true
|
|
}
|
|
if b.count >= r.max {
|
|
return false
|
|
}
|
|
b.count++
|
|
return true
|
|
}
|
|
|
|
// Refund gives back the attempt Allow took for key, for an attempt that
|
|
// turned out not to be a guess (a right password). It is called only after
|
|
// an Allow that admitted the attempt, so it undoes that one: the request that
|
|
// filled the bucket gives its own place back too (the review of stages 2-6:
|
|
// a right password at the ceiling used to leave the address blocked).
|
|
func (r *rateLimiter) Refund(key string) {
|
|
r.mu.Lock()
|
|
defer r.mu.Unlock()
|
|
if b := r.buckets[key]; b != nil && b.count > 0 {
|
|
b.count--
|
|
}
|
|
}
|
|
|
|
func (r *rateLimiter) makeRoom(now time.Time) {
|
|
if r.maxBuckets <= 0 || len(r.buckets) < r.maxBuckets {
|
|
return
|
|
}
|
|
r.sweep(now)
|
|
hardCap := r.maxBuckets * blockedBucketCeiling
|
|
for len(r.buckets) >= r.maxBuckets {
|
|
if r.evictNearest(false) {
|
|
continue
|
|
}
|
|
// Nothing evictable is left: every remaining bucket is blocked. Hold
|
|
// them until the map reaches the hard ceiling, then start evicting
|
|
// blocked buckets as well so memory stays bounded.
|
|
if len(r.buckets) < hardCap {
|
|
break
|
|
}
|
|
if !r.evictNearest(true) {
|
|
break
|
|
}
|
|
if now.Sub(r.lastOverflow) >= r.window {
|
|
r.lastOverflow = now
|
|
logf("panel: login rate limiter holds %d blocked buckets (cap %d) — evicting blocked entries; "+
|
|
"this means many distinct client addresses are failing authentication", len(r.buckets), r.maxBuckets)
|
|
}
|
|
}
|
|
}
|
|
|
|
// evictNearest removes the bucket whose window ends soonest and reports whether
|
|
// it removed one. Blocked buckets (count >= max) are skipped unless evictBlocked
|
|
// is set, so an attacker cannot flush active rate-limit state by filling the map
|
|
// with new keys.
|
|
func (r *rateLimiter) evictNearest(evictBlocked bool) bool {
|
|
var bestKey string
|
|
var bestEnds time.Time
|
|
first := true
|
|
for k, b := range r.buckets {
|
|
if !evictBlocked && b.count >= r.max {
|
|
continue
|
|
}
|
|
if first || b.windowEnds.Before(bestEnds) {
|
|
bestKey = k
|
|
bestEnds = b.windowEnds
|
|
first = false
|
|
}
|
|
}
|
|
if bestKey == "" {
|
|
return false
|
|
}
|
|
delete(r.buckets, bestKey)
|
|
return true
|
|
}
|
|
|
|
func (r *rateLimiter) sweep(now time.Time) {
|
|
for k, b := range r.buckets {
|
|
if now.After(b.windowEnds) {
|
|
delete(r.buckets, k)
|
|
}
|
|
}
|
|
}
|