test / test (push) Canceled after 0s
Code and config: - C-M7: a DMARC report's explicit <pct>0</pct> stays 0; only an absent pct takes RFC 7489 § 6.3's default 100 (Pct *int). - C-D1: docs/development.md now tables the Debian versions the citations were read at (postfix 3.7.11-0+deb12u1, opendkim and libopendkim11 2.11.0~beta2-8+deb12u1, libmilter1.0.1 8.17.1.9-2+deb12u2, libsasl2-2 and sasl2-bin 2.1.28+dfsg-10, supervisor 4.2.5-1, logrotate 3.21.0-1 - read off the image with dpkg-query, 2026-10-15); the e2e stand's new checkCitedPackageVersions fails when the image it built differs. - C-E2: the e2e zone's SOA serial only grows (CoreDNS v1.14.6's file plugin reloads on a grown serial, not on mtime); Corefile comment says so; TestZoneSerialGrows. - C-K8, C-K9: the e2e compose and stage comments say how --project-directory and .env resolve. - D-arch:154: postfix-config.sh's "Postfix insists" comment says what TLS_README advises and that smtpd reads the key as root. - B-G7: inflight.go's reservationTTL comment: a dropped client does give ABORT (smtpd_proto() -> mail_reset() -> milter_abort()); the TTL is for smtpd dying or the milter connection breaking. - D-guide:301: the nginx fragment's first-certificate command now reaches certbot (--entrypoint certbot, --standalone, port 80 free), and the renewal loop passes --webroot -w /var/www/certbot - a standalone certificate would otherwise renew standalone while nginx holds port 80 (certbot docs, "Renewing certificates": the issuing plugin is used "unless you specify other plugins or options", and options of a successful renewal are saved). The register's proposal missed that. Documents: every D-arch, D-guide and D-sec claim the register's Answers E found false or partly true, rewritten - by three Sonnet agents, one per document, then reviewed: two proposals were obsolete after this stage's fixes and not used (a bounce's From: line - extract_from = "smtp" now; "Origin: null" - Referrer-Policy is same-origin now); a stand observation the agent had dated from a commit is now tied to the e2e test that checks it; the SQLite writers paragraph describes _txlock=immediate; the log tailer's rotation paragraph describes the minute's grace; the guide's nginx steps were put in working order (links and modes before `up`, no reconfigure step). "Deferred" is kept for Postfix's queue in the guide too. guide.md's CRLF from the agent normalised. Stand (2026-10-15, make e2e, exit 0, the version gate and zone serial test included); go vet and go test ./... pass on the server (24 packages). Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
130 lines
4.3 KiB
Go
130 lines
4.3 KiB
Go
package milter
|
|
|
|
import (
|
|
"sync"
|
|
"time"
|
|
)
|
|
|
|
// reservationTTL bounds how long a message may stay reserved. A reservation is
|
|
// released at end-of-message or on ABORT. A client that drops the connection
|
|
// mid-transaction still produces ABORT: Postfix 3.7.11, src/smtpd/smtpd.c,
|
|
// smtpd_proto() on a lost connection runs mail_reset(), which calls
|
|
// milter_abort() (src/milter/milter8.c, milter8_abort(), SMFIC_ABORT)
|
|
// (assumptions B-G7). What produces neither is smtpd itself dying, or the
|
|
// milter connection breaking - and go-milter has no connection-close hook to
|
|
// catch that - so a reservation that never expired would count against the
|
|
// limit forever, a fail-closed drift this milter must not have. The TTL is
|
|
// generously longer than any realistic DATA transfer, so a message still
|
|
// being received is never dropped from the count.
|
|
//
|
|
// go-milter v0.4.1, server.go, type Milter: no callback for the end of a
|
|
// connection; session.go, HandleMilterCommands(), returns on SMFIC_QUIT or a
|
|
// read error without calling the backend.
|
|
const reservationTTL = 10 * time.Minute
|
|
|
|
// reservation is one message that passed the level-2 check and has not been
|
|
// written to the send log yet.
|
|
type reservation struct {
|
|
key string
|
|
at time.Time
|
|
}
|
|
|
|
// inflight counts messages that are between the limit check (MAIL FROM) and the
|
|
// send-log insert (end-of-message). The stored count alone cannot see them, so
|
|
// without this several concurrent SMTP sessions each read the same pre-insert
|
|
// count, each conclude they are under the ceiling, and the limit is overshot by
|
|
// however many were in flight. Counting reservations closes that window without
|
|
// writing placeholder rows the operator would see in the UI.
|
|
//
|
|
// One instance is shared by every session of the process, hence the mutex.
|
|
// Methods tolerate a nil receiver so a session built without one (tests) simply
|
|
// behaves as it did before.
|
|
type inflight struct {
|
|
mu sync.Mutex
|
|
m map[string]map[*reservation]struct{}
|
|
}
|
|
|
|
// tryAdmit decides whether one more message may be sent for key and, if so,
|
|
// claims its slot — both under a single lock. Counting and reserving in two
|
|
// separate critical sections would let two SMTP sessions that reach MAIL FROM
|
|
// at the same moment observe the same total and each take the last free slot,
|
|
// which is exactly the overshoot the in-flight registry exists to prevent.
|
|
//
|
|
// stored is the count the send log already holds for the limit's window and max
|
|
// is the ceiling; the caller supplies both because only it can query the store.
|
|
// The returned total is what was measured, for the refusal log line.
|
|
func (f *inflight) tryAdmit(key string, since time.Time, stored, max int64) (*reservation, int64, bool) {
|
|
if f == nil {
|
|
return nil, stored, stored < max // no in-flight accounting (tests)
|
|
}
|
|
f.mu.Lock()
|
|
defer f.mu.Unlock()
|
|
|
|
total := stored + f.countLocked(key, since)
|
|
if total >= max {
|
|
return nil, total, false
|
|
}
|
|
return f.reserveLocked(key), total, true
|
|
}
|
|
|
|
// count returns how many reservations for key were taken within the limit's
|
|
// window (at or after since), pruning any that outlived reservationTTL.
|
|
func (f *inflight) count(key string, since time.Time) int64 {
|
|
if f == nil {
|
|
return 0
|
|
}
|
|
f.mu.Lock()
|
|
defer f.mu.Unlock()
|
|
|
|
return f.countLocked(key, since)
|
|
}
|
|
|
|
// countLocked is count's body; the caller holds mu.
|
|
func (f *inflight) countLocked(key string, since time.Time) int64 {
|
|
set := f.m[key]
|
|
cutoff := time.Now().Add(-reservationTTL)
|
|
var n int64
|
|
for r := range set {
|
|
if r.at.Before(cutoff) {
|
|
delete(set, r)
|
|
continue
|
|
}
|
|
if !r.at.Before(since) {
|
|
n++
|
|
}
|
|
}
|
|
if len(set) == 0 {
|
|
delete(f.m, key)
|
|
}
|
|
return n
|
|
}
|
|
|
|
// reserveLocked is reserve's body; the caller holds mu.
|
|
func (f *inflight) reserveLocked(key string) *reservation {
|
|
if f.m == nil {
|
|
f.m = make(map[string]map[*reservation]struct{})
|
|
}
|
|
if f.m[key] == nil {
|
|
f.m[key] = make(map[*reservation]struct{})
|
|
}
|
|
r := &reservation{key: key, at: time.Now()}
|
|
f.m[key][r] = struct{}{}
|
|
return r
|
|
}
|
|
|
|
// release drops a reservation, either because the message reached the send log
|
|
// (where the stored count takes over) or because it never will.
|
|
func (f *inflight) release(r *reservation) {
|
|
if f == nil || r == nil {
|
|
return
|
|
}
|
|
f.mu.Lock()
|
|
defer f.mu.Unlock()
|
|
|
|
set := f.m[r.key]
|
|
delete(set, r)
|
|
if len(set) == 0 {
|
|
delete(f.m, r.key)
|
|
}
|
|
}
|