Owner, 2026-10-18: "Оба предложения делаем"; the mockup is c10cd78. The
security audit's M7: Required is Postfix's encrypt level, which checks no
certificate - it keeps the mail from a listener, not from one who answers
in the upstream's place.
- A fourth TLS mode, Verified, stored as Postfix's level secure (migration
0014 rebuilds inbound_transports with the wider CHECK; schema 14) and
written to the TLS policy map like the others. Postfix matches the
certificate against the next hop's name (smtp_tls_secure_cert_match =
nexthop, dot-nexthop, the default; postconf(5)), so Verified is refused
for an upstream given by address (checkSecureHost).
- Postfix's SMTP client trusts Debian's ca-certificates bundle
(smtp_tls_CAfile): Postfix trusts none by default (DEF_SMTP_TLS_CA_FILE
"", DEF_TLS_APPEND_DEF_CA 0). The levels may and encrypt only log the
verdict, so mail to recipients' MX is unchanged.
- The page: the select's fourth option, a help line under it, the lead
"over verified TLS", the list's tag "verified"; Help word for word with
the mockup; guide § Inbound relay, with a posttls-finger command to try
an upstream first.
Tests: TestVerifiedTLSNeedsTheUpstreamsName, TestRenderInboundMapsSecure,
TestUpstreamTLSModeSecure; schema tests at 14. e2e
inbound_upstream_verified_tls: an address refused, a name saved as
"[sink]:25 secure" in tls_policy, the page says verified, the CA file set
and present, and posttls-finger -l secure with it calls the stand's
self-signed port 25 "Untrusted" (the stand has no TLS upstream). make e2e
(65 passed) and go vet + go test (26 packages) on the test server for this
tree. Tried against the live upstream from the 2.14.5 container:
mc-ent.mixfed.ru gives "Verified TLS connection established".
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
157 lines
4.1 KiB
Go
157 lines
4.1 KiB
Go
package inbound
|
|
|
|
import (
|
|
"fmt"
|
|
"net"
|
|
"strconv"
|
|
"strings"
|
|
)
|
|
|
|
// 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...)}
|
|
}
|
|
|
|
func normalizeDomain(name string) string {
|
|
return strings.ToLower(strings.TrimSpace(name))
|
|
}
|
|
|
|
func normalizeHost(host string) string {
|
|
host = strings.ToLower(strings.TrimSpace(host))
|
|
if strings.HasPrefix(host, "[") && strings.HasSuffix(host, "]") {
|
|
host = host[1 : len(host)-1]
|
|
}
|
|
return host
|
|
}
|
|
|
|
func checkDomain(name string) error {
|
|
if name == "" {
|
|
return invalid("domain is required")
|
|
}
|
|
if len(name) > 253 {
|
|
return invalid("domain must be at most 253 characters")
|
|
}
|
|
labels := strings.Split(name, ".")
|
|
if len(labels) < 2 {
|
|
return invalid("domain must include at least one dot (e.g. example.com)")
|
|
}
|
|
for _, label := range labels {
|
|
if err := checkLabel(label); err != nil {
|
|
return err
|
|
}
|
|
}
|
|
return nil
|
|
}
|
|
|
|
func checkHost(host string) error {
|
|
if host == "" {
|
|
return invalid("host is required")
|
|
}
|
|
if len(host) > 253 {
|
|
return invalid("host must be at most 253 characters")
|
|
}
|
|
if ip := net.ParseIP(host); ip != nil {
|
|
return nil
|
|
}
|
|
for _, label := range strings.Split(host, ".") {
|
|
if err := checkLabel(label); err != nil {
|
|
return fmt.Errorf("host is invalid: %w", err)
|
|
}
|
|
}
|
|
return nil
|
|
}
|
|
|
|
func checkLabel(label string) error {
|
|
if len(label) == 0 {
|
|
return invalid("must not contain an empty label")
|
|
}
|
|
if len(label) > 63 {
|
|
return invalid("each label must be at most 63 characters")
|
|
}
|
|
if label[0] == '-' || label[len(label)-1] == '-' {
|
|
return invalid("labels must not start or end with '-'")
|
|
}
|
|
for i := 0; i < len(label); i++ {
|
|
c := label[i]
|
|
lower := c >= 'a' && c <= 'z'
|
|
digit := c >= '0' && c <= '9'
|
|
if !lower && !digit && c != '-' {
|
|
return invalid("may contain only lower-case letters, digits, '.' and '-'")
|
|
}
|
|
}
|
|
return nil
|
|
}
|
|
|
|
func parsePort(raw string) (int, error) {
|
|
raw = strings.TrimSpace(raw)
|
|
if raw == "" {
|
|
return 0, invalid("port is required")
|
|
}
|
|
n, err := strconv.Atoi(raw)
|
|
if err != nil || n < 1 || n > 65535 {
|
|
return 0, invalid("port must be between 1 and 65535")
|
|
}
|
|
return n, nil
|
|
}
|
|
|
|
func checkTLSMode(mode string) error {
|
|
switch mode {
|
|
case "may", "encrypt", "secure", "none":
|
|
return nil
|
|
default:
|
|
return invalid("invalid TLS mode")
|
|
}
|
|
}
|
|
|
|
// checkSecureHost refuses Verified TLS for an upstream given by address:
|
|
// Postfix's secure level matches the certificate against the next hop's name
|
|
// (smtp_tls_secure_cert_match = nexthop, dot-nexthop; Postfix 3.10.13,
|
|
// postconf(5): "the transport next-hop configured for the domain stripped of
|
|
// ... enclosing square brackets and trailing port"), and a certificate names
|
|
// hosts, not addresses.
|
|
func checkSecureHost(host, mode string) error {
|
|
if mode == "secure" && net.ParseIP(host) != nil {
|
|
return invalid("Verified TLS checks the upstream's certificate against its name: give the upstream by name, not by address")
|
|
}
|
|
return nil
|
|
}
|
|
|
|
func checkRecipientMode(mode string) error {
|
|
switch mode {
|
|
case "list", "any":
|
|
return nil
|
|
default:
|
|
return invalid("invalid recipient mode")
|
|
}
|
|
}
|
|
|
|
func checkMailbox(addr, domain string) error {
|
|
at := strings.LastIndexByte(addr, '@')
|
|
if at <= 0 || at >= len(addr)-1 {
|
|
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 local == "" || local[0] == '.' || local[len(local)-1] == '.' {
|
|
return invalid("%q: invalid local part", addr)
|
|
}
|
|
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("%q: local part contains invalid characters", addr)
|
|
}
|
|
}
|
|
return nil
|
|
}
|