收敛Smail系统通知SMTP通道并更新验收清单

完成Smail系统通知SMTP路由、验证码发送约束和相关回归测试,更新Linux生产测试记录、整改主清单及任务执行清单。
This commit is contained in:
xuans committed 2026-10-01 05:57:07 +08:00
1 parent 37b2ae016b
commit 07229adadc
9 files changed
+110 -1

No files matched your search

@@ -6,6 +6,11 @@ import (
"strings"
)
// UsesSmailSystemAccount 判断通知账号是否为 Smail 系统通知账号。
func (c NotificationConfig) UsesSmailSystemAccount() bool {
return strings.HasPrefix(strings.ToLower(strings.TrimSpace(c.SMTPUsername)), "notify:")
}
// SenderIdentity 根据系统通知账号确定发件人,不能将管理员邮箱当作 SMTP 发件人。
func (c NotificationConfig) SenderIdentity() (string, string, error) {
name := strings.TrimSpace(c.SenderName)
@@ -14,7 +19,7 @@ func (c NotificationConfig) SenderIdentity() (string, string, error) {
return name, email, nil
}
username := strings.ToLower(strings.TrimSpace(c.SMTPUsername))
if strings.HasPrefix(username, "notify:") {
if c.UsesSmailSystemAccount() {
account := strings.TrimPrefix(username, "notify:")
parsed, err := mail.ParseAddress(account)
parts := strings.Split(account, "@")
+10
View File
@@ -3,6 +3,7 @@ package notification
import (
"context"
"errors"
"fmt"
"html"
"net/mail"
)
@@ -42,6 +43,15 @@ func (s *Service) SendSecurityCode(ctx context.Context, recipient, code string)
Text: text, HTML: "<pre>" + html.EscapeString(text) + "</pre>",
CC: []address{}, BCC: []address{}, Attrs: []any{},
}
if s.config.UsesSmailSystemAccount() {
if !s.config.SMTPEnabled {
return errors.New("Smail 系统通知账号必须启用 SMTP 通道")
}
if err := s.sendSMTPWithRetry(ctx, payload); err != nil {
return fmt.Errorf("SMTP 验证码邮件发送失败:%w", err)
}
return nil
}
if s.config.HTTPEnabled {
if err := s.sendHTTPPayload(ctx, payload); err == nil {
return nil
@@ -144,3 +144,22 @@ func TestSecurityCodeSMTPAndHTTPFallback(t *testing.T) {
})
}
}
func TestSecurityCodeSmailSystemAccountRequiresSMTP(t *testing.T) {
var calls atomic.Int32
endpoint := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
calls.Add(1)
w.WriteHeader(http.StatusNoContent)
}))
defer endpoint.Close()
cfg := newTestConfig(endpoint.URL)
cfg.SMTPUsername = "notify:scert@example.test"
cfg.SMTPEnabled = false
service := New(cfg, nil)
if err := service.SendSecurityCode(t.Context(), "bound@example.test", "12345678"); err == nil || !strings.Contains(err.Error(), "必须启用 SMTP") {
t.Fatalf("Smail 系统通知未拒绝 HTTP-only 配置:%v", err)
}
if calls.Load() != 0 {
t.Fatal("Smail 系统通知账号禁止调用 HTTP 通道")
}
}
+3
View File
@@ -122,6 +122,9 @@ func (s *Service) sendHTTP(ctx context.Context, event Event) error {
if !s.config.HTTPEnabled {
return nil
}
if s.config.UsesSmailSystemAccount() {
return errors.New("Smail 系统通知账号只能通过 SMTP 通道发送")
}
if err := ctx.Err(); err != nil {
return err
}
+10
View File
@@ -25,6 +25,16 @@ func (s *Service) Send(ctx context.Context, event Event) error {
if err := ctx.Err(); err != nil {
return err
}
if s.config.UsesSmailSystemAccount() {
if !s.config.SMTPEnabled {
return errors.New("Smail 系统通知账号必须启用 SMTP 通道")
}
payload, err := s.buildPayload(event)
if err != nil {
return err
}
return s.sendSMTPWithRetry(ctx, payload)
}
var errs []error
if s.config.HTTPEnabled {
if err := s.sendHTTP(ctx, event); err != nil {
@@ -12,6 +12,8 @@ import (
"io"
"math/big"
"net"
"net/http"
"net/http/httptest"
"strings"
"sync"
"testing"
@@ -313,6 +315,35 @@ func TestSmailSystemSenderUsesSameEnvelopeAndHeader(t *testing.T) {
}
}
func TestSmailSystemNotificationUsesSMTPOnly(t *testing.T) {
server := newSMTPTestServer(t, true, false)
host, port := server.address()
calls := 0
endpoint := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
calls++
w.WriteHeader(http.StatusBadGateway)
}))
defer endpoint.Close()
cfg := smtpTestConfig(host, port, "implicit_tls")
cfg.SMTPUsername = "notify:scert@example.test"
cfg.HTTPEnabled = true
cfg.Endpoint = endpoint.URL
cfg.HTTPPath = "/api/email/send"
service := New(cfg, credentialReaderStub{values: map[string]string{"password": "test-only-notification-credential"}})
service.smtpTLSConfig = server.clientTLSConfig
if err := service.Send(context.Background(), Event{Type: "certificate_issue", Status: "success", Domain: "example.test"}); err != nil {
t.Fatal(err)
}
if calls != 0 {
t.Fatalf("Smail 系统通知不应调用 HTTP 通道,调用次数:%d", calls)
}
server.mu.Lock()
defer server.mu.Unlock()
if len(server.messages) != 1 {
t.Fatalf("SMTP 系统通知数量错误:%d", len(server.messages))
}
}
func TestSMTPStartTLS(t *testing.T) {
server := newSMTPTestServer(t, false, true)
host, port := server.address()