Bug: Unbound bindet Listen-Sockets nur beim startup. Bei einer Mutation von dns_settings.listen_addresses (z.B. neue LAN-IP für Resolver-Zugriff) hat 'systemctl reload' die Config zwar gelesen, aber nicht neu gebound — neue IPs blieben tot. Fix: Renderer ruft RestartService statt ReloadService. ~200ms Resolver-Downtime beim Save, dafür konsistentes Verhalten für jede Settings/Zone/Record-Mutation. Plus configgen.RestartService Helper neu (analog ReloadService), sudoers im postinst um systemctl restart unbound.service erweitert. NOTE für DNS-LAN-Zugang: zwei Operator-FW-Rules nötig (DNS-UDP + DNS-TCP from any to any) wenn der Resolver auf LAN-IPs lauscht. Aktuell manuell anzulegen — ein Auto-Rule-Generator (analog NAT-auto-forward) wäre die nächste Iteration. Version 1.0.36. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
105 lines
3.8 KiB
Go
105 lines
3.8 KiB
Go
// Package configgen contains shared helpers used by the per-service
|
|
// renderers in internal/{haproxy,firewall,squid,wireguard,unbound}/.
|
|
//
|
|
// Each renderer satisfies the Generator interface: Render reads state
|
|
// from PG, writes the rendered config to /etc/edgeguard/<svc>/ via
|
|
// AtomicWrite, then signals the running daemon via systemctl reload
|
|
// (or its service-specific reload command). Failures are surfaced
|
|
// to the caller — the orchestrator decides whether one bad renderer
|
|
// aborts the whole run.
|
|
package configgen
|
|
|
|
import (
|
|
"context"
|
|
"errors"
|
|
"fmt"
|
|
"os"
|
|
"os/exec"
|
|
"path/filepath"
|
|
"strings"
|
|
)
|
|
|
|
// Generator is the contract every per-service renderer satisfies.
|
|
//
|
|
// Name returns a stable identifier ("haproxy", "nftables", …)
|
|
// used in CLI output and audit logs. Render does the actual write +
|
|
// reload work; ctx may be cancelled (e.g. orchestrator timeout).
|
|
type Generator interface {
|
|
Name() string
|
|
Render(ctx context.Context) error
|
|
}
|
|
|
|
// ErrNotImplemented is returned by stub renderers (squid, wireguard,
|
|
// unbound in v1). The orchestrator treats it as a soft skip — logged
|
|
// but never fatal.
|
|
var ErrNotImplemented = errors.New("renderer not implemented yet")
|
|
|
|
// AtomicWrite writes data to path atomically via a temp file in the
|
|
// same directory + rename. Both the temp file and the final file are
|
|
// fsync'd to make the rename durable across an OS crash. Mode is
|
|
// applied AFTER the rename so the previous file's permissions don't
|
|
// leak through.
|
|
func AtomicWrite(path string, data []byte, mode os.FileMode) error {
|
|
dir := filepath.Dir(path)
|
|
if err := os.MkdirAll(dir, 0o750); err != nil {
|
|
return fmt.Errorf("mkdir %s: %w", dir, err)
|
|
}
|
|
tmp, err := os.CreateTemp(dir, ".eg-render-*")
|
|
if err != nil {
|
|
return fmt.Errorf("tempfile: %w", err)
|
|
}
|
|
tmpPath := tmp.Name()
|
|
defer os.Remove(tmpPath) // no-op if rename succeeded
|
|
|
|
if _, err := tmp.Write(data); err != nil {
|
|
tmp.Close()
|
|
return fmt.Errorf("write %s: %w", tmpPath, err)
|
|
}
|
|
if err := tmp.Sync(); err != nil {
|
|
tmp.Close()
|
|
return fmt.Errorf("fsync %s: %w", tmpPath, err)
|
|
}
|
|
if err := tmp.Close(); err != nil {
|
|
return fmt.Errorf("close %s: %w", tmpPath, err)
|
|
}
|
|
if err := os.Chmod(tmpPath, mode); err != nil {
|
|
return fmt.Errorf("chmod %s: %w", tmpPath, err)
|
|
}
|
|
if err := os.Rename(tmpPath, path); err != nil {
|
|
return fmt.Errorf("rename %s → %s: %w", tmpPath, path, err)
|
|
}
|
|
return nil
|
|
}
|
|
|
|
// ReloadService runs `sudo -n systemctl reload <name>.service`.
|
|
// edgeguard-api runs as the unprivileged `edgeguard` user; postinst
|
|
// installs a sudoers entry NOPASSWD-ing exactly this command per
|
|
// service that needs it.
|
|
//
|
|
// Some services don't support reload (nftables — no daemon); for
|
|
// those, callers should run the service-specific reload directly
|
|
// rather than calling this helper.
|
|
func ReloadService(name string) error {
|
|
cmd := exec.Command("sudo", "-n", "/usr/bin/systemctl", "reload", name+".service")
|
|
if out, err := cmd.CombinedOutput(); err != nil {
|
|
return fmt.Errorf("sudo systemctl reload %s.service: %w (output: %s)", name, err, strings.TrimSpace(string(out)))
|
|
}
|
|
return nil
|
|
}
|
|
|
|
// RestartService runs `sudo -n systemctl restart <name>.service`.
|
|
// Use over ReloadService when the daemon needs to re-read more than
|
|
// just rules — e.g. unbound rebinds listen-sockets only on startup,
|
|
// so a settings.listen_addresses change requires restart.
|
|
func RestartService(name string) error {
|
|
cmd := exec.Command("sudo", "-n", "/usr/bin/systemctl", "restart", name+".service")
|
|
if out, err := cmd.CombinedOutput(); err != nil {
|
|
return fmt.Errorf("sudo systemctl restart %s.service: %w (output: %s)", name, err, strings.TrimSpace(string(out)))
|
|
}
|
|
return nil
|
|
}
|
|
|
|
// EtcEdgeguard is the on-target config root. Templated path used by
|
|
// all renderers — never let renderers hard-code their own.
|
|
const EtcEdgeguard = "/etc/edgeguard"
|