test / test (push) Canceled after 0s
Neither review (read-only agents, Opus and Fable, over ae06d8b..815236a) has a Critical or High finding. What they found and what was done: - A stranger on port 25 could grow the table: every queue-id line of inbound mail was stored and pruned an hour or more later, his own message-id among them. The tailer now leaves out the lines of a queue id that postfix/inbound/smtpd opened, until qmgr removes the message or another listener opens one under the id; 4096 such ids are remembered. - A commit, so a disk sync, per stored line on the connection the journal milter shares, and a backlog written line by line. Lines are now written in one transaction per pass over the log, 500 at most, before the read offset is saved (InsertSendLogLines; follow() calls the keeper's flush). - The prune asked the send log once per line and ran hourly. It asks once per queue id and runs at start and with the six-hourly sweep; with port-25 mail left out there is little without a row to wait for. - The 4096-byte cut could split a character; it keeps characters whole. - security.md did not say that a backup now carries these lines, and the plan said the time window excludes a reused queue id where it only limits the chance to the row's queue lifetime. Both are corrected; the collision is recorded as an accepted risk with its trigger. - Tests that did not prove their comments: the prune is now tested with the sweep, a rejected row next to the prune, batching and the change from catching up to following, port-25 mail left out and its id reused. Left as found and written down in the plan: lines the tailer never reads (a file rotated away while the panel was down), and a message in the queue across the upgrade, which shows only its later lines. On the test server, for this tree: go vet clean, go test ./... 22 packages ok, make e2e ok. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
153 lines
5.3 KiB
Go
153 lines
5.3 KiB
Go
package store
|
|
|
|
import (
|
|
"fmt"
|
|
"time"
|
|
"unicode/utf8"
|
|
)
|
|
|
|
// SendLogLine is one mail.log line Postfix wrote under a queue id, kept so a
|
|
// message's page can show it after mail.log has rotated (architecture.md § Log
|
|
// tailer). At is the line's own time, not when the tailer read it.
|
|
type SendLogLine struct {
|
|
QueueID string
|
|
At time.Time
|
|
Line string
|
|
}
|
|
|
|
// SendLogLineMax is how many bytes of a line are kept. Postfix quotes the far
|
|
// end's reply in a delivery line, so a line is as long as someone else cared
|
|
// to make it; what a page needs of it is the beginning.
|
|
const SendLogLineMax = 4096
|
|
|
|
// sendLogLineBefore is how long before a row was written a line may be dated
|
|
// and still be the row's. The journal milter writes the row at end-of-message;
|
|
// the smtpd line that opens the queue id is written when the first recipient
|
|
// is accepted, and the message body can take its time after that.
|
|
const sendLogLineBefore = time.Hour
|
|
|
|
// cutSendLogLine cuts a line to SendLogLineMax bytes, and not through the
|
|
// middle of a character.
|
|
func cutSendLogLine(line string) string {
|
|
if len(line) <= SendLogLineMax {
|
|
return line
|
|
}
|
|
end := SendLogLineMax
|
|
for end > 0 && !utf8.RuneStart(line[end]) {
|
|
end--
|
|
}
|
|
return line[:end]
|
|
}
|
|
|
|
// InsertSendLogLines stores lines in one transaction and returns how many it
|
|
// wrote. The tailer calls it with what it read in one pass over the log,
|
|
// whether or not send-log rows exist for the queue ids yet: a commit per line
|
|
// would be a disk sync per line, on the one connection the journal milter
|
|
// writes through.
|
|
//
|
|
// With once set, a line is written only if the same line is not there already
|
|
// under its queue id. That is for the lines the tailer reads again after an
|
|
// unclean stop; a line carries its time and its process id, so two that are
|
|
// equal are one line read twice.
|
|
func (s *Store) InsertSendLogLines(lines []SendLogLine, once bool) (int, error) {
|
|
if len(lines) == 0 {
|
|
return 0, nil
|
|
}
|
|
query := `INSERT INTO send_log_lines (queue_id, logged_at, line) VALUES (?1, ?2, ?3)`
|
|
if once {
|
|
query = `INSERT INTO send_log_lines (queue_id, logged_at, line)
|
|
SELECT ?1, ?2, ?3
|
|
WHERE NOT EXISTS (SELECT 1 FROM send_log_lines WHERE queue_id = ?1 AND line = ?3)`
|
|
}
|
|
tx, err := s.db.Begin()
|
|
if err != nil {
|
|
return 0, fmt.Errorf("insert send_log_lines: %w", err)
|
|
}
|
|
defer tx.Rollback()
|
|
stmt, err := tx.Prepare(query)
|
|
if err != nil {
|
|
return 0, fmt.Errorf("insert send_log_lines: %w", err)
|
|
}
|
|
defer stmt.Close()
|
|
wrote := 0
|
|
for _, l := range lines {
|
|
res, err := stmt.Exec(l.QueueID, l.At.UTC().Format(time.RFC3339), cutSendLogLine(l.Line))
|
|
if err != nil {
|
|
return 0, fmt.Errorf("insert send_log_lines: %w", err)
|
|
}
|
|
n, _ := res.RowsAffected()
|
|
wrote += int(n)
|
|
}
|
|
if err := tx.Commit(); err != nil {
|
|
return 0, fmt.Errorf("insert send_log_lines: %w", err)
|
|
}
|
|
return wrote, nil
|
|
}
|
|
|
|
// SendLogLines returns the stored lines of the message a send-log row is
|
|
// about, oldest first and at most n of them - the latest n when there are
|
|
// more, since what a message did last is what its page is opened for.
|
|
//
|
|
// Postfix reuses a queue id once the message has left the queue, and a row
|
|
// lives far longer than that, so the id alone does not say whose a line is.
|
|
// A line is the row's when it is dated from shortly before the row was written
|
|
// to lifetime after it; lifetime is how long Postfix may keep working on a
|
|
// message, with a margin, and the caller's to state (postfix.RetryPolicy).
|
|
func (s *Store) SendLogLines(row SendLogRow, lifetime time.Duration, n int) ([]SendLogLine, error) {
|
|
if row.QueueID == "" || n <= 0 {
|
|
return nil, nil
|
|
}
|
|
rows, err := s.db.Query(
|
|
`SELECT logged_at, line FROM (
|
|
SELECT id, logged_at, line FROM send_log_lines
|
|
WHERE queue_id = ? AND logged_at >= ? AND logged_at <= ?
|
|
ORDER BY id DESC LIMIT ?)
|
|
ORDER BY id`,
|
|
row.QueueID,
|
|
row.CreatedAt.Add(-sendLogLineBefore).UTC().Format(time.RFC3339),
|
|
row.CreatedAt.Add(lifetime).UTC().Format(time.RFC3339),
|
|
n,
|
|
)
|
|
if err != nil {
|
|
return nil, fmt.Errorf("query send_log_lines: %w", err)
|
|
}
|
|
defer rows.Close()
|
|
|
|
var out []SendLogLine
|
|
for rows.Next() {
|
|
var at string
|
|
l := SendLogLine{QueueID: row.QueueID}
|
|
if err := rows.Scan(&at, &l.Line); err != nil {
|
|
return nil, fmt.Errorf("scan send_log_lines row: %w", err)
|
|
}
|
|
l.At, _ = time.Parse(time.RFC3339, at)
|
|
out = append(out, l)
|
|
}
|
|
return out, rows.Err()
|
|
}
|
|
|
|
// PruneSendLogLines deletes the lines dated before cutoff whose queue id has
|
|
// no send-log row, and returns how many went. That one rule is the whole of
|
|
// the table's retention: it removes the lines of rows the send-log sweep has
|
|
// deleted, and the lines of messages that never had a row - the bounces
|
|
// Postfix generates. cutoff leaves alone the lines of a message still being
|
|
// received, whose row the journal milter has yet to write.
|
|
//
|
|
// The send log is asked once per queue id, not once per line: the ids are read
|
|
// off the index, and a message is several lines.
|
|
func (s *Store) PruneSendLogLines(cutoff time.Time) (int64, error) {
|
|
res, err := s.db.Exec(
|
|
`DELETE FROM send_log_lines
|
|
WHERE logged_at < ?
|
|
AND queue_id IN (
|
|
SELECT q.queue_id FROM (SELECT DISTINCT queue_id FROM send_log_lines) AS q
|
|
WHERE NOT EXISTS (SELECT 1 FROM send_log WHERE send_log.queue_id = q.queue_id))`,
|
|
cutoff.UTC().Format(time.RFC3339),
|
|
)
|
|
if err != nil {
|
|
return 0, fmt.Errorf("prune send_log_lines: %w", err)
|
|
}
|
|
n, _ := res.RowsAffected()
|
|
return n, nil
|
|
}
|