panel-redesign: Inbound domains, domain and delete on the kit; Spam filter box
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>
This commit is contained in:
@@ -5,7 +5,6 @@ import (
|
||||
"fmt"
|
||||
"net/http"
|
||||
"strconv"
|
||||
"strings"
|
||||
"sync"
|
||||
|
||||
"github.com/mixeme/selfpost/internal/dnscheck"
|
||||
@@ -13,16 +12,9 @@ import (
|
||||
"github.com/mixeme/selfpost/internal/store"
|
||||
"github.com/mixeme/selfpost/internal/web/auth"
|
||||
"github.com/mixeme/selfpost/internal/web/validate"
|
||||
"github.com/mixeme/selfpost/internal/web/view"
|
||||
)
|
||||
|
||||
type inboundRow struct {
|
||||
store.InboundDomain
|
||||
DNS health.Status
|
||||
Upstream string
|
||||
TLSLabel string
|
||||
RcptLabel string
|
||||
}
|
||||
|
||||
// Inbound is delegated to domain administrators separately from outbound (plan
|
||||
// § Who sees what), so its handlers come in three strengths:
|
||||
//
|
||||
@@ -124,34 +116,37 @@ func (h *Handlers) renderInboundList(w http.ResponseWriter, r *http.Request, sta
|
||||
http.Error(w, "internal error", http.StatusInternalServerError)
|
||||
return
|
||||
}
|
||||
data := h.pageBase(r)
|
||||
data["Title"] = "SelfPost — inbound"
|
||||
data["Active"] = "inbound"
|
||||
data["Domains"] = h.inboundRows(list)
|
||||
data["Error"] = formErr
|
||||
data["FormName"] = formName
|
||||
flash := ""
|
||||
if r.URL.Query().Get("deleted") != "" {
|
||||
data["Flash"] = "Inbound domain deleted."
|
||||
flash = "Inbound domain deleted."
|
||||
}
|
||||
h.view.Render(w, status, "inbound", data)
|
||||
on, _, _ := h.inboundFilter()
|
||||
page := view.NewInDomains(h.shellMeta(r), p.IsGlobal()).
|
||||
WithFilter(on).
|
||||
WithRows(h.inboundRows(list, p.IsGlobal())).
|
||||
WithResult(flash, formErr, formName)
|
||||
h.view.Render(w, status, "in-domains", page)
|
||||
}
|
||||
|
||||
func (h *Handlers) inboundRows(domains []store.InboundDomain) []inboundRow {
|
||||
rows := make([]inboundRow, len(domains))
|
||||
// inboundRows is one row per inbound domain: the verdict of the MX check
|
||||
// (cached for a few minutes, as on the domain page), the upstream, who is
|
||||
// accepted and the TLS to the upstream. The checks run side by side.
|
||||
func (h *Handlers) inboundRows(domains []store.InboundDomain, canDelete bool) []view.InDomainRow {
|
||||
rows := make([]view.InDomainRow, len(domains))
|
||||
var wg sync.WaitGroup
|
||||
for i, d := range domains {
|
||||
rows[i] = inboundRow{
|
||||
InboundDomain: d,
|
||||
DNS: health.StatusUnknown,
|
||||
Upstream: inboundUpstream(d),
|
||||
TLSLabel: tlsLabel(d.TLSMode),
|
||||
RcptLabel: rcptLabel(d),
|
||||
in := view.InDomainInput{
|
||||
ID: d.ID, Name: d.Name, DNSStatus: string(health.StatusUnknown),
|
||||
Host: d.Host, Port: d.Port, TLSMode: d.TLSMode,
|
||||
RecipientMode: d.RecipientMode, RecipientCount: d.RecipientCount,
|
||||
}
|
||||
rows[i] = view.NewInDomainRow(in, canDelete)
|
||||
wg.Add(1)
|
||||
go func() {
|
||||
defer wg.Done()
|
||||
if h.dns != nil && h.cfg.Hostname != "" {
|
||||
rows[i].DNS = h.dns.InboundMX(d.Name, h.cfg.Hostname, false).Status
|
||||
in.DNSStatus = string(h.dns.InboundMX(d.Name, h.cfg.Hostname, false).Status)
|
||||
rows[i] = view.NewInDomainRow(in, canDelete)
|
||||
}
|
||||
}()
|
||||
}
|
||||
@@ -159,42 +154,6 @@ func (h *Handlers) inboundRows(domains []store.InboundDomain) []inboundRow {
|
||||
return rows
|
||||
}
|
||||
|
||||
func inboundUpstream(d store.InboundDomain) string {
|
||||
if d.Host == "" {
|
||||
return "—"
|
||||
}
|
||||
return fmt.Sprintf("%s:%d", d.Host, d.Port)
|
||||
}
|
||||
|
||||
func tlsLabel(mode string) string {
|
||||
switch mode {
|
||||
case store.TLSModeEncrypt:
|
||||
return "required"
|
||||
case store.TLSModeNone:
|
||||
return "off"
|
||||
default:
|
||||
return "opportunistic"
|
||||
}
|
||||
}
|
||||
|
||||
func tlsStatusClass(mode string) string {
|
||||
if mode == store.TLSModeEncrypt {
|
||||
return "ok"
|
||||
}
|
||||
return "unknown"
|
||||
}
|
||||
|
||||
func rcptLabel(d store.InboundDomain) string {
|
||||
if d.RecipientMode == store.RecipientModeAny {
|
||||
return "any"
|
||||
}
|
||||
n := d.RecipientCount
|
||||
if n == 1 {
|
||||
return "1 listed"
|
||||
}
|
||||
return fmt.Sprintf("%d listed", n)
|
||||
}
|
||||
|
||||
// HandleAddInbound validates the name, creates the inbound domain, and
|
||||
// redirects to its page.
|
||||
func (h *Handlers) HandleAddInbound(w http.ResponseWriter, r *http.Request) {
|
||||
@@ -244,21 +203,35 @@ func (h *Handlers) renderInboundDetail(w http.ResponseWriter, r *http.Request, s
|
||||
if h.dns != nil && h.cfg.Hostname != "" {
|
||||
mx = h.dns.InboundMX(d.Name, h.cfg.Hostname, false)
|
||||
}
|
||||
data := h.pageBase(r)
|
||||
data["Title"] = "SelfPost — " + d.Name
|
||||
data["Active"] = "inbound"
|
||||
data["Domain"] = d
|
||||
data["MX"] = mx
|
||||
data["MXValue"] = "10 " + strings.TrimSuffix(h.cfg.Hostname, ".") + "."
|
||||
data["Hostname"] = h.cfg.Hostname
|
||||
data["TLSLabel"] = tlsLabel(d.TLSMode)
|
||||
data["TLSClass"] = tlsStatusClass(d.TLSMode)
|
||||
data["RecipientText"] = strings.Join(d.Recipients, "\n")
|
||||
data["Flash"] = inboundFlash(r)
|
||||
data["FormErr"] = extra.FormErr
|
||||
data["TransportErr"] = extra.TransportErr
|
||||
data["RecipientErr"] = extra.RecipientErr
|
||||
h.view.Render(w, status, "inbound_domain", data)
|
||||
on, milter, action := h.inboundFilter()
|
||||
page := view.NewInDomain(h.shellMeta(r), view.InDomainInput{
|
||||
ID: d.ID, Name: d.Name, DNSStatus: string(mx.Status), Host: d.Host, Port: d.Port, TLSMode: d.TLSMode,
|
||||
RecipientMode: d.RecipientMode, RecipientCount: d.RecipientCount, Addresses: d.Recipients,
|
||||
}).
|
||||
WithMX(h.cfg.Hostname, view.DNSCheck{Status: string(mx.Status), Detail: mx.Detail, Found: mx.Records}).
|
||||
WithFilter(on, milter, action).
|
||||
WithResult(inboundFlash(r), firstNonEmpty(extra.FormErr, extra.TransportErr, extra.RecipientErr))
|
||||
h.view.Render(w, status, "in-domain", page)
|
||||
}
|
||||
|
||||
// inboundFilter says whether the instance filters inbound mail, and with what:
|
||||
// the milter address and what Postfix does when it is down. It mirrors
|
||||
// build/postfix-config.sh, which attaches the filter only when the inbound
|
||||
// relay is on and a milter is set.
|
||||
func (h *Handlers) inboundFilter() (on bool, milter, action string) {
|
||||
if !h.cfg.InboundEnabled || h.cfg.InboundAntispamMilter == "" {
|
||||
return false, "", ""
|
||||
}
|
||||
return true, h.cfg.InboundAntispamMilter, h.cfg.InboundAntispamAction
|
||||
}
|
||||
|
||||
func firstNonEmpty(ss ...string) string {
|
||||
for _, s := range ss {
|
||||
if s != "" {
|
||||
return s
|
||||
}
|
||||
}
|
||||
return ""
|
||||
}
|
||||
|
||||
func inboundFlash(r *http.Request) string {
|
||||
@@ -330,12 +303,12 @@ func (h *Handlers) HandleInboundDeleteConfirm(w http.ResponseWriter, r *http.Req
|
||||
if !ok {
|
||||
return
|
||||
}
|
||||
data := h.pageBase(r)
|
||||
data["Title"] = "SelfPost — delete " + d.Name
|
||||
data["Active"] = "inbound"
|
||||
data["Domain"] = d
|
||||
data["Upstream"] = inboundUpstream(d)
|
||||
h.view.Render(w, http.StatusOK, "inbound_delete", data)
|
||||
listed := 0
|
||||
if d.RecipientMode != store.RecipientModeAny {
|
||||
listed = d.RecipientCount
|
||||
}
|
||||
h.view.Render(w, http.StatusOK, "in-domain-delete",
|
||||
view.NewInDomainDelete(h.shellMeta(r), d.ID, d.Name, d.Host != "", listed))
|
||||
}
|
||||
|
||||
func (h *Handlers) HandleInboundDelete(w http.ResponseWriter, r *http.Request) {
|
||||
|
||||
Reference in New Issue
Block a user