test / test (push) Has been cancelled
Verified the tree against docs/plans/code-review-2026-08.md and finished the tasks that were only partly done, plus two defects the pass introduced. - bcrypt: the setup account was still hashed at DefaultCost (10). The work factor now has one definition, auth.BcryptCost = 12, used everywhere. - rate limiter: protecting blocked buckets from eviction was unbounded — an attacker with many source addresses could grow the map by making each one fail its way to blocked. Blocked buckets are now evicted past maxBuckets * 4, nearest expiry first, logged once per window. Tests cover both halves. - postqueue: the 5s timeout left the output size unbounded; reads are now capped at 4 MiB and report truncation. - spec references: the ~76 `spec N` citations CHANGELOG [0.5.0] claimed were gone are removed from build/, deploy/, the first two migrations and the release workflow, with the affected comment paragraphs re-wrapped. Comments only; shell/YAML/SQL syntax re-checked. - schema-migrations.md: schema section was headed v9 with the chain at v10, and three links pointed at deleted plan files. - internal/configsafe: the shared empty/forbidden-character check behind the OpenDKIM and Postfix config writers; each writer keeps its own forbidden set. - dropped the parseDomainRateLimitForm/parseAppRateLimitForm pass-throughs left behind by the parser merge (only their own tests still called them). - plan doc now carries a status table: what shipped, what was already in place, what was declined (//go:build linux for the /proc reader) and the open CSRF-token question. Not done, each its own phase: typed template data structs, log/slog, DMARC service and handler tests, error-page/corrupted-backup tests, backup re-auth. Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
132 lines
4.0 KiB
Go
132 lines
4.0 KiB
Go
package postfix
|
|
|
|
import (
|
|
"fmt"
|
|
"path/filepath"
|
|
"sort"
|
|
"strconv"
|
|
"strings"
|
|
|
|
"github.com/mixeme/selfpost/internal/configsafe"
|
|
)
|
|
|
|
// InboundRoute is one inbound domain's Postfix map material: the relay
|
|
// domain, the next-hop transport, the TLS policy for that hop, and the
|
|
// recipient list (or a domain catch-all).
|
|
type InboundRoute struct {
|
|
Domain string
|
|
Host string
|
|
Port int
|
|
TLSMode string
|
|
RecipientMode string
|
|
Recipients []string
|
|
}
|
|
|
|
func (p *Postfix) inboundMapPaths() (relayDomains, transport, recipients, tlsPolicy string) {
|
|
dir := filepath.Dir(p.senderLoginMapsPath)
|
|
return filepath.Join(dir, "relay_domains"),
|
|
filepath.Join(dir, "transport"),
|
|
filepath.Join(dir, "relay_recipients"),
|
|
filepath.Join(dir, "tls_policy")
|
|
}
|
|
|
|
// RebuildInboundMaps regenerates the inbound relay lookup tables from the full
|
|
// set of configured routes and reloads Postfix. Domains with an empty host are
|
|
// omitted so mail is never accepted with nowhere to send it. Full regeneration
|
|
// keeps the files a pure function of the registry (security.md).
|
|
func (p *Postfix) RebuildInboundMaps(routes []InboundRoute) error {
|
|
relay, transport, recipients, tlsPolicy, err := renderInboundMaps(routes)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
rd, tr, rc, tl := p.inboundMapPaths()
|
|
if err := writeFileAtomic(rd, relay, 0o640); err != nil {
|
|
return err
|
|
}
|
|
if err := writeFileAtomic(tr, transport, 0o640); err != nil {
|
|
return err
|
|
}
|
|
if err := writeFileAtomic(rc, recipients, 0o640); err != nil {
|
|
return err
|
|
}
|
|
if err := writeFileAtomic(tl, tlsPolicy, 0o640); err != nil {
|
|
return err
|
|
}
|
|
return p.reload()
|
|
}
|
|
|
|
func renderInboundMaps(routes []InboundRoute) (relay, transport, recipients, tlsPolicy []byte, err error) {
|
|
sort.Slice(routes, func(i, j int) bool { return routes[i].Domain < routes[j].Domain })
|
|
|
|
var relayB, transportB, recipB, tlsB strings.Builder
|
|
for _, r := range routes {
|
|
if strings.TrimSpace(r.Host) == "" {
|
|
continue
|
|
}
|
|
if err := assertInboundRouteSafe(r); err != nil {
|
|
return nil, nil, nil, nil, err
|
|
}
|
|
nexthop := inboundNexthop(r.Host, r.Port)
|
|
fmt.Fprintf(&relayB, "%s OK\n", r.Domain)
|
|
fmt.Fprintf(&transportB, "%s smtp:%s\n", r.Domain, nexthop)
|
|
fmt.Fprintf(&tlsB, "%s %s\n", nexthop, r.TLSMode)
|
|
switch r.RecipientMode {
|
|
case "any":
|
|
fmt.Fprintf(&recipB, "@%s OK\n", r.Domain)
|
|
default:
|
|
addrs := append([]string(nil), r.Recipients...)
|
|
sort.Strings(addrs)
|
|
for _, addr := range addrs {
|
|
fmt.Fprintf(&recipB, "%s OK\n", addr)
|
|
}
|
|
}
|
|
}
|
|
return []byte(relayB.String()), []byte(transportB.String()), []byte(recipB.String()), []byte(tlsB.String()), nil
|
|
}
|
|
|
|
// inboundNexthop is the Postfix next-hop [host]:port form. The brackets are
|
|
// what disable the MX lookup, so the operator's explicit upstream is used as
|
|
// given; they also delimit a bare IPv6 address.
|
|
func inboundNexthop(host string, port int) string {
|
|
return "[" + host + "]:" + strconv.Itoa(port)
|
|
}
|
|
|
|
func assertInboundRouteSafe(r InboundRoute) error {
|
|
if err := assertMapToken(r.Domain, "domain"); err != nil {
|
|
return err
|
|
}
|
|
if err := assertMapToken(r.Host, "host"); err != nil {
|
|
return err
|
|
}
|
|
if r.Port < 1 || r.Port > 65535 {
|
|
return fmt.Errorf("postfix: invalid inbound port %d", r.Port)
|
|
}
|
|
switch r.TLSMode {
|
|
case "may", "encrypt", "none":
|
|
default:
|
|
return fmt.Errorf("postfix: invalid tls mode %q", r.TLSMode)
|
|
}
|
|
if r.RecipientMode != "list" && r.RecipientMode != "any" {
|
|
return fmt.Errorf("postfix: invalid recipient mode %q", r.RecipientMode)
|
|
}
|
|
for _, addr := range r.Recipients {
|
|
if err := assertMapToken(addr, "recipient"); err != nil {
|
|
return err
|
|
}
|
|
}
|
|
return nil
|
|
}
|
|
|
|
// texthashForbidden is what may never appear in a texthash line: whitespace and
|
|
// the newline that would end it, the comma that separates values, and the
|
|
// backslash.
|
|
const texthashForbidden = " \t\r\n,\\"
|
|
|
|
// assertMapToken rejects values that could break out of a texthash line.
|
|
func assertMapToken(v, what string) error {
|
|
if err := configsafe.Token(what, v, texthashForbidden); err != nil {
|
|
return fmt.Errorf("postfix: %w", err)
|
|
}
|
|
return nil
|
|
}
|