mixandClaude Opus 5.5
b113e72c71
Comments only, no behaviour changed. go-milter v0.4.1 (session.go: one session per connection, replaced after a non-continue reply; macros per stage), Postfix 3.7.11 (milter8.c, smtpd_check.c reject_auth_sender_login_mismatch(), mail_addr_find.c, showq_compat.c, mail_conf_time.c, mail_params.h), Cyrus SASL 2.1.28 (saslpasswd.c, plugins/sasldb.c: deleting a missing login is not an error), OpenDKIM 2.11.0~beta2 (opendkim-db.c, opendkim-genkey), Berkeley DB 5.3 db_dump, rspamd 3.11.0. Comments that claimed what the source denies are corrected (sasldb keeps the password as given, not hashed; an embedded newline is kept, not truncated; rspamd sorts symbols by absolute weight); fixtures say seen or composed. The sender check's From: parsing gets no citations: it is replaced by the port of OpenDKIM's dkim_mail_parse next. Contradictions left for their own commits: B-G5 cleanAddress, B-PS1 first key wins, B-PQ1 the forced-expire flag, B-PQ10/PQ11 Postfix's time units. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
83 lines
2.5 KiB
Go
83 lines
2.5 KiB
Go
package postfix
|
|
|
|
import (
|
|
"errors"
|
|
"testing"
|
|
"time"
|
|
)
|
|
|
|
// The postconf values in these tests are composed by hand: values main.cf
|
|
// could hold. Stock Postfix 3.7.11 prints "0h" for delay_warning_time
|
|
// (src/global/mail_params.h, DEF_DELAY_WARN_TIME), not "0".
|
|
func TestLoadRetryPolicyUsesPostconfValues(t *testing.T) {
|
|
old := readRetryConf
|
|
readRetryConf = func() ([]string, error) {
|
|
return []string{"300s", "300s", "4000s", "2d", "5d", "0"}, nil
|
|
}
|
|
t.Cleanup(func() { readRetryConf = old })
|
|
|
|
p := LoadRetryPolicy()
|
|
if p.FromDefaults {
|
|
t.Fatal("FromDefaults = true, want live postconf values")
|
|
}
|
|
if p.MinimalBackoff != 300*time.Second {
|
|
t.Errorf("MinimalBackoff = %v, want 300s", p.MinimalBackoff)
|
|
}
|
|
if p.MaximalBackoff != 4000*time.Second {
|
|
t.Errorf("MaximalBackoff = %v, want 4000s", p.MaximalBackoff)
|
|
}
|
|
if p.MaximalQueueLifetime != 2*24*time.Hour {
|
|
t.Errorf("MaximalQueueLifetime = %v, want 2d", p.MaximalQueueLifetime)
|
|
}
|
|
if p.BounceQueueLifetime != 5*24*time.Hour {
|
|
t.Errorf("BounceQueueLifetime = %v, want 5d", p.BounceQueueLifetime)
|
|
}
|
|
if p.DelayWarningTime != 0 {
|
|
t.Errorf("DelayWarningTime = %v, want 0", p.DelayWarningTime)
|
|
}
|
|
}
|
|
|
|
func TestLoadRetryPolicyFallsBackWhenPostconfFails(t *testing.T) {
|
|
old := readRetryConf
|
|
readRetryConf = func() ([]string, error) {
|
|
return nil, errors.New("exec: not found")
|
|
}
|
|
t.Cleanup(func() { readRetryConf = old })
|
|
|
|
p := LoadRetryPolicy()
|
|
want := DefaultRetryPolicy()
|
|
if !p.FromDefaults {
|
|
t.Error("FromDefaults = false, want true when postconf fails")
|
|
}
|
|
if p.QueueRunDelay != want.QueueRunDelay || p.MinimalBackoff != want.MinimalBackoff ||
|
|
p.MaximalBackoff != want.MaximalBackoff || p.MaximalQueueLifetime != want.MaximalQueueLifetime {
|
|
t.Errorf("fallback = %+v, want compiled-in defaults %+v", p, want)
|
|
}
|
|
}
|
|
|
|
func TestLoadRetryPolicyFallsBackOnUnparseableValues(t *testing.T) {
|
|
old := readRetryConf
|
|
readRetryConf = func() ([]string, error) {
|
|
return []string{"300s", "nope", "4000s", "5d", "5d", "0"}, nil
|
|
}
|
|
t.Cleanup(func() { readRetryConf = old })
|
|
|
|
p := LoadRetryPolicy()
|
|
if !p.FromDefaults {
|
|
t.Error("FromDefaults = false, want true when a value cannot be parsed")
|
|
}
|
|
}
|
|
|
|
func TestParseRetryPolicyStock(t *testing.T) {
|
|
p, err := parseRetryPolicy([]string{"300s", "300s", "4000s", "5d", "5d", "0"})
|
|
if err != nil {
|
|
t.Fatalf("parseRetryPolicy: %v", err)
|
|
}
|
|
if p.FromDefaults {
|
|
t.Error("parsed policy should not be marked FromDefaults")
|
|
}
|
|
if p.QueueRunDelay != 300*time.Second || p.MaximalQueueLifetime != 5*24*time.Hour {
|
|
t.Errorf("parsed = %+v", p)
|
|
}
|
|
}
|