Review pass over `1.4.0`…`1.9.1`: port 25 no longer shares the submission milter chain, DMARC reports are validated before they are stored, and the auto rate limit is correct for a non-default level-1 window. Schema migration `0010` (index only). Upgrading is a tag bump. Added: - SQLite migration `0010_send_log_app_login_index.sql` — - DMARC aggregate reports are accepted as **zip** as well as gzip or plain XML - e2e: `checkPort25ConfigCombinations` regenerates the Postfix configuration Changed: - README hero line and a **Positioning** block in `docs/product.md` record the Fixed: - The setup account's password is hashed at bcrypt cost `12` like every other - Login/setup rate limiter: protecting blocked buckets from eviction is now - `postqueue -p` output is bounded to 4 MiB (the timeout alone left the size of - [schema-migrations.md](docs/schema-migrations.md): the schema section was - postqueue reader is now time-bounded: `postqueue -p` runs under a 5-second … (11 more in CHANGELOG) Changed: - [roadmap.md](docs/roadmap.md) now carries everything the 2026-08-19 code - Extracted `internal/configsafe` — the empty-value and forbidden-character - Build, deploy and migration comments no longer cite the archived - Dropped the `parseDomainRateLimitForm` / `parseAppRateLimitForm` pass-through - Extracted shared helpers: `internal/atomicfile` (atomic temp-write+rename) and … (7 more in CHANGELOG) Removed: - Unused legacy asset `docs/assets/icon.png` (superseded by the four brand SVGs - Plan documents for already-shipped features: `domain-stats-auto-ratelimit`, Full detail: CHANGELOG.md (1.9.2).
154 lines
4.1 KiB
Go
154 lines
4.1 KiB
Go
package store
|
|
|
|
import (
|
|
"database/sql"
|
|
"fmt"
|
|
"log"
|
|
"math"
|
|
"time"
|
|
)
|
|
|
|
// RecalcAllAutoRateLimits recomputes max_messages for every auto-mode limit.
|
|
// Store errors for individual rows are logged and skipped (fail-open on the
|
|
// last successfully written limit). Returns how many rows were updated.
|
|
func (s *Store) RecalcAllAutoRateLimits(retentionDays, l1Max, l1Window int) (int, error) {
|
|
rows, err := s.listAutoRateLimits()
|
|
if err != nil {
|
|
return 0, err
|
|
}
|
|
var updated int
|
|
for _, rl := range rows {
|
|
if err := s.recalcAutoRateLimit(rl, retentionDays, l1Max, l1Window); err != nil {
|
|
log.Printf("store: auto rate-limit recalc %s ref %d: %v", rl.Scope, rl.RefID, err)
|
|
continue
|
|
}
|
|
updated++
|
|
}
|
|
return updated, nil
|
|
}
|
|
|
|
// RecalcAutoRateLimit recomputes one auto-mode limit. Returns an error when
|
|
// the row is missing or not in auto mode.
|
|
func (s *Store) RecalcAutoRateLimit(scope string, refID int64, retentionDays, l1Max, l1Window int) error {
|
|
rl, ok, err := s.GetRateLimit(scope, refID)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
if !ok || !rl.IsAuto() {
|
|
return fmt.Errorf("rate limit not in auto mode")
|
|
}
|
|
rl.Scope, rl.RefID = scope, refID
|
|
return s.recalcAutoRateLimit(rl, retentionDays, l1Max, l1Window)
|
|
}
|
|
|
|
func (s *Store) listAutoRateLimits() ([]RateLimit, error) {
|
|
rows, err := s.db.Query(
|
|
`SELECT scope, ref_id, allowed_ips, max_messages, window_seconds, mode, auto_multiplier, auto_updated_at
|
|
FROM rate_limits WHERE mode = ?`, RateLimitModeAuto,
|
|
)
|
|
if err != nil {
|
|
return nil, fmt.Errorf("list auto rate limits: %w", err)
|
|
}
|
|
defer rows.Close()
|
|
|
|
var out []RateLimit
|
|
for rows.Next() {
|
|
var scope string
|
|
var refID int64
|
|
var ips sql.NullString
|
|
var maxMsgs, windowSecs sql.NullInt64
|
|
var mode sql.NullString
|
|
var autoMult sql.NullFloat64
|
|
var autoUpdated sql.NullString
|
|
if err := rows.Scan(&scope, &refID, &ips, &maxMsgs, &windowSecs, &mode, &autoMult, &autoUpdated); err != nil {
|
|
return nil, fmt.Errorf("scan auto rate limit: %w", err)
|
|
}
|
|
rl := RateLimit{
|
|
Scope: scope,
|
|
RefID: refID,
|
|
AllowedIPs: splitIPs(ips.String),
|
|
MaxMessages: int(maxMsgs.Int64),
|
|
WindowSeconds: int(windowSecs.Int64),
|
|
Mode: mode.String,
|
|
}
|
|
if autoMult.Valid {
|
|
rl.AutoMultiplier = autoMult.Float64
|
|
}
|
|
if autoUpdated.Valid {
|
|
rl.AutoUpdatedAt, _ = time.Parse(time.RFC3339, autoUpdated.String)
|
|
}
|
|
out = append(out, rl)
|
|
}
|
|
return out, rows.Err()
|
|
}
|
|
|
|
func (s *Store) recalcAutoRateLimit(rl RateLimit, retentionDays, l1Max, l1Window int) error {
|
|
if !rl.IsAuto() {
|
|
return fmt.Errorf("not auto mode")
|
|
}
|
|
mult := rl.AutoMultiplier
|
|
if mult <= 0 {
|
|
mult = DefaultAutoMultiplier
|
|
}
|
|
|
|
var stats SendStats
|
|
|
|
switch rl.Scope {
|
|
case RateLimitScopeDomain:
|
|
d, err := s.GetDomain(rl.RefID)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
stats, err = s.DomainSendStats(d.Name, retentionDays, d.CreatedAt)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
case RateLimitScopeApp:
|
|
a, err := s.GetApplication(rl.RefID)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
stats, err = s.AppSendStats(a.Login, retentionDays, a.CreatedAt)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
default:
|
|
return fmt.Errorf("unknown scope %q", rl.Scope)
|
|
}
|
|
|
|
maxMsgs := computeAutoMaxMessages(stats, mult, l1Max, l1Window)
|
|
|
|
rl.MaxMessages = maxMsgs
|
|
rl.WindowSeconds = l1Window
|
|
rl.AutoUpdatedAt = time.Now().UTC()
|
|
if rl.AutoMultiplier <= 0 {
|
|
rl.AutoMultiplier = mult
|
|
}
|
|
|
|
return s.SetRateLimit(rl)
|
|
}
|
|
|
|
// computeAutoMaxMessages turns an average send rate into a ceiling for one
|
|
// level-1 window. AvgPerHour is per hour, the ceiling counts messages per
|
|
// windowSeconds, so the rate is scaled to the window before the multiplier is
|
|
// applied — otherwise a window other than the default 3600s would silently
|
|
// shift the effective allowance by windowSeconds/3600. The result is never
|
|
// below 1 for a domain that has sent anything, and never above level 1.
|
|
func computeAutoMaxMessages(stats SendStats, multiplier float64, l1Max, windowSeconds int) int {
|
|
if stats.Total == 0 {
|
|
return 0
|
|
}
|
|
if windowSeconds <= 0 {
|
|
windowSeconds = 3600
|
|
}
|
|
perWindow := stats.AvgPerHour * float64(windowSeconds) / 3600
|
|
max := int(math.Ceil(perWindow * multiplier))
|
|
if max < 1 {
|
|
max = 1
|
|
}
|
|
if max > l1Max {
|
|
max = l1Max
|
|
}
|
|
return max
|
|
}
|