Stage 3, step 2. Reviewed by Fable (read-only), fixed by Sonnet with a
failing test before each fix, checked by Opus. No Critical or High
finding: route authorization, tenant isolation by id, the /server/
subtree guard, output encoding and the origin check were found sound.
Fixed
- M1: a session was keyed by user name and had no link to the user. A
deleted or renamed user's cookie stayed alive (renewed on every hit,
before the user was looked up) and became a session of whoever was
later created under that name, with that account's role. The
baseline now has sessions.user_id REFERENCES users(id) ON DELETE
CASCADE; the principal is resolved by id and a session is renewed
only after its user was found. RenameSession is gone.
- M2: any user's password change deleted every other user's sessions.
It ends that user's other sessions only.
- L1: a password set on the user form ends that user's sessions (an
administrator editing their own account keeps the current one).
- L2: store, saslpasswd2 and Postfix reload errors were shown verbatim
on the application form, the inbound upstream / recipients forms and
the limit recalculation - pages a domain administrator reaches.
Validation errors (app.ValidationError, inbound.ValidationError,
store.ErrNotAutoRateLimit) keep their text; anything else is logged
and shown as "Could not save ... Check the logs and try again."
- L3: store.ListDMARCReports treated an empty domain list as "all". It
takes a scope now (AllDomains or a list; an empty list is no rows),
and the DMARC hub is open to the domain role as the plan says: the
reports of the assigned domains, without the instance-wide ingest
box. The menu entry was already shown to them and led to a 404.
- I1: /static/ answered with a listing of the embedded assets. A path
that is not a known asset is a 404.
Consequences
- The global DMARC hub lists reports of domains that were deleted
since, too.
- dev/migrate1x (not in the tree) no longer carries sessions over:
everyone signs in again after the transfer.
- docs/schema-migrations.md: the sessions row.
Recorded, not changed - for the owner:
- L4: the report-address select names the followed user and their
address to every administrator of the domain, by default the global
administrator's login name. The plan asks for it.
- L5: a delegated inbound upstream may be any host and port, loopback
and private ranges included - within the trusted-operator model; to
be listed among the accepted risks in security.md.
- L6: Account's profile is saved without the password; becomes a
requirement once password-reset mails to users.email.
- Still echoing an error's text: backup and domain import (global
only), the domain form's validation messages.
Not checked by the review: anything needing the container (e2e, real
Postfix / DNS), CSP behaviour in a live browser.
go test -count=1 ./internal/web/... ./internal/store/... ./internal/app/...
./internal/inbound/... ./internal/dmarc/... ./cmd/panel
ok (all eleven packages; dev/migrate1x also ok)
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
158 lines
4.3 KiB
Go
158 lines
4.3 KiB
Go
package store
|
|
|
|
import (
|
|
"database/sql"
|
|
"errors"
|
|
"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
|
|
}
|
|
|
|
// ErrNotAutoRateLimit is returned by RecalcAutoRateLimit for a limit that is
|
|
// missing or not in auto mode: there is nothing to recalculate. It is the one
|
|
// refusal of that call that is the administrator's to read.
|
|
var ErrNotAutoRateLimit = errors.New("rate limit not in auto mode")
|
|
|
|
// RecalcAutoRateLimit recomputes one auto-mode limit. Returns
|
|
// ErrNotAutoRateLimit 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 ErrNotAutoRateLimit
|
|
}
|
|
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
|
|
}
|