test / test (push) Canceled after 0s
A message's From: line is held against the application that sends it, under the rule Postfix holds the envelope sender to. OpenDKIM chooses the key by that line, so until now an application could have mail signed as another domain of the server or as the server itself. The check (internal/milter/sender.go) - A role of the panel on a socket of its own (SENDER_CHECK_SOCKET), first in smtpd_milters and strict: default_action=tempfail. The journal milter keeps its socket and stays fail-open. postfix-wrapper waits for the new socket. - It reads no database: what an application may send as comes from Postfix's own sender_login_maps, what the server signs for from OpenDKIM's SigningTable. Both are read again when they change; one that cannot be read defers mail. - One From: field, one address, allowed by the envelope's lookup; then no other name of the SigningTable may appear anywhere in the raw line. Refused: 550 5.7.1 naming the line, reduced to printable ASCII. - A refusal is a send-log row with reason "from" and the header address (migration 0006), written by another goroutine and not waited for. The journal's refusals record their reason too (limit, client), and the notifier takes only a limit's. What it costs (docs/plans/from-header-binding.md, Statistics) - The role marks itself alive every 2 s; at start the gap since the mark is downtime, counted from Postfix's start if later and not at all when supervisord says Postfix is not running. - The log tailer counts the connections Postfix turned away: a warning that names the socket, then milter-reject "Service unavailable" from the same smtpd. Seen on the stand: the client is refused from CONNECT on and leaves at AUTH (454), so no MAIL line is ever written. - sender_check_days, a row per UTC day, kept a year. Pages - Health: the card "Sender check", the socket's row, and the cards layout - boxes numbered by importance in two stacks read in rows; the left stack polls, the three readings of the right one are swapped in by id. - Outbound log: a refused row says why in its tag (wrong From, wrong client, rate-limited); the message's page shows the From: line and what the application may send as. - Help: topic "Sender check", word for word the mockup's. Found by the stand, fixed here: the names for the second look came from the sender bindings, and a domain with a key and no application yet was not among them. e2e: negative_journal_milter_fail_open is gone - it proved that mail passes with the panel down, which is no longer so. In its place sender_check_holds_the_from_line (another domain's From:, the hostname's, a stranger's, an address off the list, another sender in the display name - refused; own addresses - delivered) and panel_down_defers_mail (4xx with the panel stopped, the container alive, mail again after, downtime and one deferred message on Health, the card warning). Test server, this tree before the last cosmetic edits (a fixture row, a fact's size, docs): go vet ok, go test 23 packages ok, make e2e ok (337 s). Locally after them: internal/web/view ok. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
147 lines
4.6 KiB
Go
147 lines
4.6 KiB
Go
package store
|
|
|
|
import (
|
|
"fmt"
|
|
"time"
|
|
)
|
|
|
|
// Why a send-log row with status "rejected" was refused (send_log.reason).
|
|
// A row written before the reason was recorded has "".
|
|
const (
|
|
ReasonLimit = "limit" // a level-2 rate limit
|
|
ReasonClient = "client" // the application's list of client addresses
|
|
ReasonFrom = "from" // the From: line is not the application's
|
|
)
|
|
|
|
// Settings keys of the sender check's statistics.
|
|
const (
|
|
// settingSenderCheckSince is the first UTC day the statistics cover.
|
|
settingSenderCheckSince = "sender_check_since"
|
|
// settingSenderCheckDeferredAt is when a message was last deferred because
|
|
// the check did not answer (RFC3339 UTC).
|
|
settingSenderCheckDeferredAt = "sender_check_deferred_at"
|
|
)
|
|
|
|
// senderCheckKeepDays is how long a day of the statistics is kept.
|
|
const senderCheckKeepDays = 366
|
|
|
|
const dayLayout = "2006-01-02"
|
|
|
|
// SenderCheckTotals is what the strict sender check has cost over a period.
|
|
type SenderCheckTotals struct {
|
|
Down time.Duration // the panel not answering while Postfix was running
|
|
Deferred int64 // messages Postfix deferred because of it
|
|
}
|
|
|
|
// SenderCheckStats is the card of Server > Health.
|
|
type SenderCheckStats struct {
|
|
Today, Month, Year SenderCheckTotals
|
|
// Since is the first day counted; zero before anything was.
|
|
Since time.Time
|
|
// DeferredAt is when a message was last deferred; zero if never.
|
|
DeferredAt time.Time
|
|
}
|
|
|
|
// StartSenderCheckStats records the first day the statistics cover, once.
|
|
func (s *Store) StartSenderCheckStats(now time.Time) error {
|
|
v, err := s.GetSetting(settingSenderCheckSince)
|
|
if err != nil || v != "" {
|
|
return err
|
|
}
|
|
return s.SetSetting(settingSenderCheckSince, now.UTC().Format(dayLayout))
|
|
}
|
|
|
|
// AddSenderCheckDown adds to the day of at the time the panel did not answer
|
|
// while Postfix was running.
|
|
func (s *Store) AddSenderCheckDown(at time.Time, d time.Duration) error {
|
|
secs := int64(d / time.Second)
|
|
if secs <= 0 {
|
|
return nil
|
|
}
|
|
_, err := s.db.Exec(
|
|
`INSERT INTO sender_check_days (day, down_seconds) VALUES (?, ?)
|
|
ON CONFLICT (day) DO UPDATE SET down_seconds = down_seconds + excluded.down_seconds`,
|
|
at.UTC().Format(dayLayout), secs,
|
|
)
|
|
if err != nil {
|
|
return fmt.Errorf("sender check downtime: %w", err)
|
|
}
|
|
return nil
|
|
}
|
|
|
|
// AddSenderCheckDeferred counts, on the day of at, n messages deferred because
|
|
// the check did not answer, and remembers at as the last such moment.
|
|
func (s *Store) AddSenderCheckDeferred(at time.Time, n int64) error {
|
|
if n <= 0 {
|
|
return nil
|
|
}
|
|
_, err := s.db.Exec(
|
|
`INSERT INTO sender_check_days (day, deferred) VALUES (?, ?)
|
|
ON CONFLICT (day) DO UPDATE SET deferred = deferred + excluded.deferred`,
|
|
at.UTC().Format(dayLayout), n,
|
|
)
|
|
if err != nil {
|
|
return fmt.Errorf("sender check deferred: %w", err)
|
|
}
|
|
// Lines are read in order, but a re-read log must not move the mark back.
|
|
last, err := s.GetSetting(settingSenderCheckDeferredAt)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
stamp := at.UTC().Format(time.RFC3339)
|
|
if stamp > last {
|
|
return s.SetSetting(settingSenderCheckDeferredAt, stamp)
|
|
}
|
|
return nil
|
|
}
|
|
|
|
// SenderCheckStats sums the days up to now: today, the last 30 days and the
|
|
// last 12 months, each including today.
|
|
func (s *Store) SenderCheckStats(now time.Time) (SenderCheckStats, error) {
|
|
now = now.UTC()
|
|
var out SenderCheckStats
|
|
sum := func(days int) (SenderCheckTotals, error) {
|
|
var secs, deferred int64
|
|
err := s.db.QueryRow(
|
|
`SELECT COALESCE(SUM(down_seconds), 0), COALESCE(SUM(deferred), 0)
|
|
FROM sender_check_days WHERE day > ? AND day <= ?`,
|
|
now.AddDate(0, 0, -days).Format(dayLayout), now.Format(dayLayout),
|
|
).Scan(&secs, &deferred)
|
|
if err != nil {
|
|
return SenderCheckTotals{}, fmt.Errorf("sender check stats: %w", err)
|
|
}
|
|
return SenderCheckTotals{Down: time.Duration(secs) * time.Second, Deferred: deferred}, nil
|
|
}
|
|
var err error
|
|
if out.Today, err = sum(1); err != nil {
|
|
return out, err
|
|
}
|
|
if out.Month, err = sum(30); err != nil {
|
|
return out, err
|
|
}
|
|
if out.Year, err = sum(365); err != nil {
|
|
return out, err
|
|
}
|
|
since, err := s.GetSetting(settingSenderCheckSince)
|
|
if err != nil {
|
|
return out, err
|
|
}
|
|
out.Since, _ = time.Parse(dayLayout, since)
|
|
deferredAt, err := s.GetSetting(settingSenderCheckDeferredAt)
|
|
if err != nil {
|
|
return out, err
|
|
}
|
|
out.DeferredAt, _ = time.Parse(time.RFC3339, deferredAt)
|
|
return out, nil
|
|
}
|
|
|
|
// PruneSenderCheckDays deletes the days older than a year.
|
|
func (s *Store) PruneSenderCheckDays(now time.Time) error {
|
|
_, err := s.db.Exec(`DELETE FROM sender_check_days WHERE day < ?`,
|
|
now.UTC().AddDate(0, 0, -senderCheckKeepDays).Format(dayLayout))
|
|
if err != nil {
|
|
return fmt.Errorf("prune sender check days: %w", err)
|
|
}
|
|
return nil
|
|
}
|