Stage 1, step 1. BREAKING: a 1.x database is not migrated.
Schema
- internal/store/migrations/ holds one file, 0001_init.sql, equal to the
2.0 schema; 0002..0010 are deleted (they stay in history at 1.9.5). No
admin table created and dropped, no ALTERs.
- users.email replaces users.dmarc_report_email: the address is the
user's own. The default DMARC report address is a user's setting
(dmarc_default_mode hosted/account/custom/none, dmarc_default_address);
the instance setting that mirrored the global user's field is gone.
- domains.dmarc_rua_user_id: a domain follows a named user's default, or
has an address of its own in dmarc_rua ('' = none). ON DELETE SET NULL
leaves it at "no reports", never at someone else's default.
- user_inbound_domains, users.all_domains, users.all_inbound_domains: in
the schema for the inbound delegation of the next step.
- users.role is 'global' / 'domain' (was 'domain_admin');
rate_limits.allowed_ips, unused since 1.9.0, is dropped.
Opening a database
- The baseline sets PRAGMA application_id ("SP20"). store.Open refuses a
file that has a schema version without it (ErrForeignSchema) and one
newer than the build. A 1.x file at user_version 10 would otherwise read
as already migrated. The refused file is left untouched.
Code
- Store.DomainDMARCRua is the one place a domain's report address is
resolved; dnscheck.ResolveDMARCRua and Store.GlobalDMARCReportEmail are
gone. dmarc.AllowedRecipients, the domain page, the dashboard and the
DNS re-check go through it.
- The old templates keep working on the new model until their pages are
restyled: the Settings form's address field is the account e-mail and
switches the user's default between it and none; a domain's "Same as
Settings" makes it follow the user who chose it; a new or imported
domain follows its creator.
- Domain export/import: a domain that follows a user exports no address.
Tests: the baseline pinned table by table (TestBaselineSchema), refusal of a
1.x and of a newer database, constraints and cascades of the new columns and
table, resolution in every default mode, the deleted-user case, and the three
bridged handlers.
docs/schema-migrations.md is rewritten for the baseline; roadmap 11/27,
schema-squash marked built.
go test ./... (Windows)
ok for every package except two that fail the same way before this commit:
internal/domain TestWriteLoadPrivateKeyRoundtrip (file mode on NTFS)
internal/logtail TestFollowTailsAndRotates (rename of an open file)
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
152 lines
4.1 KiB
Go
152 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, 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 maxMsgs, windowSecs sql.NullInt64
|
|
var mode sql.NullString
|
|
var autoMult sql.NullFloat64
|
|
var autoUpdated sql.NullString
|
|
if err := rows.Scan(&scope, &refID, &maxMsgs, &windowSecs, &mode, &autoMult, &autoUpdated); err != nil {
|
|
return nil, fmt.Errorf("scan auto rate limit: %w", err)
|
|
}
|
|
rl := RateLimit{
|
|
Scope: scope,
|
|
RefID: refID,
|
|
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
|
|
}
|