1f548dfc7a
Move the delivery log from the ephemeral /var/log to /data/log/mail.log so the lines that resolve a queued send-log row survive a container recreate. postlogd writes it as postfix, the panel reads it through the selfpost group (dir 2750, file 0640, normalised every start); backups exclude log/. Close the residual gap with a queue sweep: rows queued for over two minutes whose id postqueue -p no longer lists are marked bounced. The sweep waits until the tailer has read the log to its end and does nothing when the queue cannot be listed, so a message in flight is never touched. Co-Authored-By: Claude Opus 5 <noreply@anthropic.com> Co-authored-by: Cursor <cursoragent@cursor.com>
194 lines
5.7 KiB
Go
194 lines
5.7 KiB
Go
package store
|
|
|
|
import (
|
|
"testing"
|
|
"time"
|
|
)
|
|
|
|
// readSendLog returns every send_log row ordered by id. The monitoring UI has
|
|
// no equivalent read query, so tests read the table directly.
|
|
type sendLogRow struct {
|
|
QueueID string
|
|
Domain string
|
|
AppLogin string
|
|
From string
|
|
To string
|
|
Subject string
|
|
Status string
|
|
}
|
|
|
|
func readSendLog(t *testing.T, s *Store) []sendLogRow {
|
|
t.Helper()
|
|
rows, err := s.db.Query(
|
|
`SELECT queue_id, domain, app_login, from_addr, to_addr, subject, status
|
|
FROM send_log ORDER BY id`)
|
|
if err != nil {
|
|
t.Fatalf("query send_log: %v", err)
|
|
}
|
|
defer rows.Close()
|
|
var out []sendLogRow
|
|
for rows.Next() {
|
|
var r sendLogRow
|
|
if err := rows.Scan(&r.QueueID, &r.Domain, &r.AppLogin, &r.From, &r.To, &r.Subject, &r.Status); err != nil {
|
|
t.Fatalf("scan: %v", err)
|
|
}
|
|
out = append(out, r)
|
|
}
|
|
return out
|
|
}
|
|
|
|
func TestInsertQueuedAndUpdateStatus(t *testing.T) {
|
|
st := openTestStore(t)
|
|
|
|
// Two recipients on the same queue-id → two independent rows (architecture.md
|
|
// § Persistence).
|
|
for _, to := range []string{"a@example.net", "b@example.net"} {
|
|
if err := st.InsertQueued(SendLogEntry{
|
|
QueueID: "ABC123",
|
|
Domain: "example.com",
|
|
AppLogin: "app1",
|
|
From: "noreply@example.com",
|
|
To: to,
|
|
Subject: "Hello",
|
|
}); err != nil {
|
|
t.Fatalf("InsertQueued: %v", err)
|
|
}
|
|
}
|
|
|
|
rows := readSendLog(t, st)
|
|
if len(rows) != 2 {
|
|
t.Fatalf("want 2 rows, got %d: %+v", len(rows), rows)
|
|
}
|
|
for _, r := range rows {
|
|
if r.Status != StatusQueued {
|
|
t.Fatalf("new row should be queued, got %q", r.Status)
|
|
}
|
|
}
|
|
|
|
// One recipient goes to sent; the other stays queued.
|
|
n, err := st.UpdateStatus("ABC123", "a@example.net", StatusSent)
|
|
if err != nil {
|
|
t.Fatalf("UpdateStatus: %v", err)
|
|
}
|
|
if n != 1 {
|
|
t.Fatalf("want 1 row updated, got %d", n)
|
|
}
|
|
|
|
rows = readSendLog(t, st)
|
|
if rows[0].Status != StatusSent || rows[1].Status != StatusQueued {
|
|
t.Fatalf("unexpected statuses: %+v", rows)
|
|
}
|
|
}
|
|
|
|
func TestUpdateStatusRecipientCaseInsensitive(t *testing.T) {
|
|
st := openTestStore(t)
|
|
if err := st.InsertQueued(SendLogEntry{QueueID: "Q1", To: "User@Example.NET"}); err != nil {
|
|
t.Fatalf("InsertQueued: %v", err)
|
|
}
|
|
// mail.log may report a differently-cased recipient; matching must still hit.
|
|
n, err := st.UpdateStatus("Q1", "user@example.net", StatusBounced)
|
|
if err != nil {
|
|
t.Fatalf("UpdateStatus: %v", err)
|
|
}
|
|
if n != 1 {
|
|
t.Fatalf("case-insensitive match failed, updated %d rows", n)
|
|
}
|
|
}
|
|
|
|
// The reconcile sweep asks for the rows old enough that Postfix should have
|
|
// reported on them by now. A message accepted moments ago is simply in flight,
|
|
// and one the milter refused never reached the queue at all, so neither is the
|
|
// sweep's business.
|
|
func TestListQueuedOlderThan(t *testing.T) {
|
|
st := openTestStore(t)
|
|
|
|
for _, e := range []SendLogEntry{
|
|
{QueueID: "OLD1", To: "stale@example.net"},
|
|
{QueueID: "NEW1", To: "fresh@example.net"},
|
|
} {
|
|
if err := st.InsertQueued(e); err != nil {
|
|
t.Fatalf("InsertQueued: %v", err)
|
|
}
|
|
}
|
|
// A row the milter refused: no queue-id, and a status the sweep never sees.
|
|
if err := st.InsertRejected(SendLogEntry{To: "refused@example.net"}); err != nil {
|
|
t.Fatalf("InsertRejected: %v", err)
|
|
}
|
|
// A row that has already been delivered, aged the same as the stale one.
|
|
if err := st.InsertQueued(SendLogEntry{QueueID: "DONE1", To: "done@example.net"}); err != nil {
|
|
t.Fatalf("InsertQueued: %v", err)
|
|
}
|
|
if _, err := st.UpdateStatus("DONE1", "done@example.net", StatusSent); err != nil {
|
|
t.Fatalf("UpdateStatus: %v", err)
|
|
}
|
|
|
|
cutoff := time.Now().UTC().Add(-2 * time.Minute)
|
|
backdate(t, st, "OLD1", cutoff.Add(-time.Hour))
|
|
backdate(t, st, "DONE1", cutoff.Add(-time.Hour))
|
|
|
|
got, err := st.ListQueuedOlderThan(cutoff)
|
|
if err != nil {
|
|
t.Fatalf("ListQueuedOlderThan: %v", err)
|
|
}
|
|
if len(got) != 1 || got[0] != (QueuedDelivery{QueueID: "OLD1", To: "stale@example.net"}) {
|
|
t.Fatalf("got %+v, want only the stale queued row", got)
|
|
}
|
|
}
|
|
|
|
// backdate rewrites a row's acceptance time, so a test can age it past a cutoff
|
|
// without waiting.
|
|
func backdate(t *testing.T, s *Store, queueID string, at time.Time) {
|
|
t.Helper()
|
|
if _, err := s.db.Exec(
|
|
`UPDATE send_log SET created_at = ? WHERE queue_id = ?`,
|
|
at.UTC().Format(time.RFC3339), queueID,
|
|
); err != nil {
|
|
t.Fatalf("backdate %s: %v", queueID, err)
|
|
}
|
|
}
|
|
|
|
func TestUpdateStatusNoMatch(t *testing.T) {
|
|
st := openTestStore(t)
|
|
if err := st.InsertQueued(SendLogEntry{QueueID: "Q1", To: "a@example.net"}); err != nil {
|
|
t.Fatalf("InsertQueued: %v", err)
|
|
}
|
|
// A queue-id/recipient the milter never recorded must be a no-op, not an error.
|
|
n, err := st.UpdateStatus("Q1", "unknown@example.net", StatusSent)
|
|
if err != nil {
|
|
t.Fatalf("UpdateStatus: %v", err)
|
|
}
|
|
if n != 0 {
|
|
t.Fatalf("want 0 rows updated, got %d", n)
|
|
}
|
|
}
|
|
|
|
func TestDeleteSendLogBefore(t *testing.T) {
|
|
st := openTestStore(t)
|
|
|
|
// Insert one row, then backdate it beyond the retention window by rewriting
|
|
// created_at directly (InsertQueued always stamps "now").
|
|
if err := st.InsertQueued(SendLogEntry{QueueID: "OLD", To: "a@example.net"}); err != nil {
|
|
t.Fatalf("InsertQueued: %v", err)
|
|
}
|
|
old := time.Now().UTC().AddDate(0, 0, -100).Format(time.RFC3339)
|
|
if _, err := st.db.Exec(`UPDATE send_log SET created_at = ? WHERE queue_id = 'OLD'`, old); err != nil {
|
|
t.Fatalf("backdate: %v", err)
|
|
}
|
|
if err := st.InsertQueued(SendLogEntry{QueueID: "NEW", To: "b@example.net"}); err != nil {
|
|
t.Fatalf("InsertQueued: %v", err)
|
|
}
|
|
|
|
cutoff := time.Now().UTC().AddDate(0, 0, -90)
|
|
n, err := st.DeleteSendLogBefore(cutoff)
|
|
if err != nil {
|
|
t.Fatalf("DeleteSendLogBefore: %v", err)
|
|
}
|
|
if n != 1 {
|
|
t.Fatalf("want 1 row pruned, got %d", n)
|
|
}
|
|
rows := readSendLog(t, st)
|
|
if len(rows) != 1 || rows[0].QueueID != "NEW" {
|
|
t.Fatalf("retention kept wrong rows: %+v", rows)
|
|
}
|
|
}
|