mixandClaude Opus 5.5
faa3c11ae7
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>
61 lines
2.4 KiB
Go
61 lines
2.4 KiB
Go
package main
|
|
|
|
import (
|
|
"context"
|
|
"log"
|
|
"path/filepath"
|
|
"strings"
|
|
|
|
"github.com/mixeme/selfpost/internal/milter"
|
|
"github.com/mixeme/selfpost/internal/postfix"
|
|
"github.com/mixeme/selfpost/internal/store"
|
|
)
|
|
|
|
// serveSigner runs the DKIM signer (internal/milter/sign.go) on its two
|
|
// sockets: signSocket for what applications send on 465/587, signed with the
|
|
// key of the domain the login belongs to - the sender_login_maps Postfix and
|
|
// the sender check read (Bindings.DomainOf); signLocalSocket for what the
|
|
// panel itself submits with sendmail(1), signed with the key of the server's
|
|
// name. Postfix attaches both strictly (default_action=tempfail,
|
|
// build/postfix-config.sh), so while this role is not serving, mail waits.
|
|
//
|
|
// The keys and selectors come from the key tree and the selector table under
|
|
// dkimDir (internal/domain, Keys). Before it serves, the table is made to
|
|
// hold the server's own name - and written at all on the first start of
|
|
// 2.8.0, whose table replaced OpenDKIM's: Postfix waits for these sockets
|
|
// (build/postfix-wrapper.sh), so no message meets the table before it.
|
|
func serveSigner(ctx context.Context, cfg config, st *store.Store) error {
|
|
if rebuilt, err := newMailStack(cfg, st).Domains.EnsureServerSigned(); err != nil {
|
|
// Mail waits: what the signer cannot find a key for it defers.
|
|
log.Printf("dkim-signer: the selector table: %v", err)
|
|
} else if rebuilt {
|
|
log.Printf("dkim-signer: the selector table was rewritten from the registry")
|
|
}
|
|
keys := milter.NewSignKeys(filepath.Join(cfg.dkimDir, "selectors"), filepath.Join(cfg.dkimDir, "keys"))
|
|
bind := milter.NewBindings(postfix.New(cfg.postfixDir).SenderLoginMapsPath())
|
|
server := strings.ToLower(cfg.hostname)
|
|
|
|
apps, err := listenMilter(cfg.signSocket)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
local, err := listenMilter(cfg.signLocalSocket)
|
|
if err != nil {
|
|
apps.Close()
|
|
return err
|
|
}
|
|
log.Printf("dkim-signer listening on %s (applications) and %s (the panel's own mail, as %s)", cfg.signSocket, cfg.signLocalSocket, server)
|
|
|
|
errc := make(chan error, 2)
|
|
go func() { errc <- milter.ServeSign(ctx, apps, keys, bind.DomainOf) }()
|
|
go func() {
|
|
errc <- milter.ServeSign(ctx, local, keys, func(string) string { return server })
|
|
}()
|
|
// The first to stop decides: an error stops the panel (run()), and on a
|
|
// cancelled ctx both return nil.
|
|
if err := <-errc; err != nil {
|
|
return err
|
|
}
|
|
return <-errc
|
|
}
|