c0d9aa7518
Codeberg is being retired as the project's public site, so every reference now points at GitHub. That includes the Go module path (codeberg.org/mix/selfpost → github.com/mixeme/selfpost): leaving an import path on a host that is going away would break `go get` and `go install`, so this is not only a docs change. Touches go.mod, test/e2e/go.mod, all imports, Makefile MODULE, the -ldflags version stamp in build/Dockerfile and docs/development.md, the licence headers in the SVG/HTML assets, and README (no more primary/mirror pair). Comments no longer cite the archived specification. "spec 7.6.1", "spec 5.1" and friends pointed into docs/archive/specification-v1.0.md, which is marked as not a source of truth; each is now a reference to the live document that owns the subject — architecture.md (with section), product.md, security.md or the README. The review only asked for the 7.x refs (code-review.md § 4), but 4/5/6/ 8/9 had the same defect, so they went too. Comments only, no behaviour change. Also closes the remaining review items: architecture.md gained a Code layers section with the layer diagram (A2), and TestParseDelivery gained the exotic mail.log cases (§ 3). Fixes a bug that last test found: the delivery-line pattern matched status= greedily, taking the *last* occurrence on the line. Postfix appends the remote server's reply verbatim, so a rejection whose reply quoted "status=sent" was filed as a delivered message in the send log. It now takes the first status= after the recipient, which is the real field. R7 (CONTRIBUTING.md) moved to roadmap 2.x — one developer, no external PR flow, so the file would have no audience yet. R1 (compose image tag) and the git tag stay in roadmap § v1.x as the release-commit steps. gofmt/go vet clean on both modules; go test ./... green except the three known Windows-only failures (file perms, backslash paths, renaming an open file). Not exercised on the dev server — no Docker locally. Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
128 lines
4.3 KiB
Go
128 lines
4.3 KiB
Go
// Package domain owns SelfPost's sending-domain model: per-domain DKIM key
|
|
// generation, the OpenDKIM KeyTable/SigningTable that drive signing, and the
|
|
// orchestration that keeps the SQLite registry, the on-disk keys and OpenDKIM
|
|
// in agreement (architecture.md § OpenDKIM). Key material lives under /data so
|
|
// it survives container restarts (architecture.md § OpenDKIM).
|
|
package domain
|
|
|
|
import (
|
|
"crypto/rand"
|
|
"crypto/rsa"
|
|
"crypto/x509"
|
|
"encoding/base64"
|
|
"encoding/pem"
|
|
"fmt"
|
|
"os"
|
|
"path/filepath"
|
|
)
|
|
|
|
// dkimKeyBits is the RSA key size for DKIM signing keys. 2048 is the DKIM
|
|
// interoperability sweet spot: strong, and short enough that the published
|
|
// public key still fits comfortably in a DNS TXT record.
|
|
const dkimKeyBits = 2048
|
|
|
|
// generateDKIMKey creates a fresh RSA private key for signing a domain.
|
|
func generateDKIMKey() (*rsa.PrivateKey, error) {
|
|
key, err := rsa.GenerateKey(rand.Reader, dkimKeyBits)
|
|
if err != nil {
|
|
return nil, fmt.Errorf("generate dkim key: %w", err)
|
|
}
|
|
return key, nil
|
|
}
|
|
|
|
// writePrivateKeyPEM writes key to path as a PKCS#1 "RSA PRIVATE KEY" PEM,
|
|
// atomically and group-readable (0640). The file is owned by the panel user and
|
|
// read by OpenDKIM through the shared `selfpost` group (see build/opendkim.conf
|
|
// and entrypoint.sh); the parent directory carries setgid so the group is
|
|
// inherited. The write is atomic (temp file + rename) so OpenDKIM never observes
|
|
// a half-written key.
|
|
func writePrivateKeyPEM(path string, key *rsa.PrivateKey) error {
|
|
block := &pem.Block{
|
|
Type: "RSA PRIVATE KEY",
|
|
Bytes: x509.MarshalPKCS1PrivateKey(key),
|
|
}
|
|
return writeFileAtomic(path, pem.EncodeToMemory(block), 0o640)
|
|
}
|
|
|
|
// loadPrivateKeyPEM reads and parses a PKCS#1 RSA private key written by
|
|
// writePrivateKeyPEM. It is used to recompute the public DNS record on demand,
|
|
// keeping the private key file the single source of truth (product.md).
|
|
func loadPrivateKeyPEM(path string) (*rsa.PrivateKey, error) {
|
|
data, err := os.ReadFile(path)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
block, _ := pem.Decode(data)
|
|
if block == nil || block.Type != "RSA PRIVATE KEY" {
|
|
return nil, fmt.Errorf("dkim key %s: not a PKCS#1 RSA private key", path)
|
|
}
|
|
key, err := x509.ParsePKCS1PrivateKey(block.Bytes)
|
|
if err != nil {
|
|
return nil, fmt.Errorf("parse dkim key %s: %w", path, err)
|
|
}
|
|
return key, nil
|
|
}
|
|
|
|
// DKIMRecord is the DNS TXT record a user must publish for a domain (product.md).
|
|
type DKIMRecord struct {
|
|
// Name is the record's host, e.g. "selfpost._domainkey.example.com".
|
|
Name string
|
|
// Value is the TXT payload, e.g. "v=DKIM1; h=sha256; k=rsa; p=MIIB...".
|
|
Value string
|
|
}
|
|
|
|
// dkimRecord builds the published DKIM DNS record for a public key. The value
|
|
// mirrors what opendkim-genkey emits: v=DKIM1, sha256, RSA, and the public key
|
|
// as base64-encoded SubjectPublicKeyInfo (PKIX) DER.
|
|
func dkimRecord(selector, domainName string, pub *rsa.PublicKey) (DKIMRecord, error) {
|
|
der, err := x509.MarshalPKIXPublicKey(pub)
|
|
if err != nil {
|
|
return DKIMRecord{}, fmt.Errorf("marshal dkim public key: %w", err)
|
|
}
|
|
p := base64.StdEncoding.EncodeToString(der)
|
|
return DKIMRecord{
|
|
Name: fmt.Sprintf("%s._domainkey.%s", selector, domainName),
|
|
Value: fmt.Sprintf("v=DKIM1; h=sha256; k=rsa; p=%s", p),
|
|
}, nil
|
|
}
|
|
|
|
// writeFileAtomic writes data to path via a temp file in the same directory
|
|
// followed by a rename, so readers only ever see the complete old or new file.
|
|
// It is the single safe-write primitive for DKIM keys and OpenDKIM tables
|
|
// (security.md).
|
|
func writeFileAtomic(path string, data []byte, perm os.FileMode) error {
|
|
dir := filepath.Dir(path)
|
|
tmp, err := os.CreateTemp(dir, ".tmp-*")
|
|
if err != nil {
|
|
return fmt.Errorf("create temp in %s: %w", dir, err)
|
|
}
|
|
tmpName := tmp.Name()
|
|
cleanup := true
|
|
defer func() {
|
|
if cleanup {
|
|
_ = os.Remove(tmpName)
|
|
}
|
|
}()
|
|
|
|
if _, err := tmp.Write(data); err != nil {
|
|
tmp.Close()
|
|
return fmt.Errorf("write temp %s: %w", tmpName, err)
|
|
}
|
|
if err := tmp.Chmod(perm); err != nil {
|
|
tmp.Close()
|
|
return fmt.Errorf("chmod temp %s: %w", tmpName, err)
|
|
}
|
|
if err := tmp.Sync(); err != nil {
|
|
tmp.Close()
|
|
return fmt.Errorf("sync temp %s: %w", tmpName, err)
|
|
}
|
|
if err := tmp.Close(); err != nil {
|
|
return fmt.Errorf("close temp %s: %w", tmpName, err)
|
|
}
|
|
if err := os.Rename(tmpName, path); err != nil {
|
|
return fmt.Errorf("rename %s -> %s: %w", tmpName, path, err)
|
|
}
|
|
cleanup = false
|
|
return nil
|
|
}
|