- The e2e's numeric-settings test ran a container that passed every gate
and never ended: the good values are checked beside a bad one after
them; each run is named, bounded to a minute and removed.
- The gates refuse a value under the parameter's minimum (a zero window
kills anvil, a zero milter timeout smtpd) and one past an int, in
seconds for a time value (src/global/conv_time.c, src/anvil/anvil.c).
- OpenDKIM waits, five seconds at most, for the relay's socket.
- The relay marks its lines `syslog: `, writes control characters out,
reads into a queue at once and drops past 200 lines a second, saying
how many (security F1, F2; a stuck relay would hold OpenDKIM in
syslog(3)).
- smtp_tls_mandatory_protocols >=TLSv1.2 too.
- extract-cert.sh keeps the old files' group and sets its trap before
mktemp.
- crashexit spares cert-reload; architecture.md "four times running" and
what else exits the container; security.md the restart after five panel
exits and the /dev/log socket.
- Measured against the technical review: smtpd has the selfpost group
(Groups 104 998), so it did reach the supervisor socket before this
stage.
Accepted, reasons in the plan: the logrotate state file in the postfix
user's directory, envdoc_test's reading of `${VAR:-}` only, crashexit's
window pruning untested.
Tested on the test server: go vet + go test of 27 packages, make e2e (all
pass, 592 s) on this tree.
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
147 lines
4.4 KiB
Go
147 lines
4.4 KiB
Go
// Package syslogrelay passes what programs in the container send to syslog(3)
|
|
// on to standard output, where supervisord takes it into the container's log.
|
|
//
|
|
// OpenDKIM logs through syslog(3) and nothing else (OpenDKIM 2.11.0~beta2,
|
|
// opendkim/opendkim.conf.5.in: Syslog, SyslogFacility and SyslogName are the
|
|
// only logging options; opendkim/opendkim.c calls openlog() and syslog()).
|
|
// syslog(3) sends each message as a datagram to /dev/log, and in the container
|
|
// nothing listened there: OpenDKIM's errors - a key it cannot read, a table it
|
|
// cannot open - went nowhere (audit 2026-10-12, L30). Postfix is not among the
|
|
// senders: it logs through its own postlogd (build/postfix-config.sh).
|
|
package syslogrelay
|
|
|
|
import (
|
|
"bytes"
|
|
"fmt"
|
|
"io"
|
|
"net"
|
|
"os"
|
|
"regexp"
|
|
"strconv"
|
|
"time"
|
|
)
|
|
|
|
// stamp is the BSD syslog timestamp that follows the priority, "Oct 15
|
|
// 09:00:00 " (RFC 3164 § 4.1.2: "Mmm dd hh:mm:ss", the day padded with a
|
|
// space). The container's log has times of its own.
|
|
var stamp = regexp.MustCompile(`^[A-Z][a-z]{2} [ 0-9][0-9] [0-9]{2}:[0-9]{2}:[0-9]{2} `)
|
|
|
|
// Prefix begins every relayed line. The socket takes datagrams from any user
|
|
// in the container, so a relayed line must not pass for one of the panel's
|
|
// or supervisord's own (security review of audit stage 5).
|
|
const Prefix = "syslog: "
|
|
|
|
// Line turns one datagram into the line written out: the priority and the
|
|
// timestamp taken off, trailing newlines too; what remains is "ident[pid]:
|
|
// message". A severity of error or worse (RFC 3164 § 4.1.1: the priority is
|
|
// facility*8 + severity, and 0-3 are emergency to error) is said in front. A
|
|
// control character within it - a newline that would start a line of its own
|
|
// - is written as \xNN.
|
|
func Line(datagram []byte) string {
|
|
b := bytes.TrimRight(datagram, "\r\n\x00")
|
|
severity := -1
|
|
if len(b) > 2 && b[0] == '<' {
|
|
if end := bytes.IndexByte(b, '>'); end > 1 && end <= 4 {
|
|
pri := 0
|
|
ok := true
|
|
for _, c := range b[1:end] {
|
|
if c < '0' || c > '9' {
|
|
ok = false
|
|
break
|
|
}
|
|
pri = pri*10 + int(c-'0')
|
|
}
|
|
if ok {
|
|
severity = pri % 8
|
|
b = b[end+1:]
|
|
}
|
|
}
|
|
}
|
|
if loc := stamp.FindIndex(b); loc != nil {
|
|
b = b[loc[1]:]
|
|
}
|
|
var out bytes.Buffer
|
|
out.WriteString(Prefix)
|
|
if severity >= 0 && severity <= 3 {
|
|
out.WriteString("error: ")
|
|
}
|
|
for _, c := range b {
|
|
if c < 0x20 || c == 0x7f {
|
|
fmt.Fprintf(&out, `\x%02x`, c)
|
|
continue
|
|
}
|
|
out.WriteByte(c)
|
|
}
|
|
return out.String()
|
|
}
|
|
|
|
// The relay keeps reading whatever it can write: a datagram is read at once
|
|
// and queued, and dropped when the queue is full or more than ratePerSecond
|
|
// came in the last second. A sender to a unix datagram socket waits while the
|
|
// receiver's queue is full, so a relay that stopped reading would have held
|
|
// OpenDKIM in syslog(3) - with mail waiting on it (review of audit stage 5) -
|
|
// and a flood would have filled the container's log.
|
|
const (
|
|
queueLen = 1024
|
|
ratePerSecond = 200
|
|
)
|
|
|
|
// Run listens on a datagram socket at path, which anyone in the container may
|
|
// write to, and writes each message to w as a line until the socket fails.
|
|
// /dev/log is a link to path (build/entrypoint.sh). What it drops it says,
|
|
// once a second at most.
|
|
func Run(path string, w io.Writer) error {
|
|
_ = os.Remove(path)
|
|
conn, err := net.ListenUnixgram("unixgram", &net.UnixAddr{Name: path, Net: "unixgram"})
|
|
if err != nil {
|
|
return fmt.Errorf("syslog relay: listen on %s: %w", path, err)
|
|
}
|
|
defer conn.Close()
|
|
// OpenDKIM runs as its own user; the socket is the container's local log,
|
|
// as /dev/log is on a host.
|
|
if err := os.Chmod(path, 0o666); err != nil {
|
|
return fmt.Errorf("syslog relay: %w", err)
|
|
}
|
|
|
|
lines := make(chan string, queueLen)
|
|
go func() {
|
|
for l := range lines {
|
|
fmt.Fprintln(w, l)
|
|
}
|
|
}()
|
|
defer close(lines)
|
|
|
|
buf := make([]byte, 64<<10)
|
|
var second time.Time
|
|
inSecond, dropped := 0, 0
|
|
for {
|
|
n, _, err := conn.ReadFromUnix(buf)
|
|
if err != nil {
|
|
return fmt.Errorf("syslog relay: read: %w", err)
|
|
}
|
|
now := time.Now()
|
|
if now.Sub(second) >= time.Second {
|
|
if dropped > 0 {
|
|
select {
|
|
case lines <- Prefix + "relay: dropped " + strconv.Itoa(dropped) + " lines - more than " + strconv.Itoa(ratePerSecond) + " a second, or the log was not taking them":
|
|
default:
|
|
}
|
|
}
|
|
second, inSecond, dropped = now, 0, 0
|
|
}
|
|
inSecond++
|
|
if n == 0 {
|
|
continue
|
|
}
|
|
if inSecond > ratePerSecond {
|
|
dropped++
|
|
continue
|
|
}
|
|
select {
|
|
case lines <- Line(buf[:n]):
|
|
default:
|
|
dropped++
|
|
}
|
|
}
|
|
}
|