Verified the tree against docs/plans/code-review-2026-08.md and finished the tasks that were only partly done, plus two defects the pass introduced. - bcrypt: the setup account was still hashed at DefaultCost (10). The work factor now has one definition, auth.BcryptCost = 12, used everywhere. - rate limiter: protecting blocked buckets from eviction was unbounded — an attacker with many source addresses could grow the map by making each one fail its way to blocked. Blocked buckets are now evicted past maxBuckets * 4, nearest expiry first, logged once per window. Tests cover both halves. - postqueue: the 5s timeout left the output size unbounded; reads are now capped at 4 MiB and report truncation. - spec references: the ~76 `spec N` citations CHANGELOG [0.5.0] claimed were gone are removed from build/, deploy/, the first two migrations and the release workflow, with the affected comment paragraphs re-wrapped. Comments only; shell/YAML/SQL syntax re-checked. - schema-migrations.md: schema section was headed v9 with the chain at v10, and three links pointed at deleted plan files. - internal/configsafe: the shared empty/forbidden-character check behind the OpenDKIM and Postfix config writers; each writer keeps its own forbidden set. - dropped the parseDomainRateLimitForm/parseAppRateLimitForm pass-throughs left behind by the parser merge (only their own tests still called them). - plan doc now carries a status table: what shipped, what was already in place, what was declined (//go:build linux for the /proc reader) and the open CSRF-token question. Not done, each its own phase: typed template data structs, log/slog, DMARC service and handler tests, error-page/corrupted-backup tests, backup re-auth. Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
This commit is contained in:
@@ -15,6 +15,13 @@ const (
|
||||
sessionCookiePrefixed = "__Host-" + sessionCookieBase
|
||||
)
|
||||
|
||||
// BcryptCost is the work factor for every panel password hash — the setup
|
||||
// account created here and the ones the settings and user pages write
|
||||
// (security.md). bcrypt records the cost inside the hash, so raising it only
|
||||
// affects passwords set from now on; existing hashes keep verifying at the
|
||||
// cost they were written with.
|
||||
const BcryptCost = 12
|
||||
|
||||
func (m *Module) sessionCookie() string {
|
||||
if m.cfg.CookieSecure {
|
||||
return sessionCookiePrefixed
|
||||
@@ -219,7 +226,7 @@ func (m *Module) submitSetup(w http.ResponseWriter, r *http.Request, token strin
|
||||
return
|
||||
}
|
||||
|
||||
hash, err := bcrypt.GenerateFromPassword([]byte(password), bcrypt.DefaultCost)
|
||||
hash, err := bcrypt.GenerateFromPassword([]byte(password), BcryptCost)
|
||||
if err != nil {
|
||||
logf("panel: setup: hashing password failed: %v", err)
|
||||
m.renderSetupForm(w, http.StatusInternalServerError, token, "Internal error. Please try again.")
|
||||
|
||||
@@ -7,6 +7,16 @@ import (
|
||||
|
||||
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 {
|
||||
@@ -14,8 +24,9 @@ type rateLimiter struct {
|
||||
window time.Duration
|
||||
maxBuckets int
|
||||
|
||||
mu sync.Mutex
|
||||
buckets map[string]*rlBucket
|
||||
mu sync.Mutex
|
||||
buckets map[string]*rlBucket
|
||||
lastOverflow time.Time
|
||||
}
|
||||
|
||||
type rlBucket struct {
|
||||
@@ -68,22 +79,38 @@ func (r *rateLimiter) makeRoom(now time.Time) {
|
||||
return
|
||||
}
|
||||
r.sweep(now)
|
||||
hardCap := r.maxBuckets * blockedBucketCeiling
|
||||
for len(r.buckets) >= r.maxBuckets {
|
||||
if !r.evictNearest() {
|
||||
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, skipping buckets
|
||||
// that are currently blocked (count >= max) so an attacker cannot flush active
|
||||
// rate-limit state by filling the map with new keys.
|
||||
func (r *rateLimiter) evictNearest() bool {
|
||||
// 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 b.count >= r.max {
|
||||
if !evictBlocked && b.count >= r.max {
|
||||
continue
|
||||
}
|
||||
if first || b.windowEnds.Before(bestEnds) {
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
package auth
|
||||
|
||||
import (
|
||||
"fmt"
|
||||
"testing"
|
||||
"time"
|
||||
)
|
||||
@@ -123,3 +124,53 @@ func TestRateLimiterCapsBucketCount(t *testing.T) {
|
||||
t.Fatalf("bucket count = %d, want at most 3", len(r.buckets))
|
||||
}
|
||||
}
|
||||
|
||||
// A flood of new addresses must not be able to reset the limiter for an address
|
||||
// that is already blocked: below the hard ceiling, blocked buckets survive
|
||||
// eviction even though the map is over its soft cap.
|
||||
func TestRateLimiterKeepsBlockedBucketsUnderPressure(t *testing.T) {
|
||||
r := newRateLimiter(2, time.Minute)
|
||||
r.maxBuckets = 3
|
||||
|
||||
blocked := []string{"203.0.113.7", "198.51.100.9", "192.0.2.5"}
|
||||
for _, key := range blocked {
|
||||
for i := 0; i < 2; i++ {
|
||||
if !r.Allow(key) {
|
||||
t.Fatalf("%s refused before reaching the limit", key)
|
||||
}
|
||||
}
|
||||
if r.Allow(key) {
|
||||
t.Fatalf("%s was not blocked after 2 attempts", key)
|
||||
}
|
||||
}
|
||||
|
||||
// Fresh addresses arrive and find nothing evictable.
|
||||
for i := 0; i < 10; i++ {
|
||||
r.Allow(fmt.Sprintf("198.51.100.%d", 100+i))
|
||||
}
|
||||
|
||||
for _, key := range blocked {
|
||||
if r.Allow(key) {
|
||||
t.Fatalf("%s lost its block after new addresses arrived", key)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// Protecting blocked buckets is bounded: past maxBuckets * blockedBucketCeiling
|
||||
// they are evicted too, so an attacker cannot grow the map without limit by
|
||||
// burning through source addresses.
|
||||
func TestRateLimiterBoundsBlockedBuckets(t *testing.T) {
|
||||
r := newRateLimiter(1, time.Minute)
|
||||
r.maxBuckets = 2
|
||||
hardCap := r.maxBuckets * blockedBucketCeiling
|
||||
|
||||
for i := 0; i < 100; i++ {
|
||||
r.Allow(fmt.Sprintf("192.0.2.%d", i))
|
||||
}
|
||||
|
||||
r.mu.Lock()
|
||||
defer r.mu.Unlock()
|
||||
if len(r.buckets) > hardCap {
|
||||
t.Fatalf("bucket count = %d, want at most the hard cap %d", len(r.buckets), hardCap)
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user