test / test (push) Waiting to run
The panel's signer is the only one. Gone: the opendkim package and its
configuration, the syslog-relay and opendkim programs, /dev/log and
/run/opendkim, the reload by USR1 through supervisord
(internal/supervisor/supervisor.go), internal/syslogrelay, the port of
OpenDKIM's From: parser (internal/milter/mailparse.go and its probe,
harness and test/upstream scripts), OPENDKIM_SOCKET and OPENDKIM_DIR.
Keys: internal/domain/keys.go (Keys, NewKeys, DKIM_DIR=/data/dkim) keeps
the keys and writes a selector table, /data/dkim/selectors ("<name>
<selector>"), which the signer reads in place of the KeyTable - it reads
no database, as the sender check reads none. The table is written before
the signer serves (EnsureServerSigned moved there from the notifier).
Keys and table 0600, directories 0700, the panel's. The entrypoint copies
/data/opendkim/keys once, as the panel user, into /data/dkim.new renamed
when whole, and stops the start if the copy fails; /data/opendkim is left
for a rollback to 2.7.x.
Sender check: one RFC 5322 address as a mail program reads it, held
against the bindings; the 256-byte refusal and the texts naming OpenDKIM
go. Allowed() folded the domain through strings.ToLower, which makes the
Kelvin sign a "k" - the comparison with OpenDKIM's reading had hidden it;
it folds ASCII only now.
Health: two dkim-signer rows (applications, notifications) in Milter
sockets, opendkim out of the liveness set; the card no longer takes any
row with a note for the spam filter. Texts as in the design commit.
KILL stays in deploy/docker-compose.yml: measured on the test server,
root without it cannot signal a process of another uid - supervisord
stopping the panel, Postfix's master its children. The plan's "only use
was the reload" was wrong; the comment now gives the real uses.
e2e: one signature, the panel's, verified by dkimpy; the /data/dkim modes;
the OpenDKIM log and process checks, testNeverSignedForAnother and the
cited opendkim, libopendkim11 and libmilter1.0.1 go.
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
107 lines
3.5 KiB
Go
107 lines
3.5 KiB
Go
package health
|
|
|
|
import (
|
|
"errors"
|
|
"fmt"
|
|
"net"
|
|
"os"
|
|
"syscall"
|
|
"time"
|
|
)
|
|
|
|
// Socket is the state of one milter socket Postfix connects to.
|
|
type Socket struct {
|
|
Name string
|
|
// Note qualifies the name where the socket is not one of the two Postfix
|
|
// always has ("inbound"); the Health table shows it beside the name.
|
|
Note string
|
|
Path string
|
|
Present bool
|
|
Status Status
|
|
Detail string
|
|
}
|
|
|
|
// CheckSocket checks a milter socket. required distinguishes the milters:
|
|
// Postfix attaches the DKIM signer and the sender check with
|
|
// default_action=tempfail, so a missing socket stops mail leaving the server,
|
|
// while the journal-milter is attached with
|
|
// default_action=accept and fails open — mail still goes out, only the send
|
|
// log stops being written (build/postfix-config.sh smtpd_milters; Postfix
|
|
// 3.10.13, src/milter/milter8.c, milter8_comm_error(): tempfail answers "451
|
|
// 4.7.1 Service unavailable - try again later", accept answers nothing).
|
|
//
|
|
// The socket is dialled, as Postfix will dial it; a file is not a listener.
|
|
// A unix socket's file outlives the process that bound it unless that process
|
|
// unlinks it, and a connect() to it then fails with ECONNREFUSED (unix(7)), so
|
|
// a killed panel leaves a file that refuses every connection - assumptions
|
|
// A-38. The connection is closed before a byte is sent, which none of the
|
|
// panel's milters logs: go-milter v0.4.1 returns quietly on io.EOF
|
|
// (session.go, HandleMilterCommands()).
|
|
func CheckSocket(name, path string, required bool) Socket {
|
|
s := Socket{Name: name, Path: path}
|
|
if path == "" {
|
|
s.Status = StatusUnknown
|
|
s.Detail = "No socket path is configured."
|
|
return s
|
|
}
|
|
fi, err := os.Stat(path)
|
|
switch {
|
|
case err != nil:
|
|
s.Status = missingStatus(required)
|
|
s.Detail = missingDetail(name, required)
|
|
case fi.Mode()&os.ModeSocket == 0:
|
|
s.Status = missingStatus(required)
|
|
s.Detail = fmt.Sprintf("%s exists but is not a socket.", path)
|
|
default:
|
|
switch err := dialUnix(path); {
|
|
case err == nil:
|
|
s.Present = true
|
|
s.Status = StatusOK
|
|
s.Detail = "Listening"
|
|
case errors.Is(err, syscall.EACCES):
|
|
s.Status = StatusUnknown
|
|
s.Detail = fmt.Sprintf("The panel may not connect to %s, so whether anything listens is not known.", path)
|
|
case errors.Is(err, syscall.ECONNREFUSED):
|
|
s.Status = missingStatus(required)
|
|
s.Detail = fmt.Sprintf("Nothing listens on the %s socket: the program that made it has stopped. %s", name, missingCost(required))
|
|
default:
|
|
s.Status = missingStatus(required)
|
|
s.Detail = fmt.Sprintf("The %s socket does not answer. %s", name, missingCost(required))
|
|
}
|
|
}
|
|
return s
|
|
}
|
|
|
|
// unixDialTimeout bounds a dial of a local socket; a listener that is there
|
|
// answers at once, from the kernel's backlog.
|
|
const unixDialTimeout = 2 * time.Second
|
|
|
|
// dialUnix connects to the unix socket at path and closes the connection.
|
|
func dialUnix(path string) error {
|
|
c, err := net.DialTimeout("unix", path, unixDialTimeout)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
return c.Close()
|
|
}
|
|
|
|
func missingStatus(required bool) Status {
|
|
if required {
|
|
return StatusError
|
|
}
|
|
return StatusWarn
|
|
}
|
|
|
|
func missingDetail(name string, required bool) string {
|
|
return fmt.Sprintf("The %s socket is missing. %s", name, missingCost(required))
|
|
}
|
|
|
|
// missingCost is what a milter that cannot be reached costs, by its
|
|
// default_action (see CheckSocket).
|
|
func missingCost(required bool) string {
|
|
if required {
|
|
return "Postfix rejects mail with a temporary error until it is back."
|
|
}
|
|
return "Mail still goes out, but the send log is not being written."
|
|
}
|