inbound-antispam-panel: Filter lists, kind column, matches, note on a sheet
Follows the design commit before it (owner's words quoted there). The lists' tables are Value, Kind, Matched and Remove. The kind tag opens the entry's sheet: note, day added, how often it decided a message in the days the log keeps, and the last match. Matches are read off the journal on each view, nothing is stored (inbound.Lists.Usage, store.ListSpamListHits). A row counts for an entry when the list decided the message - a rejected row whose reply is the deny rule's message, an accepted row whose verdict carries the allow rule's symbol for that kind - and the entry fits the row's sender or client address the way rspamd matches it: an address whole, a domain as the sender's domain, a network containing the client (an IPv4-mapped address as IPv4). A failure to count shows the lists with "never" and logs why. For that the journal milter keeps the lists' own symbols ahead of its six-symbol cap: rspamd writes symbols heaviest first, so an allow entry's -100 came last and was cut behind any six others. The plan gains "Filter list usage": what counting from the journal implies, and - the owner asked for it in writing - the conditions under which a counter kept with each entry becomes worth a migration (the journal cut by its row cap and not by age; a short retention; counts that must outlive the journal; a slow page). multimap.conf says which of its texts SelfPost reads back. Tests: Usage over every kind on both lists and the rows that are nobody's; the milter's symbol order; the store query; the page and its sheets; a handler test from journal rows to the numbers on the page. Seen: the fixture page with a sheet open, headless Edge at 1360 px - the same as the accepted drawing. Checked on the test server, uncommitted tree: go vet ./... ok, go test ./... ok (22 packages), make e2e ok. Not seen in a real run: a count above zero. It needs an entry added in the panel, which I cannot sign in to, and then mail that the list decides; in particular the deny rule's message arriving in mail.log as the reply of a milter-reject line is what the trial with rspamc showed, not yet what Postfix logged. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
@@ -167,12 +167,21 @@ func (h *Handlers) renderFilterLists(w http.ResponseWriter, r *http.Request, sta
|
||||
http.Error(w, "internal error", http.StatusInternalServerError)
|
||||
return
|
||||
}
|
||||
// How often each entry decided a message is counted from the journal. A
|
||||
// failure there is not a reason to hide the lists: they are shown without
|
||||
// the counts' worth - every entry "never" - and the log says why.
|
||||
usage, err := h.lists.Usage()
|
||||
if err != nil {
|
||||
logf("panel: filter lists: usage: %v", err)
|
||||
}
|
||||
on, _, _ := h.inboundFilter()
|
||||
in := make([]view.FilterEntryInput, len(entries))
|
||||
for i, e := range entries {
|
||||
in[i] = view.FilterEntryInput{ID: e.ID, List: e.List, Kind: e.Kind, Value: e.Value, Note: e.Note, Added: e.CreatedAt}
|
||||
in[i] = view.FilterEntryInput{ID: e.ID, List: e.List, Kind: e.Kind, Value: e.Value, Note: e.Note, Added: e.CreatedAt,
|
||||
Hits: usage[e.ID].Hits, LastHit: usage[e.ID].Last}
|
||||
}
|
||||
page := view.NewFilterLists(h.shellMeta(r), view.FilterListsInput{FilterOn: on, LastWritten: h.lists.LastWritten()}).
|
||||
page := view.NewFilterLists(h.shellMeta(r), view.FilterListsInput{
|
||||
FilterOn: on, LastWritten: h.lists.LastWritten(), RetentionDays: h.inboundSpamLogRetentionDays()}).
|
||||
WithEntries(in).
|
||||
WithResult(flash, formErr)
|
||||
// A blank list or kind leaves the form on its first choice.
|
||||
|
||||
@@ -364,9 +364,10 @@ func TestFilterListsAddAndRemove(t *testing.T) {
|
||||
has(t, "lists", page,
|
||||
`<div class="notification is-success is-light">`, `Entry added.`,
|
||||
`<h2>Deny</h2><div class="sp-end">1 entry · wins over Allow</div>`, `<h2>Allow</h2><div class="sp-end">1 entry</div>`,
|
||||
`bulk.example <span class="tag is-light">domain</span></td><td class="sp-muted">newsletter</td>`,
|
||||
`198.51.100.0/24 <span class="tag is-light">ip</span></td><td class="sp-muted">—</td>`,
|
||||
`<td class="sp-muted sp-nowrap sp-small">`+time.Now().UTC().Format("2006-01-02")+`</td>`,
|
||||
`<td class="sp-mono sp-small">bulk.example</td><td><button type="button" class="tag is-light" popovertarget="entry-`,
|
||||
`<tr><th>Note</th><td>newsletter</td></tr><tr><th>Added</th><td class="sp-mono sp-small">`+time.Now().UTC().Format("2006-01-02")+`</td></tr><tr><th>Matched</th><td>never in the last 90 days</td></tr>`,
|
||||
`<td class="sp-mono sp-small">198.51.100.0/24</td>`, `<tr><th>Note</th><td>—</td></tr>`,
|
||||
`<td class="sp-muted sp-nowrap">never</td>`,
|
||||
)
|
||||
lacks(t, "lists", page, `No sender is turned away`)
|
||||
|
||||
@@ -635,3 +636,39 @@ func TestHelpHasTheInboundLogAndFilterListsTopics(t *testing.T) {
|
||||
has(t, "log", s.get(h.HandleInboundLog, "/inbound/log", globalPrincipal).Body.String(), `href="/help#inbound-log"`)
|
||||
has(t, "lists", s.get(h.HandleFilterLists, "/inbound/filter-lists", globalPrincipal).Body.String(), `href="/help#filter-lists"`)
|
||||
}
|
||||
|
||||
// An entry's count comes from the journal: a row counts for the entry that
|
||||
// fits it on the list that decided it.
|
||||
func TestFilterListsCountMatchesFromTheJournal(t *testing.T) {
|
||||
s := newInboundLogStand(t)
|
||||
for _, e := range [][3]string{{"deny", "domain", "bulk.example"}, {"allow", "address", "billing@vendor.example"}, {"deny", "ip", "203.0.113.0/24"}} {
|
||||
if _, err := s.h.lists.Add(e[0], e[1], e[2], ""); err != nil {
|
||||
t.Fatalf("Add %v: %v", e, err)
|
||||
}
|
||||
}
|
||||
at := time.Date(2026, 10, 1, 9, 30, 0, 0, time.UTC)
|
||||
for i, row := range []store.InboundSpamEntry{
|
||||
{From: "promo@bulk.example", ClientIP: "198.51.100.9", Decision: store.SpamDecisionReject, Engine: store.SpamEngineRspamd, Detail: "5.7.1 Refused by this server's deny list"},
|
||||
{From: "other@BULK.example", ClientIP: "198.51.100.9", Decision: store.SpamDecisionReject, Engine: store.SpamEngineRspamd, Detail: "5.7.1 Refused by this server's deny list"},
|
||||
{From: "billing@vendor.example", ClientIP: "192.0.2.5", Decision: store.SpamDecisionAccept, Engine: store.SpamEngineRspamd, Detail: "no action, score -99.00 / 15.00; SELFPOST_ALLOW_FROM(-100.00)"},
|
||||
// refused by the filter for its own reasons: nobody's match
|
||||
{From: "promo@bulk.example", ClientIP: "198.51.100.9", Decision: store.SpamDecisionReject, Engine: store.SpamEngineRspamd, Detail: "5.7.1 Spam message rejected"},
|
||||
} {
|
||||
row.InboundDomain, row.To, row.At = "a.example.com", "alice@a.example.com", at.Add(time.Duration(i)*time.Hour)
|
||||
if err := s.st.InsertInboundSpam(row); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
}
|
||||
page := s.get(s.h.HandleFilterLists, "/inbound/filter-lists", globalPrincipal).Body.String()
|
||||
has(t, "lists", page,
|
||||
`<tr><th>Matched</th><td>2 in the last 90 days</td></tr><tr><th>Last match</th><td class="sp-mono sp-small">2026-10-01 10:30</td></tr>`,
|
||||
`<td class="sp-nowrap">2</td>`,
|
||||
`<tr><th>Matched</th><td>1 in the last 90 days</td></tr><tr><th>Last match</th><td class="sp-mono sp-small">2026-10-01 11:30</td></tr>`,
|
||||
`<td class="sp-nowrap">1</td>`,
|
||||
// the network nobody came from
|
||||
`<td class="sp-muted sp-nowrap">never</td>`,
|
||||
)
|
||||
if got := strings.Count(page, `<td class="sp-muted sp-nowrap">never</td>`); got != 1 {
|
||||
t.Errorf("%d entries say never, want the one network", got)
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user