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>
113 lines
3.6 KiB
Go
113 lines
3.6 KiB
Go
package postfix
|
|
|
|
import (
|
|
"bufio"
|
|
"context"
|
|
"encoding/json"
|
|
"fmt"
|
|
"os/exec"
|
|
"strings"
|
|
"time"
|
|
)
|
|
|
|
// QueuedMessage is one message Postfix is holding, as `postqueue -j` reports
|
|
// it: where it is, and since when.
|
|
//
|
|
// Postfix 3.7.11, src/postqueue/showq_json.c, format_json(): one object and a
|
|
// newline per message - "queue_name", "queue_id", "arrival_time" (seconds,
|
|
// %ld), "message_size", "forced_expire", "sender", "recipients" [{"address",
|
|
// "delay_reason"}]; the queue names are those of src/global/mail_queue.h that
|
|
// src/showq/showq.c, showq_service(), scans.
|
|
type QueuedMessage struct {
|
|
ID string
|
|
Queue string // "deferred", "active", "hold", "incoming", "maildrop"
|
|
Sender string
|
|
Recipients []string
|
|
Arrival time.Time
|
|
}
|
|
|
|
// queueJSONTimeout is longer than the listing for a page gets: the notifier
|
|
// asks once an hour and can wait, and a queue large enough to be slow to list
|
|
// is the one that must not go unreported.
|
|
const queueJSONTimeout = 30 * time.Second
|
|
|
|
// readQueueJSON runs `postqueue -j`. It is a var so tests can answer without a
|
|
// running Postfix, the way readRetryConf is.
|
|
var readQueueJSON = postqueueJSON
|
|
|
|
func postqueueJSON() ([]byte, error) {
|
|
ctx, cancel := context.WithTimeout(context.Background(), queueJSONTimeout)
|
|
defer cancel()
|
|
// A fixed flag and no user input, never through a shell (security.md).
|
|
cmd := exec.CommandContext(ctx, "postqueue", "-j")
|
|
out := &limitWriter{remaining: maxQueueOutput}
|
|
errOut := &limitWriter{remaining: 4096}
|
|
cmd.Stdout = out
|
|
cmd.Stderr = errOut
|
|
err := cmd.Run()
|
|
if ctx.Err() == context.DeadlineExceeded {
|
|
return nil, fmt.Errorf("postqueue -j timed out after %s", queueJSONTimeout)
|
|
}
|
|
if err != nil {
|
|
return nil, fmt.Errorf("postqueue -j: %w: %s", err, strings.TrimSpace(errOut.buf.String()))
|
|
}
|
|
if out.truncated {
|
|
// A listing cut at the size limit says nothing about the messages past
|
|
// the cut - the oldest may be among them. It is no listing.
|
|
return nil, fmt.Errorf("postqueue -j: listing is larger than %d bytes", maxQueueOutput)
|
|
}
|
|
return out.buf.Bytes(), nil
|
|
}
|
|
|
|
// QueueMessages returns the messages Postfix holds with the time each arrived,
|
|
// for the notification about mail that has waited too long. An error means the
|
|
// queue could not be listed and says nothing about any message.
|
|
func QueueMessages() ([]QueuedMessage, error) {
|
|
out, err := readQueueJSON()
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
return parseQueueJSON(out)
|
|
}
|
|
|
|
// parseQueueJSON reads `postqueue -j` output: one JSON object per line. A line
|
|
// that is not one is skipped; a line too long to read ends the listing with an
|
|
// error, since what follows it is unknown.
|
|
func parseQueueJSON(out []byte) ([]QueuedMessage, error) {
|
|
var msgs []QueuedMessage
|
|
sc := bufio.NewScanner(strings.NewReader(string(out)))
|
|
sc.Buffer(make([]byte, 0, 64*1024), 1<<20)
|
|
for sc.Scan() {
|
|
line := strings.TrimSpace(sc.Text())
|
|
if line == "" {
|
|
continue
|
|
}
|
|
var e struct {
|
|
QueueName string `json:"queue_name"`
|
|
QueueID string `json:"queue_id"`
|
|
ArrivalTime int64 `json:"arrival_time"`
|
|
Sender string `json:"sender"`
|
|
Recipients []struct {
|
|
Address string `json:"address"`
|
|
} `json:"recipients"`
|
|
}
|
|
if err := json.Unmarshal([]byte(line), &e); err != nil || e.QueueID == "" || e.ArrivalTime <= 0 {
|
|
continue
|
|
}
|
|
m := QueuedMessage{
|
|
ID: e.QueueID,
|
|
Queue: e.QueueName,
|
|
Sender: e.Sender,
|
|
Arrival: time.Unix(e.ArrivalTime, 0).UTC(),
|
|
}
|
|
for _, r := range e.Recipients {
|
|
m.Recipients = append(m.Recipients, r.Address)
|
|
}
|
|
msgs = append(msgs, m)
|
|
}
|
|
if err := sc.Err(); err != nil {
|
|
return nil, fmt.Errorf("read postqueue -j: %w", err)
|
|
}
|
|
return msgs, nil
|
|
}
|