Stage 2, step 5. Written by Sonnet, reviewed by Opus.
- Three pages named after their mockups: in-domains, in-domain,
in-domain-delete, with typed page data (view/inbound.go), fixtures
and tests. The engine pages inbound, inbound_domain and
inbound_delete are gone with their templates and are off
legacy_pages.txt.
- The Spam filter box (plan, Who sees what). The panel now reads
INBOUND_ANTISPAM_MILTER and INBOUND_ANTISPAM_MILTER_ACTION, with the
semantics of build/postfix-config.sh (on only with the inbound relay
on and a milter set; accept | tempfail). It reports them, nothing
more:
on Applies to / Filter (the address, global role only) / If the
filter is down (accepted unfiltered | deferred)
off one sentence; the variable is named for the global role only
The list shows "Spam filter on|off" in its head.
- Handlers pass typed data; routes, POST targets, field names,
validation and authorization (global: all inbound domains; domain
role: the assigned ones, another tenant's id is a 404; add and
delete are global-only) are unchanged. A test saves the upstream and
recipients forms untouched and finds the domain unchanged.
Left out of the mockups' Spam filter box and menu - no source before
inbound-antispam-panel (2.1): the engine name, the quarantine row, the
"refused at the door, see the log" row, the lists row, "Log for this
domain". Also "Checked N min ago" on the MX box: the check carries no
time.
Not done: the filter's socket on Health and Overview. internal/health
checks a unix socket by stat; the documented form of the filter's
address is inet:host:port and needs a dial that does not exist yet.
Differences from the mockups, for the owner:
- refusals and confirmations are the kit flash above the boxes;
- the MX tag is coloured by the check in every state; an MX that
points elsewhere shows "In DNS now";
- the lead of the domain page follows what is saved ("Not accepting
mail yet: no upstream is saved");
- the delete page lists only what the domain has;
- /help#inbound opens Help at the top until the Help step.
Evidence
- docs/assets/panel-redesign/evidence/in-domains.png, in-domain.png,
in-domain-delete.png: 1440 px wide, headless Edge, real templates
served locally with their fixtures (filter on) - NOT from the
container (no Docker on this machine).
- panel/audit.js on the three pages at 1440 and 1280: 352 texts
checked, problems: [].
- That the panel process sees the two variables inside the container
is read from supervisord.conf and entrypoint.sh, not run.
- go test -count=1 ./internal/web/... ./cmd/panel
ok internal/web
ok internal/web/auth
ok internal/web/handlers
ok internal/web/validate
ok internal/web/view
ok cmd/panel
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
152 lines
5.1 KiB
Go
152 lines
5.1 KiB
Go
package main
|
|
|
|
import (
|
|
"context"
|
|
"errors"
|
|
"fmt"
|
|
"log"
|
|
"net/http"
|
|
"time"
|
|
|
|
"github.com/mixeme/selfpost/internal/app"
|
|
"github.com/mixeme/selfpost/internal/buildinfo"
|
|
"github.com/mixeme/selfpost/internal/dmarc"
|
|
"github.com/mixeme/selfpost/internal/domain"
|
|
"github.com/mixeme/selfpost/internal/inbound"
|
|
"github.com/mixeme/selfpost/internal/postfix"
|
|
"github.com/mixeme/selfpost/internal/store"
|
|
"github.com/mixeme/selfpost/internal/web"
|
|
)
|
|
|
|
// mailStack is the panel's domain and application services plus the on-disk
|
|
// mail-path adapters they write through.
|
|
type mailStack struct {
|
|
Domains *domain.Service
|
|
Apps *app.Service
|
|
Inbound *inbound.Service
|
|
DMARC *dmarc.Service
|
|
pf *postfix.Postfix
|
|
odk *domain.OpenDKIM
|
|
inboundEnabled bool
|
|
dmarcEnabled bool
|
|
}
|
|
|
|
func newMailStack(cfg config, st *store.Store) *mailStack {
|
|
pf := postfix.New(cfg.postfixDir)
|
|
odk := domain.NewOpenDKIM(cfg.opendkimDir)
|
|
apps := app.NewService(st, app.NewSASLDB(cfg.saslDBPath, cfg.saslRealm), pf)
|
|
domains := domain.NewService(st, odk, apps, cfg.dkimSelectorDef)
|
|
inb := inbound.NewService(st, pf)
|
|
dmarcSvc := dmarc.NewService(st, pf, cfg.hostname, cfg.dmarcEnabled)
|
|
return &mailStack{
|
|
Domains: domains, Apps: apps, Inbound: inb, DMARC: dmarcSvc,
|
|
pf: pf, odk: odk, inboundEnabled: cfg.inboundEnabled, dmarcEnabled: cfg.dmarcEnabled,
|
|
}
|
|
}
|
|
|
|
// Resync rebuilds OpenDKIM's tables and Postfix's sender map from SQLite and
|
|
// reloads both daemons — the same work as the Status page's Reload button.
|
|
func (m *mailStack) Resync() error {
|
|
if err := m.Domains.Resync(); err != nil {
|
|
return fmt.Errorf("opendkim resync: %w", err)
|
|
}
|
|
if err := m.Apps.Resync(); err != nil {
|
|
return fmt.Errorf("postfix resync: %w", err)
|
|
}
|
|
if m.inboundEnabled {
|
|
if err := m.Inbound.Resync(); err != nil {
|
|
return fmt.Errorf("inbound maps resync: %w", err)
|
|
}
|
|
}
|
|
if m.dmarcEnabled {
|
|
if err := m.DMARC.Resync(); err != nil {
|
|
return fmt.Errorf("dmarc maps resync: %w", err)
|
|
}
|
|
}
|
|
return nil
|
|
}
|
|
|
|
func (m *mailStack) skipReloadForTest() {
|
|
m.pf.SetReloadHook(func() error { return nil })
|
|
m.odk.SetReloadHook(func() error { return nil })
|
|
}
|
|
|
|
// resyncAfterRestore runs one mail-path Resync on the first boot after a
|
|
// backup restore. testNoReload skips the supervisord reload step so restore
|
|
// tests can verify file regeneration without a running mail stack.
|
|
func resyncAfterRestore(cfg config, st *store.Store, testNoReload bool) error {
|
|
ms := newMailStack(cfg, st)
|
|
if testNoReload {
|
|
ms.skipReloadForTest()
|
|
}
|
|
return ms.Resync()
|
|
}
|
|
|
|
// newPanel wires the panel's services over the shared database handle and
|
|
// builds the HTTP application from cfg. It is the composition of the panel as
|
|
// the environment describes it, with nothing bound to a port yet.
|
|
func newPanel(cfg config, st *store.Store) (*web.Server, error) {
|
|
ms := newMailStack(cfg, st)
|
|
// postfix-config.sh has already run (entrypoint). postconf -h is the
|
|
// effective config, including a manual override; the panel keeps this
|
|
// snapshot for the process lifetime (architecture.md).
|
|
retryPolicy := postfix.LoadRetryPolicy()
|
|
return web.New(st, ms.Domains, ms.Apps, ms.Inbound, ms.DMARC, web.Config{
|
|
Hostname: cfg.hostname,
|
|
CookieSecure: cfg.cookieSecure,
|
|
SubmissionEnabled: cfg.submissionEnabled,
|
|
MailLogPath: cfg.mailLog,
|
|
DataDir: cfg.dataDir,
|
|
DBPath: cfg.dbPath,
|
|
DeployRoot: cfg.deployRoot,
|
|
Version: buildinfo.Version,
|
|
TrustedProxyCIDRs: cfg.trustedProxies,
|
|
TLSCertFile: cfg.tlsCertFile,
|
|
OpenDKIMSocket: cfg.opendkimSocket,
|
|
JournalSocket: cfg.journalSocket,
|
|
SessionIdleDays: cfg.sessionIdleDays,
|
|
DNSResolvers: cfg.dnsResolvers,
|
|
RateLimitMessagesPerIP: cfg.rateLimitMessagesPerIP,
|
|
RateLimitWindowSeconds: cfg.rateLimitWindowSeconds,
|
|
RetryPolicy: retryPolicy,
|
|
InboundEnabled: cfg.inboundEnabled,
|
|
InboundAntispamMilter: cfg.inboundAntispamMilter,
|
|
InboundAntispamAction: cfg.inboundAntispamAction,
|
|
DMARCEnabled: cfg.dmarcEnabled,
|
|
SendLogRetentionEnvDefault: cfg.retentionDays,
|
|
}, cfg.setupTokenPath)
|
|
}
|
|
|
|
// serveHTTP runs the control-panel HTTP server until ctx is cancelled, using
|
|
// the database handle shared by all roles: setup, login and the authenticated
|
|
// panel surface (security.md).
|
|
func serveHTTP(ctx context.Context, cfg config, st *store.Store) error {
|
|
srvApp, err := newPanel(cfg, st)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
if err := srvApp.Start(); err != nil {
|
|
return err
|
|
}
|
|
|
|
srv := &http.Server{
|
|
Addr: cfg.httpAddr,
|
|
Handler: srvApp.Handler(),
|
|
ReadHeaderTimeout: 10 * time.Second,
|
|
}
|
|
|
|
// Shut the server down cleanly when the process is asked to stop.
|
|
go func() {
|
|
<-ctx.Done()
|
|
shutdownCtx, cancel := context.WithTimeout(context.Background(), 5*time.Second)
|
|
defer cancel()
|
|
_ = srv.Shutdown(shutdownCtx)
|
|
}()
|
|
|
|
log.Printf("http panel listening on %s", cfg.httpAddr)
|
|
if err := srv.ListenAndServe(); err != nil && !errors.Is(err, http.ErrServerClosed) {
|
|
return err
|
|
}
|
|
return nil
|
|
}
|