mixandClaude Opus 5.5
60c7b85f84
test / test (push) Canceled after 0s
Technical review (Opus) and security review (Fable) of 9efc9c7..a59e3d4; reports in the session's scratchpad. Fixed: - B1 (verified bug): store.UpdateStatus read before writing in its transaction; a commit by another connection in between (the dmarc-ingest process opens the same file) failed it at once with "database is locked" and the delivery line was lost. The first statement is now a write. - R3: a delivery line updated every row of its queue id and recipient; it now updates only the newest (Postfix reuses short ids). The sweep closes by row id (QueuedDelivery.ID, CloseUnreported(id)). - R4: a contradicted sweep keeps a mark, reason "reconcile-contradicted", instead of losing which row it was. - R1: contradicted cannot see a lost line (never read late). New counter reconcile_missed: at close, the sweep looks for the row's delivery line in mail.log and mail.log.1 (QueueLines). 0007 edited - it has run on no database but throwaway stands. - R2: queued_over_lifetime cannot measure "what removing the sweep would leave" while the sweep runs; its text now says rows stuck despite the sweep, and the rule uses closed - missed - contradicted. - cert-reload (R5, R6, R7, security medium/low): both files copied to .new and the copies checked as a pair before both are renamed; acts on the copy only when postconf says Postfix reads it; a failed reload is retried next pass; umask 077; says so when the mounted files cannot be read. The e2e case asserts Postfix reads the copy, the copy equals the mount, the key is 600 root. - Security low: a recipient with a quoted local part - the journal cut "a b"@x at the space, deliveryRe cut "a>b"@x at the ">" - matched no delivery line and was closed by the sweep. cleanAddress ends a bracketed address at the first ">" outside quotes; deliveryRe takes the recipient up to the ">, " before relay= (test fixtures given the relay= every real delivery line has). - Security low: postqueue -p's error carries at most 512 bytes of output. - Nits: addDeliveryLogDay refuses a column not on its list; the truncation test checks its message. - To stage 2b (page wording, mockup-first): the history step of a bounced row says the receiving server refused it, false for a row the sweep closed. To the owner when stage 2b is reached: since M13 the "deferred" figure counts whole messages too, which "Connections turned away" would not name. Found while verifying: the e2e's main positive path failed once with "553 not owned by user app1" - an smtpd idle from before the panel's reload took the connection in the reload's second. Measured on the stand (one-off probe, not committed): sending 0, 10, 40, 110 s after the save (two seconds at the soonest) always met an smtpd started after the reload. The e2e now waits for the sender map after each application it creates (waitForSenderMap: AUTH, MAIL, RCPT, RSET - no message, no row), and the level-1 case uses it instead of its own loop. Docs: architecture § Queue reconcile, schema-migrations (rows 7 and 8, chain head 8), CHANGELOG, audit plan (stage 1 note, the measured window, a new stage 2b line: 62 lines), roadmap 15/62. Evidence on the test server for this tree: go vet clean, go test ./... 23 packages ok, make e2e exit 0 (renewed certificate, hung panel, level 1 at 49/60). Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
79 lines
2.3 KiB
Go
79 lines
2.3 KiB
Go
package store
|
|
|
|
import (
|
|
"testing"
|
|
"time"
|
|
)
|
|
|
|
// The counters add up per UTC day, the stuck level is overwritten rather than
|
|
// added, nothing is written for nothing, and a year is kept.
|
|
func TestDeliveryLogDays(t *testing.T) {
|
|
st := openTestStore(t)
|
|
day1 := time.Date(2026, 10, 14, 23, 59, 0, 0, time.UTC)
|
|
day2 := day1.Add(2 * time.Minute)
|
|
|
|
must := func(err error) {
|
|
t.Helper()
|
|
if err != nil {
|
|
t.Fatal(err)
|
|
}
|
|
}
|
|
must(st.AddReconcileClosed(day1, 2))
|
|
must(st.AddReconcileClosed(day1, 3))
|
|
must(st.AddReconcileClosed(day1, 0))
|
|
must(st.AddReconcileMissed(day1, 2))
|
|
must(st.AddTailerBlind(day1, 1500*time.Millisecond))
|
|
must(st.AddTailerBlind(day1, 900*time.Millisecond)) // under a second: nothing
|
|
must(st.SetQueuedOverLifetime(day1, 4))
|
|
must(st.SetQueuedOverLifetime(day1, 1))
|
|
must(st.AddTailerBlind(day2, time.Minute))
|
|
|
|
days, err := st.DeliveryLogDays()
|
|
must(err)
|
|
want := []DeliveryLogDay{
|
|
{Day: "2026-10-14", Closed: 5, Missed: 2, BlindSeconds: 1, Stuck: 1},
|
|
{Day: "2026-10-15", BlindSeconds: 60},
|
|
}
|
|
if len(days) != len(want) {
|
|
t.Fatalf("days = %+v, want %+v", days, want)
|
|
}
|
|
for i := range want {
|
|
if days[i] != want[i] {
|
|
t.Errorf("day %d = %+v, want %+v", i, days[i], want[i])
|
|
}
|
|
}
|
|
|
|
must(st.PruneDeliveryLogDays(day2.AddDate(1, 0, 1)))
|
|
days, err = st.DeliveryLogDays()
|
|
must(err)
|
|
if len(days) != 1 || days[0].Day != "2026-10-15" {
|
|
t.Fatalf("after pruning a year and a day later: %+v, want 2026-10-15 alone", days)
|
|
}
|
|
}
|
|
|
|
// Only the counters may be added to by name.
|
|
func TestAddDeliveryLogDayRefusesAnotherColumn(t *testing.T) {
|
|
st := openTestStore(t)
|
|
if err := st.addDeliveryLogDay(time.Now(), "day", 1); err == nil {
|
|
t.Fatal("addDeliveryLogDay took the column day")
|
|
}
|
|
}
|
|
|
|
func TestCountQueuedOlderThan(t *testing.T) {
|
|
st := openTestStore(t)
|
|
for _, e := range []SendLogEntry{{QueueID: "Q1", To: "a@example.net"}, {QueueID: "Q2", To: "b@example.net"}} {
|
|
if err := st.InsertQueued(e); err != nil {
|
|
t.Fatal(err)
|
|
}
|
|
}
|
|
if _, err := st.UpdateStatus("Q2", "b@example.net", StatusSent); err != nil {
|
|
t.Fatal(err)
|
|
}
|
|
if n, err := st.CountQueuedOlderThan(time.Now().Add(time.Hour)); err != nil || n != 1 {
|
|
t.Fatalf("queued rows before an hour from now = %d, %v; want 1", n, err)
|
|
}
|
|
if n, err := st.CountQueuedOlderThan(time.Now().Add(-time.Hour)); err != nil || n != 0 {
|
|
t.Fatalf("queued rows before an hour ago = %d, %v; want 0", n, err)
|
|
}
|
|
}
|