test / test (push) Canceled after 0s
Neither review (read-only agents, Opus and Fable, over 972a9f8..400aa76) has a Critical finding. Both found the same serious one, and more: - The notification about refused mail was built on what a rejected row says of itself. Its domain is the one in MAIL FROM, which the client typed and Postfix has not yet held against the login when the milter refuses: an application over its limit could have had the panel write a message per made-up domain, to another tenant's users among others. And the same status is written when an application is refused for its client address, which is no limit. Refusals are now counted by the domain the login is registered under, only for logins that exist and only while a limit is set on the login or its domain; one subject per sending domain. They are read through a partial index of their own (migration 0005): the query walked the whole send log every minute. - Account and user e-mails were checked with the DMARC report validator, which refuses Gmail and the like - the owner's own kind of address. A new validate.AccountEmail accepts them and refuses a local part beginning "-". - "Said" now means sent: what arises while nobody can be told, or while Postfix does not take the message, is told at a later check. Its ending with nobody left to tell is simply over. - Two DNS checks must be 45 minutes apart as well as two: the last check before a restart and the first after it were minutes apart. - The notifier's own mail waiting in the queue, and its bounce coming back to postmaster@ this server, are not the queue's subject. A listing cut at its size limit or with a line too long to read is no listing; postqueue -j gets 30 seconds. - The tables must name the selector the panel shows, not only have the line. - An a/mx lookup that did not answer inside the SPF check made the record "not authorising"; it is "cannot tell" now, for the pages too. - A ceiling of 60 messages an hour; a pass stops between domains when the process is asked to stop; sendmail gets a WaitDelay; days are rounded as a person counts; a failed read of the switch shows it on, not off. Recorded as accepted in security.md, with a roadmap candidate (from-header-binding): an application can have a message signed as the server's own name - or, as always, as another registered domain - by writing it into the From: header, which nothing holds against the login. Left as found: a recipient whose copy failed while another's went out is not tried again; a certificate that lives under 14 days is reported at each renewal. On the test server, for this tree: go vet clean, go test ./... 23 packages ok, make e2e ok (326 s). Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
268 lines
10 KiB
Go
268 lines
10 KiB
Go
package domain
|
|
|
|
import (
|
|
"crypto/x509"
|
|
"encoding/pem"
|
|
"fmt"
|
|
"os"
|
|
"path"
|
|
"path/filepath"
|
|
"sort"
|
|
"strings"
|
|
|
|
"github.com/mixeme/selfpost/internal/configsafe"
|
|
"github.com/mixeme/selfpost/internal/supervisor"
|
|
)
|
|
|
|
// OpenDKIM manages the on-disk OpenDKIM state the panel is responsible for
|
|
// (architecture.md § OpenDKIM): per-domain signing keys under keysDir and the
|
|
// KeyTable/SigningTable that map domains to those keys. After rewriting the
|
|
// tables it asks OpenDKIM to reload them.
|
|
type OpenDKIM struct {
|
|
keysDir string
|
|
keyTablePath string
|
|
signingTablePath string
|
|
|
|
// reload sends the running OpenDKIM a reload signal. It is a field so tests
|
|
// can substitute a no-op; the default drives supervisord (see reloadViaSupervisor).
|
|
reload func() error
|
|
}
|
|
|
|
// NewOpenDKIM builds a manager rooted at dir (typically /data/opendkim), the
|
|
// same layout entrypoint.sh prepares. The default reload path signals OpenDKIM
|
|
// through supervisord.
|
|
func NewOpenDKIM(dir string) *OpenDKIM {
|
|
return &OpenDKIM{
|
|
keysDir: filepath.Join(dir, "keys"),
|
|
keyTablePath: filepath.Join(dir, "KeyTable"),
|
|
signingTablePath: filepath.Join(dir, "SigningTable"),
|
|
reload: reloadViaSupervisor,
|
|
}
|
|
}
|
|
|
|
// SigningDomain is one row's worth of signing configuration.
|
|
type SigningDomain struct {
|
|
Name string
|
|
Selector string
|
|
}
|
|
|
|
// keyPath is the private-key path for a domain/selector, matching the KeyTable.
|
|
func (o *OpenDKIM) keyPath(domainName, selector string) string {
|
|
return filepath.Join(o.keysDir, domainName, selector+".private")
|
|
}
|
|
|
|
// EnsureKey makes sure a signing key exists for the domain. An existing key is
|
|
// reused untouched — critical because overwriting it would silently invalidate
|
|
// the DKIM record already published in DNS (architecture.md § OpenDKIM).
|
|
// Returns whether a new key was generated.
|
|
func (o *OpenDKIM) EnsureKey(domainName, selector string) (bool, error) {
|
|
if err := assertConfigSafe(domainName, selector); err != nil {
|
|
return false, err
|
|
}
|
|
path := o.keyPath(domainName, selector)
|
|
if _, err := os.Stat(path); err == nil {
|
|
return false, nil // reuse existing key
|
|
} else if !os.IsNotExist(err) {
|
|
return false, fmt.Errorf("stat dkim key: %w", err)
|
|
}
|
|
// setgid on keysDir (entrypoint.sh) makes the per-domain dir inherit the
|
|
// shared `selfpost` group so OpenDKIM can traverse into it.
|
|
if err := os.MkdirAll(filepath.Dir(path), 0o750); err != nil {
|
|
return false, fmt.Errorf("create key dir: %w", err)
|
|
}
|
|
key, err := generateDKIMKey()
|
|
if err != nil {
|
|
return false, err
|
|
}
|
|
if err := writePrivateKeyPEM(path, key); err != nil {
|
|
return false, err
|
|
}
|
|
return true, nil
|
|
}
|
|
|
|
// RemoveKey deletes a domain's key directory (architecture.md § OpenDKIM). A
|
|
// missing directory is not an error.
|
|
func (o *OpenDKIM) RemoveKey(domainName string) error {
|
|
if err := assertConfigSafe(domainName, "x"); err != nil {
|
|
return err
|
|
}
|
|
if err := os.RemoveAll(filepath.Join(o.keysDir, domainName)); err != nil {
|
|
return fmt.Errorf("remove key dir for %s: %w", domainName, err)
|
|
}
|
|
return nil
|
|
}
|
|
|
|
// ExportKey returns a domain's DKIM private key as PKCS#1 PEM, for carrying in
|
|
// a domain export so the receiving instance signs with the same key and the
|
|
// DNS TXT record never has to change (architecture.md § Persistence). It
|
|
// re-marshals the parsed key rather than returning the raw file, so a
|
|
// malformed on-disk key is caught here.
|
|
func (o *OpenDKIM) ExportKey(domainName, selector string) ([]byte, error) {
|
|
if err := assertConfigSafe(domainName, selector); err != nil {
|
|
return nil, err
|
|
}
|
|
key, err := loadPrivateKeyPEM(o.keyPath(domainName, selector))
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
block := &pem.Block{Type: "RSA PRIVATE KEY", Bytes: x509.MarshalPKCS1PrivateKey(key)}
|
|
return pem.EncodeToMemory(block), nil
|
|
}
|
|
|
|
// ImportKey writes an imported DKIM private key to disk for a domain
|
|
// (architecture.md § Persistence). The PEM is parsed and re-marshalled through
|
|
// the same writer used for generated keys, so only a well-formed PKCS#1 RSA
|
|
// key is ever stored. Unlike EnsureKey it overwrites: an import (re-)creates
|
|
// the domain with exactly this key, which is the whole point of keeping the
|
|
// published DNS record valid.
|
|
func (o *OpenDKIM) ImportKey(domainName, selector string, pemKey []byte) error {
|
|
if err := assertConfigSafe(domainName, selector); err != nil {
|
|
return err
|
|
}
|
|
block, _ := pem.Decode(pemKey)
|
|
if block == nil || block.Type != "RSA PRIVATE KEY" {
|
|
return fmt.Errorf("import dkim key for %s: not a PKCS#1 RSA private key", domainName)
|
|
}
|
|
key, err := x509.ParsePKCS1PrivateKey(block.Bytes)
|
|
if err != nil {
|
|
return fmt.Errorf("import dkim key for %s: %w", domainName, err)
|
|
}
|
|
path := o.keyPath(domainName, selector)
|
|
if err := os.MkdirAll(filepath.Dir(path), 0o750); err != nil {
|
|
return fmt.Errorf("create key dir: %w", err)
|
|
}
|
|
return writePrivateKeyPEM(path, key)
|
|
}
|
|
|
|
// Record returns the published DKIM DNS record for a domain, recomputed from the
|
|
// private key on disk (product.md).
|
|
func (o *OpenDKIM) Record(domainName, selector string) (DKIMRecord, error) {
|
|
key, err := loadPrivateKeyPEM(o.keyPath(domainName, selector))
|
|
if err != nil {
|
|
return DKIMRecord{}, err
|
|
}
|
|
return dkimRecord(selector, domainName, &key.PublicKey)
|
|
}
|
|
|
|
// Rebuild regenerates KeyTable and SigningTable from the full domain set and
|
|
// reloads OpenDKIM (architecture.md § OpenDKIM). Full regeneration (rather
|
|
// than incremental edits) keeps the files a pure function of the registry, so
|
|
// add and delete share one idempotent path. Both files are written atomically
|
|
// before the reload signal is sent.
|
|
func (o *OpenDKIM) Rebuild(domains []SigningDomain) error {
|
|
keyTable, signingTable, err := renderTables(o.keysDir, domains)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
if err := writeFileAtomic(o.keyTablePath, keyTable, 0o640); err != nil {
|
|
return err
|
|
}
|
|
if err := writeFileAtomic(o.signingTablePath, signingTable, 0o640); err != nil {
|
|
return err
|
|
}
|
|
return o.reload()
|
|
}
|
|
|
|
// signs reports whether the tables on disk sign name with the key of
|
|
// selector: a line for the name in the SigningTable, and in the KeyTable the
|
|
// line that gives it that selector. Tables that do not exist yet sign nothing.
|
|
// The selector is part of the question because the panel shows and checks the
|
|
// record of one key; tables that name another would have OpenDKIM sign with a
|
|
// key whose record nobody is told to publish.
|
|
func (o *OpenDKIM) signs(name, selector string) (bool, error) {
|
|
has := func(path, prefix string) (bool, error) {
|
|
data, err := os.ReadFile(path)
|
|
if os.IsNotExist(err) {
|
|
return false, nil
|
|
}
|
|
if err != nil {
|
|
return false, fmt.Errorf("read %s: %w", filepath.Base(path), err)
|
|
}
|
|
for _, line := range strings.Split(string(data), "\n") {
|
|
if strings.HasPrefix(line, prefix) {
|
|
return true, nil
|
|
}
|
|
}
|
|
return false, nil
|
|
}
|
|
signed, err := has(o.signingTablePath, "*@"+name+" ")
|
|
if err != nil || !signed {
|
|
return false, err
|
|
}
|
|
return has(o.keyTablePath, name+" "+name+":"+selector+":")
|
|
}
|
|
|
|
// Reload asks OpenDKIM to re-read its tables without regenerating them. It
|
|
// backs the panel's manual reload button (architecture.md § Panel HTTP
|
|
// surface).
|
|
func (o *OpenDKIM) Reload() error {
|
|
return o.reload()
|
|
}
|
|
|
|
// SetReloadHook replaces how configuration is applied after a rebuild. Tests
|
|
// that cannot reach supervisord use this to verify file regeneration alone.
|
|
func (o *OpenDKIM) SetReloadHook(fn func() error) {
|
|
if fn != nil {
|
|
o.reload = fn
|
|
}
|
|
}
|
|
|
|
// renderTables builds the KeyTable and SigningTable byte contents for a domain
|
|
// set, sorted by name so the output is deterministic. Every domain is
|
|
// re-checked for shell/config-injection safety before being written
|
|
// (security.md) — validation upstream already guarantees this, but the table
|
|
// writer refuses to emit anything unsafe as a hard backstop.
|
|
func renderTables(keysDir string, domains []SigningDomain) (keyTable, signingTable []byte, err error) {
|
|
sorted := append([]SigningDomain(nil), domains...)
|
|
sort.Slice(sorted, func(i, j int) bool { return sorted[i].Name < sorted[j].Name })
|
|
|
|
var kt, st strings.Builder
|
|
for _, d := range sorted {
|
|
if err := assertConfigSafe(d.Name, d.Selector); err != nil {
|
|
return nil, nil, err
|
|
}
|
|
keyName := d.Name // one key per domain; the domain name is a fine handle
|
|
// Absolute key path so OpenDKIM resolves it independently of its CWD.
|
|
keyFile := path.Join(keysDir, d.Name, d.Selector+".private")
|
|
// KeyTable: <key-name> <domain>:<selector>:<key-path>
|
|
fmt.Fprintf(&kt, "%s %s:%s:%s\n", keyName, d.Name, d.Selector, keyFile)
|
|
// SigningTable (refile): <address-pattern> <key-name>
|
|
fmt.Fprintf(&st, "*@%s %s\n", d.Name, keyName)
|
|
}
|
|
return []byte(kt.String()), []byte(st.String()), nil
|
|
}
|
|
|
|
// opendkimForbidden is what may never appear in a KeyTable or SigningTable
|
|
// value: whitespace and the newline that would end the line, and the colon and
|
|
// path separators that carry meaning inside a table entry.
|
|
const opendkimForbidden = " \t\r\n:/\\"
|
|
|
|
// assertConfigSafe rejects any domain/selector value that could break out of a
|
|
// single table line. Domains are already whitelisted to [a-z0-9.-] and selectors
|
|
// to a similar set before they reach here (security.md); this is defence in depth
|
|
// against a validation gap ever letting whitespace, a newline or a field
|
|
// separator through into a config file (security.md).
|
|
func assertConfigSafe(domainName, selector string) error {
|
|
for _, f := range []struct{ what, value string }{
|
|
{"domain", domainName},
|
|
{"selector", selector},
|
|
} {
|
|
if err := configsafe.Token(f.what, f.value, opendkimForbidden); err != nil {
|
|
return fmt.Errorf("opendkim: %w", err)
|
|
}
|
|
}
|
|
return nil
|
|
}
|
|
|
|
// reloadViaSupervisor asks supervisord (PID 1, running as root) to send the
|
|
// OpenDKIM process SIGUSR1, which makes it re-read KeyTable/SigningTable
|
|
// (opendkim's documented reload signal). The panel runs unprivileged and cannot
|
|
// signal another user's process directly, so it goes through the supervisor
|
|
// control socket, reachable via the shared `selfpost` group (security.md).
|
|
//
|
|
// Arguments are fixed literals — no user input is interpolated into the command,
|
|
// and it never goes through a shell (security.md).
|
|
func reloadViaSupervisor() error {
|
|
return supervisor.Signal("USR1", "opendkim")
|
|
}
|