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>
29 lines
1.1 KiB
Go
29 lines
1.1 KiB
Go
// Package configsafe holds the defence-in-depth check that every generated
|
|
// configuration file shares: a value about to be written into a table line must
|
|
// be non-empty and must not carry a character that could end the field, end the
|
|
// line, or otherwise change what the file means (security.md).
|
|
//
|
|
// The forbidden set stays with the caller rather than living here, because what
|
|
// breaks a line differs per format — a comma separates values in a Postfix map,
|
|
// a slash would lead a key's path out of its directory — and the set belongs next to
|
|
// the writer it protects, where a reviewer of that writer can see it.
|
|
package configsafe
|
|
|
|
import (
|
|
"fmt"
|
|
"strings"
|
|
)
|
|
|
|
// Token reports whether value is safe to interpolate into a config line. what
|
|
// names the field for the error message ("domain", "login", …) and forbidden
|
|
// lists the characters the format cannot carry.
|
|
func Token(what, value, forbidden string) error {
|
|
if value == "" {
|
|
return fmt.Errorf("empty %s", what)
|
|
}
|
|
if strings.ContainsAny(value, forbidden) {
|
|
return fmt.Errorf("unsafe character in %s %q", what, value)
|
|
}
|
|
return nil
|
|
}
|