Stage 3, step 2. Reviewed by Fable (read-only), fixed by Sonnet with a
failing test before each fix, checked by Opus. No Critical or High
finding: route authorization, tenant isolation by id, the /server/
subtree guard, output encoding and the origin check were found sound.
Fixed
- M1: a session was keyed by user name and had no link to the user. A
deleted or renamed user's cookie stayed alive (renewed on every hit,
before the user was looked up) and became a session of whoever was
later created under that name, with that account's role. The
baseline now has sessions.user_id REFERENCES users(id) ON DELETE
CASCADE; the principal is resolved by id and a session is renewed
only after its user was found. RenameSession is gone.
- M2: any user's password change deleted every other user's sessions.
It ends that user's other sessions only.
- L1: a password set on the user form ends that user's sessions (an
administrator editing their own account keeps the current one).
- L2: store, saslpasswd2 and Postfix reload errors were shown verbatim
on the application form, the inbound upstream / recipients forms and
the limit recalculation - pages a domain administrator reaches.
Validation errors (app.ValidationError, inbound.ValidationError,
store.ErrNotAutoRateLimit) keep their text; anything else is logged
and shown as "Could not save ... Check the logs and try again."
- L3: store.ListDMARCReports treated an empty domain list as "all". It
takes a scope now (AllDomains or a list; an empty list is no rows),
and the DMARC hub is open to the domain role as the plan says: the
reports of the assigned domains, without the instance-wide ingest
box. The menu entry was already shown to them and led to a 404.
- I1: /static/ answered with a listing of the embedded assets. A path
that is not a known asset is a 404.
Consequences
- The global DMARC hub lists reports of domains that were deleted
since, too.
- dev/migrate1x (not in the tree) no longer carries sessions over:
everyone signs in again after the transfer.
- docs/schema-migrations.md: the sessions row.
Recorded, not changed - for the owner:
- L4: the report-address select names the followed user and their
address to every administrator of the domain, by default the global
administrator's login name. The plan asks for it.
- L5: a delegated inbound upstream may be any host and port, loopback
and private ranges included - within the trusted-operator model; to
be listed among the accepted risks in security.md.
- L6: Account's profile is saved without the password; becomes a
requirement once password-reset mails to users.email.
- Still echoing an error's text: backup and domain import (global
only), the domain form's validation messages.
Not checked by the review: anything needing the container (e2e, real
Postfix / DNS), CSP behaviour in a live browser.
go test -count=1 ./internal/web/... ./internal/store/... ./internal/app/...
./internal/inbound/... ./internal/dmarc/... ./cmd/panel
ok (all eleven packages; dev/migrate1x also ok)
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
156 lines
4.1 KiB
Go
156 lines
4.1 KiB
Go
// Package inbound owns backup-MX / relay-forwarder domains: the SQLite
|
|
// registry and the Postfix lookup tables (relay_domains, transport_maps,
|
|
// relay_recipient_maps, smtp_tls_policy_maps). It does not listen on port 25
|
|
// itself — postfix-config.sh does that when INBOUND_RELAY_ENABLE is true.
|
|
package inbound
|
|
|
|
import (
|
|
"strings"
|
|
|
|
"github.com/mixeme/selfpost/internal/postfix"
|
|
"github.com/mixeme/selfpost/internal/store"
|
|
)
|
|
|
|
// Maps is the slice of the Postfix manager the inbound service needs.
|
|
type Maps interface {
|
|
RebuildInboundMaps(routes []postfix.InboundRoute) error
|
|
}
|
|
|
|
// Service coordinates inbound-domain state across SQLite and the Postfix maps.
|
|
type Service struct {
|
|
store *store.Store
|
|
maps Maps
|
|
}
|
|
|
|
// NewService builds the inbound service over the shared store and Postfix maps.
|
|
func NewService(st *store.Store, maps Maps) *Service {
|
|
return &Service{store: st, maps: maps}
|
|
}
|
|
|
|
// List returns every inbound domain.
|
|
func (s *Service) List() ([]store.InboundDomain, error) {
|
|
return s.store.ListInboundDomains()
|
|
}
|
|
|
|
// Get returns one inbound domain by id.
|
|
func (s *Service) Get(id int64) (store.InboundDomain, error) {
|
|
return s.store.GetInboundDomain(id)
|
|
}
|
|
|
|
// Add validates the domain name, inserts it, and rebuilds the maps.
|
|
func (s *Service) Add(name string) (store.InboundDomain, error) {
|
|
name = normalizeDomain(name)
|
|
if err := checkDomain(name); err != nil {
|
|
return store.InboundDomain{}, err
|
|
}
|
|
d, err := s.store.AddInboundDomain(name)
|
|
if err != nil {
|
|
return store.InboundDomain{}, err
|
|
}
|
|
if err := s.Resync(); err != nil {
|
|
_ = s.store.DeleteInboundDomain(d.ID)
|
|
return store.InboundDomain{}, err
|
|
}
|
|
return d, nil
|
|
}
|
|
|
|
// SetTransport validates and saves the upstream, then rebuilds the maps.
|
|
func (s *Service) SetTransport(id int64, host, portRaw, tlsMode string) error {
|
|
if _, err := s.store.GetInboundDomain(id); err != nil {
|
|
return err
|
|
}
|
|
host = normalizeHost(host)
|
|
if err := checkHost(host); err != nil {
|
|
return err
|
|
}
|
|
port, err := parsePort(portRaw)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
if err := checkTLSMode(tlsMode); err != nil {
|
|
return err
|
|
}
|
|
if err := s.store.UpdateInboundTransport(id, host, port, tlsMode); err != nil {
|
|
return err
|
|
}
|
|
return s.Resync()
|
|
}
|
|
|
|
// SetRecipients validates the mode and, in list mode, every address, then
|
|
// rebuilds the maps.
|
|
func (s *Service) SetRecipients(id int64, mode string, rawAddresses []string) error {
|
|
d, err := s.store.GetInboundDomain(id)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
if err := checkRecipientMode(mode); err != nil {
|
|
return err
|
|
}
|
|
var addrs []string
|
|
if mode == store.RecipientModeList {
|
|
addrs, err = parseRecipientAddresses(rawAddresses, d.Name)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
}
|
|
if err := s.store.UpdateInboundRecipients(id, mode, addrs); err != nil {
|
|
return err
|
|
}
|
|
return s.Resync()
|
|
}
|
|
|
|
// Delete removes the domain and rebuilds the maps.
|
|
func (s *Service) Delete(id int64) error {
|
|
if err := s.store.DeleteInboundDomain(id); err != nil {
|
|
return err
|
|
}
|
|
return s.Resync()
|
|
}
|
|
|
|
// Resync rebuilds the inbound Postfix maps from SQLite.
|
|
func (s *Service) Resync() error {
|
|
list, err := s.store.ListInboundDomains()
|
|
if err != nil {
|
|
return err
|
|
}
|
|
routes := make([]postfix.InboundRoute, 0, len(list))
|
|
for _, d := range list {
|
|
full, err := s.store.GetInboundDomain(d.ID)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
routes = append(routes, postfix.InboundRoute{
|
|
Domain: full.Name,
|
|
Host: full.Host,
|
|
Port: full.Port,
|
|
TLSMode: full.TLSMode,
|
|
RecipientMode: full.RecipientMode,
|
|
Recipients: full.Recipients,
|
|
})
|
|
}
|
|
return s.maps.RebuildInboundMaps(routes)
|
|
}
|
|
|
|
func parseRecipientAddresses(raw []string, domain string) ([]string, error) {
|
|
seen := make(map[string]bool)
|
|
out := make([]string, 0, len(raw))
|
|
for _, r := range raw {
|
|
addr := strings.ToLower(strings.TrimSpace(r))
|
|
if addr == "" {
|
|
continue
|
|
}
|
|
if err := checkMailbox(addr, domain); err != nil {
|
|
return nil, err
|
|
}
|
|
if seen[addr] {
|
|
continue
|
|
}
|
|
seen[addr] = true
|
|
out = append(out, addr)
|
|
}
|
|
if len(out) == 0 {
|
|
return nil, invalid("listed-recipients mode requires at least one address")
|
|
}
|
|
return out, nil
|
|
}
|