mirror of
https://github.com/profullstack/agentbbs.git
synced 2026-08-13 22:37:28 +00:00
fix(mailbox): verify SMTP STARTTLS against the mail host, not the dial IP
AgentMail compose/send failed with 'cannot validate certificate for 127.0.0.1 because it doesn't contain any IP SANs': the sender dialed the local relay at 127.0.0.1:25 and net/smtp pinned the TLS ServerName to the dial host, but the relay's cert is for mail.<host>. Reimplement smtpSend (mirrors net/smtp.SendMail) with an overridable IMAPConfig.SMTPServerName; default it to the mail host (AGENTBBS_MAIL_SMTP_SERVERNAME). Now we dial the loopback for relay permission yet verify the real hostname cert — no /etc/hosts hack. setup.sh upserts the new var. Tested against a fake SMTP server (full MAIL/RCPT/DATA flow). Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
This commit is contained in:
parent
25266845e0
commit
55d517feb4
5 changed files with 176 additions and 11 deletions
|
|
@ -2,6 +2,7 @@ package mailbox
|
|||
|
||||
import (
|
||||
"bytes"
|
||||
"crypto/tls"
|
||||
"fmt"
|
||||
"mime"
|
||||
"net"
|
||||
|
|
@ -65,17 +66,54 @@ func recipients(d Draft) []string {
|
|||
return out
|
||||
}
|
||||
|
||||
// smtpSend submits a built message via SMTP. With a non-empty user it does
|
||||
// STARTTLS + AUTH (e.g. smtp.profullstack.com:587); with an empty user it sends
|
||||
// unauthenticated, for a trusted local relay (e.g. the co-located Postfix).
|
||||
func smtpSend(addr, user, pass, from string, rcpts []string, msg []byte) error {
|
||||
// smtpSend submits a built message via SMTP. It does STARTTLS when the server
|
||||
// offers it, verifying the certificate against serverName (or the dial host when
|
||||
// serverName is empty) — this lets us dial a trusted local relay by IP/loopback
|
||||
// while still validating its real hostname certificate. A non-empty user adds
|
||||
// AUTH; an empty user sends unauthenticated, for a relay that trusts the source.
|
||||
//
|
||||
// This mirrors net/smtp.SendMail but with an overridable TLS ServerName, which
|
||||
// SendMail does not support (it pins ServerName to the dial host).
|
||||
func smtpSend(addr, serverName, user, pass, from string, rcpts []string, msg []byte) error {
|
||||
host, _, err := net.SplitHostPort(addr)
|
||||
if err != nil {
|
||||
return fmt.Errorf("smtp addr %q: %w", addr, err)
|
||||
}
|
||||
var auth smtp.Auth
|
||||
if user != "" {
|
||||
auth = smtp.PlainAuth("", user, pass, host)
|
||||
if serverName == "" {
|
||||
serverName = host
|
||||
}
|
||||
return smtp.SendMail(addr, auth, from, rcpts, msg)
|
||||
c, err := smtp.Dial(addr)
|
||||
if err != nil {
|
||||
return fmt.Errorf("smtp dial %s: %w", addr, err)
|
||||
}
|
||||
defer func() { _ = c.Close() }()
|
||||
if ok, _ := c.Extension("STARTTLS"); ok {
|
||||
if err := c.StartTLS(&tls.Config{ServerName: serverName}); err != nil {
|
||||
return fmt.Errorf("smtp starttls (%s): %w", serverName, err)
|
||||
}
|
||||
}
|
||||
if user != "" {
|
||||
if err := c.Auth(smtp.PlainAuth("", user, pass, serverName)); err != nil {
|
||||
return fmt.Errorf("smtp auth: %w", err)
|
||||
}
|
||||
}
|
||||
if err := c.Mail(from); err != nil {
|
||||
return fmt.Errorf("smtp mail from: %w", err)
|
||||
}
|
||||
for _, rcpt := range rcpts {
|
||||
if err := c.Rcpt(rcpt); err != nil {
|
||||
return fmt.Errorf("smtp rcpt %s: %w", rcpt, err)
|
||||
}
|
||||
}
|
||||
w, err := c.Data()
|
||||
if err != nil {
|
||||
return fmt.Errorf("smtp data: %w", err)
|
||||
}
|
||||
if _, err := w.Write(msg); err != nil {
|
||||
return fmt.Errorf("smtp write: %w", err)
|
||||
}
|
||||
if err := w.Close(); err != nil {
|
||||
return fmt.Errorf("smtp close: %w", err)
|
||||
}
|
||||
return c.Quit()
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue