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>
This commit is contained in:
+15
-11
@@ -14,7 +14,7 @@ import (
|
||||
// excluded: autostart=false, so it rests STOPPED until its first run and
|
||||
// EXITED after it (supervisor 4.2.5, supervisor/process.py,
|
||||
// Subprocess.finish(); assumptions C-V10).
|
||||
var wantRunning = []string{"syslog-relay", "opendkim", "panel", "postfix", "cert-reload", "logrotate"}
|
||||
var wantRunning = []string{"panel", "postfix", "cert-reload", "logrotate"}
|
||||
|
||||
// checkSupervisorProcesses shells into the container directly (not through the
|
||||
// panel's /overview page) so it works before an administrator account even
|
||||
@@ -130,16 +130,20 @@ func checkCitedPackageVersions(s *stack) error {
|
||||
return nil
|
||||
}
|
||||
|
||||
// checkOpenDKIMLogs waits for OpenDKIM's start line in the container's log:
|
||||
// OpenDKIM logs through syslog(3) only, and /dev/log is the syslog-relay
|
||||
// program's (audit 2026-10-12, L30). OpenDKIM 2.11.0~beta2,
|
||||
// opendkim/opendkim.c: syslog(LOG_INFO, "%s v%s starting%s%s%s",
|
||||
// DKIMF_PRODUCT, ...), DKIMF_PRODUCT "OpenDKIM Filter" (opendkim.h).
|
||||
func checkOpenDKIMLogs(s *stack) error {
|
||||
return waitFor("OpenDKIM's start line in the container log", 20*time.Second, 500*time.Millisecond, func() (bool, error) {
|
||||
out := s.logs("selfpost")
|
||||
return strings.Contains(out, "opendkim[") && strings.Contains(out, "OpenDKIM Filter v"), fmt.Errorf("no OpenDKIM line in the log")
|
||||
})
|
||||
// checkDKIMTree: the keys and the selector table are the panel's alone,
|
||||
// directories 0700 and files 0600 (build/entrypoint.sh; internal/domain,
|
||||
// Keys) - no other program reads them since OpenDKIM left - and the table
|
||||
// is there, written before the signer serves (cmd/panel/signer.go).
|
||||
func checkDKIMTree(s *stack) error {
|
||||
out, err := s.execIn("selfpost", "sh", "-c",
|
||||
`test -f /data/dkim/selectors && find /data/dkim ! \( -user panel -group panel \( -type d -perm 0700 -o -type f -perm 0600 \) \)`)
|
||||
if err != nil {
|
||||
return fmt.Errorf("the DKIM tree: %v\n%s", err, out)
|
||||
}
|
||||
if strings.TrimSpace(out) != "" {
|
||||
return fmt.Errorf("not the panel's alone under /data/dkim:\n%s", out)
|
||||
}
|
||||
return nil
|
||||
}
|
||||
|
||||
// checkPostfixHardening reads back what postfix-config.sh sets against
|
||||
|
||||
Reference in New Issue
Block a user