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>
153 lines
5.2 KiB
Go
153 lines
5.2 KiB
Go
package app
|
|
|
|
import (
|
|
"fmt"
|
|
"strings"
|
|
|
|
"github.com/mixeme/selfpost/internal/store"
|
|
)
|
|
|
|
const (
|
|
minLoginLen = 3
|
|
maxLoginLen = 64
|
|
)
|
|
|
|
// ValidationError is a refusal of what was submitted: its text says what the
|
|
// administrator must fix and is written to be shown on the page. Any other
|
|
// error from this package (a failed write, a failed reload) is not, and the
|
|
// caller must not put its text in front of a user.
|
|
type ValidationError struct{ msg string }
|
|
|
|
func (e *ValidationError) Error() string { return e.msg }
|
|
|
|
func invalid(format string, args ...any) error {
|
|
return &ValidationError{msg: fmt.Sprintf(format, args...)}
|
|
}
|
|
|
|
// validateLogin enforces a strict server-side whitelist for the SASL login
|
|
// (security.md). It intentionally excludes '@': the login is stored in sasldb2,
|
|
// where '@' separates the user from the realm, so allowing it would change the
|
|
// account's identity. Client validation is never trusted.
|
|
//
|
|
// The login is the one piece of user input that is passed to saslpasswd2 as a
|
|
// command argument (never through a shell, security.md); this whitelist is what
|
|
// makes that safe.
|
|
func validateLogin(login string) error {
|
|
if len(login) < minLoginLen || len(login) > maxLoginLen {
|
|
return invalid("login must be %d-%d characters", minLoginLen, maxLoginLen)
|
|
}
|
|
for _, r := range login {
|
|
lower := r >= 'a' && r <= 'z'
|
|
upper := r >= 'A' && r <= 'Z'
|
|
digit := r >= '0' && r <= '9'
|
|
if !lower && !upper && !digit && r != '.' && r != '-' && r != '_' {
|
|
return invalid("login may contain only letters, digits, '.', '-' and '_'")
|
|
}
|
|
}
|
|
return nil
|
|
}
|
|
|
|
// validateImportedPassword guards a password taken from a domain-export file
|
|
// (architecture.md § Persistence) before it is written to sasldb2. Our own
|
|
// exports carry base64url passwords, but the file is untrusted input, so we
|
|
// reject an empty value or one containing control characters — saslpasswd2
|
|
// reads the passphrase from stdin and a newline would silently truncate it
|
|
// (security.md).
|
|
func validateImportedPassword(password string) error {
|
|
if password == "" {
|
|
return invalid("imported application password is empty")
|
|
}
|
|
if len(password) > 1024 {
|
|
return invalid("imported application password is too long")
|
|
}
|
|
for _, r := range password {
|
|
if r < 0x20 || r == 0x7f {
|
|
return invalid("imported application password contains control characters")
|
|
}
|
|
}
|
|
return nil
|
|
}
|
|
|
|
// validateAddressMode checks the submitted mode is one of the two known values.
|
|
func validateAddressMode(mode string) error {
|
|
if mode != store.AddressModeWildcard && mode != store.AddressModeList {
|
|
return invalid("invalid address mode")
|
|
}
|
|
return nil
|
|
}
|
|
|
|
// normalizeAddress lower-cases and trims a sender address. Both the local part
|
|
// and domain are treated case-insensitively for the ownership check and for the
|
|
// generated map, matching how addresses are compared elsewhere.
|
|
func normalizeAddress(addr string) string {
|
|
return strings.ToLower(strings.TrimSpace(addr))
|
|
}
|
|
|
|
// validateSenderAddress enforces that a list-mode address is well-formed and,
|
|
// critically, belongs to the application's own domain (security.md). The domain
|
|
// check is done here, before anything is written to a config file — not left to
|
|
// smtpd_sender_login_maps to catch at delivery time. domain must already be a
|
|
// validated, normalised domain name.
|
|
func validateSenderAddress(addr, domain string) error {
|
|
at := strings.LastIndexByte(addr, '@')
|
|
if at < 0 {
|
|
return invalid("%q is not a valid email address", addr)
|
|
}
|
|
local, host := addr[:at], addr[at+1:]
|
|
if host != domain {
|
|
return invalid("%q does not belong to domain %s", addr, domain)
|
|
}
|
|
if err := validateLocalPart(local); err != nil {
|
|
return fmt.Errorf("%q: %w", addr, err)
|
|
}
|
|
return nil
|
|
}
|
|
|
|
// validateLocalPart applies a conservative whitelist to the part before '@'.
|
|
// This is deliberately stricter than RFC 5321 (no quoted local parts) so the
|
|
// value is always safe to write verbatim into the Postfix map (security.md).
|
|
func validateLocalPart(local string) error {
|
|
if local == "" {
|
|
return invalid("missing the part before '@'")
|
|
}
|
|
if local[0] == '.' || local[len(local)-1] == '.' {
|
|
return invalid("local part must not start or end with '.'")
|
|
}
|
|
for i := 0; i < len(local); i++ {
|
|
c := local[i]
|
|
lower := c >= 'a' && c <= 'z'
|
|
digit := c >= '0' && c <= '9'
|
|
if !lower && !digit && c != '.' && c != '-' && c != '_' && c != '+' {
|
|
return invalid("local part may contain only lower-case letters, digits, '.', '-', '_' and '+'")
|
|
}
|
|
}
|
|
return nil
|
|
}
|
|
|
|
// parseAddresses normalises, validates and de-duplicates a list of submitted
|
|
// sender addresses for a list-mode application. It requires at least one address
|
|
// and that each belongs to domain. The returned slice is de-duplicated but keeps
|
|
// submission order stable for display; the store sorts on read.
|
|
func parseAddresses(raw []string, domain string) ([]string, error) {
|
|
seen := make(map[string]bool)
|
|
out := make([]string, 0, len(raw))
|
|
for _, r := range raw {
|
|
addr := normalizeAddress(r)
|
|
if addr == "" {
|
|
continue
|
|
}
|
|
if err := validateSenderAddress(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("list mode requires at least one address")
|
|
}
|
|
return out, nil
|
|
}
|