mixandClaude Opus 5.5
f37424d9fc
The owner's decision of 2026-10-10, as the plan has it (Who sees what:
for the global administrator the filter's socket is one of the milter
sockets on Health and Overview). Written by Sonnet, reviewed by Opus.
- internal/health: CheckMilter probes an address in Postfix's two
forms. unix:/path is the existing stat; inet:host:port is a TCP
dial with a 1 s cap, closed at once, nothing written. An address in
neither form is reported as not checkable, never as fine. Details
are plain sentences ("No answer from antispam:11332 within 1 s.",
"Connection to ... refused.", "The name ... could not be
resolved.") and never the Go error text.
- Health: with the filter on, a third row "Spam filter - inbound"
with the configured address; it counts in the socket status and in
Overview's Milter sockets card. A filter that does not answer is an
error when INBOUND_ANTISPAM_MILTER_ACTION is tempfail (inbound mail
is deferred) and a warning otherwise (mail goes through
unfiltered), and the row says which. With the filter off nothing
changes.
- Both pages are global-only; a test checks a domain administrator
never receives the address.
The dial runs with the other checks on every request and poll of
Overview and Health (5 s active, 30 s idle, none while the tab is
hidden): a dead filter costs a poll at most 1 s, and a live one sees a
connect-and-close at that rhythm per open tab.
Not changed: fixtures and screenshots (the mockup draws two sockets),
help texts. The CHANGELOG line comes with the documentation step, which
is editing that file now.
go test -count=1 ./internal/health/... ./internal/web/... ./cmd/panel
ok (seven packages)
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
60 lines
1.6 KiB
Go
60 lines
1.6 KiB
Go
package health
|
|
|
|
import (
|
|
"fmt"
|
|
"os"
|
|
)
|
|
|
|
// Socket is the state of one milter socket Postfix connects to.
|
|
type Socket struct {
|
|
Name string
|
|
// Note qualifies the name where the socket is not one of the two Postfix
|
|
// always has ("inbound"); the Health table shows it beside the name.
|
|
Note string
|
|
Path string
|
|
Present bool
|
|
Status Status
|
|
Detail string
|
|
}
|
|
|
|
// CheckSocket stats a milter socket. required distinguishes the two milters:
|
|
// OpenDKIM runs with default_action=tempfail, so a missing socket stops mail
|
|
// leaving the server, while the journal-milter fails open — mail still goes out,
|
|
// only the send log stops being written.
|
|
func CheckSocket(name, path string, required bool) Socket {
|
|
s := Socket{Name: name, Path: path}
|
|
if path == "" {
|
|
s.Status = StatusUnknown
|
|
s.Detail = "No socket path is configured."
|
|
return s
|
|
}
|
|
fi, err := os.Stat(path)
|
|
switch {
|
|
case err != nil:
|
|
s.Status = missingStatus(required)
|
|
s.Detail = missingDetail(name, required)
|
|
case fi.Mode()&os.ModeSocket == 0:
|
|
s.Status = missingStatus(required)
|
|
s.Detail = fmt.Sprintf("%s exists but is not a socket.", path)
|
|
default:
|
|
s.Present = true
|
|
s.Status = StatusOK
|
|
s.Detail = "Listening"
|
|
}
|
|
return s
|
|
}
|
|
|
|
func missingStatus(required bool) Status {
|
|
if required {
|
|
return StatusError
|
|
}
|
|
return StatusWarn
|
|
}
|
|
|
|
func missingDetail(name string, required bool) string {
|
|
if required {
|
|
return fmt.Sprintf("The %s socket is missing. Postfix rejects mail with a temporary error until it is back.", name)
|
|
}
|
|
return fmt.Sprintf("The %s socket is missing. Mail still goes out, but the send log is not being written.", name)
|
|
}
|