log tailer: expiry, Postfix's time values and refusal lines as Postfix writes them
test / test (push) Canceled after 0s
test / test (push) Canceled after 0s
Expiry (assumptions A-8). Postfix 3.7.11 logs the end of a message's queue lifetime once per message, "<id>: from=<..>, status=expired, returned to sender" (src/qmgr/qmgr_active.c, qmgr_active_done_25_generic()), with no line per recipient; the tailer waited for "to=..., status=expired", which no Postfix writes, and the sweep closed only queued rows, so such rows stayed deferred. The tailer now reads qmgr's line (ExpireMessage: each recipient's newest open row of the id becomes bounced); the sweep closes a deferred row too when Postfix no longer holds the message, and counts as missed only a final line (sent, bounced, expiry). The queue listing's '#' (forced expiry, showq_compat.c showq_message()) is read as a flag (B-PQ1). Time values (B-PQ10, B-PQ11): conv_time() ported - one number, one lower-case unit, the parameter's default unit when none (get_def_time_unit: d for the lifetimes, h for delay_warning_time), the rest ignored; postconf -h -x expands $name; bounce_queue_lifetime capped at maximal_queue_lifetime as qmgr_post_init() caps it, so LongestLifetime is the queue lifetime. Refusals (A-21, A-23, A-24, A-15): smtpd_whatsup() ends the NOQUEUE line with sasl_username=<login> on an authenticated session; the line is now matched to its row by client, login and sender, and a line without a login is no application's. The client= line's login ends at the comma. The "IPv6:" trim goes (namaddr is built from state->addr). A row recovered from cleanup's line says that line names the last recipient only. Stand (2026-10-14, make e2e, exit 0): new expired_message_is_closed - defer_transports=smtp makes the retry service defer the message, postsuper -e and postqueue -i force its expiry; mail.log has "<id>: from=<alerts@sender.e2e.test>, status=force-expired, returned to sender" and the row goes deferred -> bounced; refusals_show_postfixs_line passes with the login match. go vet and go test ./... pass on the server. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
@@ -32,6 +32,33 @@ Format follows [Keep a Changelog](https://keepachangelog.com/en/1.1.0/); version
|
||||
|
||||
### Fixed
|
||||
|
||||
- **A message Postfix gave up on no longer stays "deferred" for ever.**
|
||||
Postfix records the end of a message's queue lifetime in one line for the
|
||||
whole message, without the recipients; the panel waited for a line per
|
||||
recipient that Postfix never writes, and the reconcile sweep closed only
|
||||
`queued` rows, so such rows said `deferred` until they were pruned. The
|
||||
log tailer now reads that line and closes the message's rows as
|
||||
`bounced`; the sweep also closes a `deferred` row whose message Postfix no
|
||||
longer holds (which covers the rows left so far, and `postsuper -d`); a
|
||||
message forced to expire (`postsuper -e`, `#` in the queue listing) is
|
||||
still counted as held (audit 2026-10-12, stage 2c; assumptions A-8,
|
||||
B-PQ1).
|
||||
- **Postfix's time values are read as Postfix reads them.** A bare number
|
||||
took seconds, so `maximal_queue_lifetime = 3` was three seconds to the
|
||||
panel and three days to Postfix; `1h7m` was 67 minutes to the panel and
|
||||
one hour to Postfix. A value now takes the parameter's own default unit
|
||||
and one unit only; `$name` references are expanded; a
|
||||
`bounce_queue_lifetime` longer than `maximal_queue_lifetime` is cut to it,
|
||||
as Postfix's queue manager does (assumptions B-PQ10, B-PQ11).
|
||||
- **A refusal's line goes on the right application's row.** Postfix's line
|
||||
about a refusal at `MAIL FROM` was matched to its row by client address,
|
||||
sender and time; two applications behind one address sending as one
|
||||
sender could take each other's line. The line carries the login after
|
||||
all, and the match now uses it. A login read from smtpd's `client=` line
|
||||
no longer keeps a trailing comma when the client also gave `AUTH=` on
|
||||
`MAIL FROM`. A refusal written from `mail.log` after a restart says that
|
||||
Postfix's line names the last recipient only (assumptions A-15, A-21,
|
||||
A-23).
|
||||
- **A bounce is judged by the filter lists as the panel counts it.**
|
||||
rspamd's sender rules took a bounce's `From:` header when the envelope
|
||||
sender was empty, so a bounce could be refused or allowed by an entry the
|
||||
|
||||
Reference in New Issue
Block a user