xuans/Smail
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

禁止保存中继时隐式继承本机加密方式
Some checks are pending
Security Checks / security (push) Waiting to run
Details

Browse Source
This commit is contained in:
smail 2026-10-06 03:38:30 +08:00
parent 0a6b13da05
commit 413d933919
2 changed files with 68 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
backend/config/manager_v2.go
View File

@ -902,13 +902,6 @@ func applySectionPayload(current RuntimeConfig, section Section, payload json.Ra
} else {
value.SMTPSectionConfig.Relay.Password = current.SMTP.Relay.Password
}
if smtpRelayConfigured(value.SMTPSectionConfig.Relay) && value.SMTPSectionConfig.Relay.Security == "" {
if ResolveMailSecurity(value.SMTPSectionConfig.Listener) == MailSecurityImplicitTLS {
value.SMTPSectionConfig.Relay.Security = MailSecurityImplicitTLS
} else {
value.SMTPSectionConfig.Relay.Security = MailSecuritySTARTTLS
}
}
candidate.SMTP = value.SMTPSectionConfig
candidate.Email.Policy.LoginVerificationPolicy = candidate.SMTP.Relay.LoginPolicy
case SectionEmail:
@ -935,13 +928,6 @@ func applySectionPayload(current RuntimeConfig, section Section, payload json.Ra
} else {
value.MailSectionConfig.Relay.Password = current.SMTP.Relay.Password
}
if smtpRelayConfigured(value.Relay) && value.Relay.Security == "" {
if ResolveMailSecurity(value.Listener) == MailSecurityImplicitTLS {
value.Relay.Security = MailSecurityImplicitTLS
} else {
value.Relay.Security = MailSecuritySTARTTLS
}
}
candidate.SMTP = SMTPSectionConfig{
Meta: value.Meta,
Listener: value.Listener,

68
backend/config/relay_security_test.go Normal file
View File

@ -0,0 +1,68 @@
package config
import (
"context"
"encoding/json"
"testing"
)
func TestConfigManagerRequiresExplicitIndependentRelaySecurity(t *testing.T) {
for _, section := range []Section{SectionSMTP, SectionMail} {
for _, listenerSecurity := range []string{MailSecurityBoth, MailSecuritySTARTTLS, MailSecurityImplicitTLS} {
for _, relaySecurity := range []string{"", MailSecuritySTARTTLS, MailSecurityImplicitTLS} {
t.Run(string(section)+"_"+listenerSecurity+"_"+relaySecurity, func(t *testing.T) {
root := t.TempDir()
writeRuntimeFixture(t, root, validRuntimeConfig())
options := ConfigLoaderOptions{Validation: RuntimeValidationOptions{HasSuperAdmin: true, Production: true}}
manager, err := NewConfigManager(root, options)
if err != nil {
t.Fatal(err)
}
mail := mailSectionFromRuntime(manager.Snapshot())
mail.Listener.Security = listenerSecurity
mail.Relay = SMTPConfig{
RelayEnabled: true,
RelayHost: "smtp.example.com",
RelayPort: 2525,
Security: relaySecurity,
From: "sender@example.com",
FromDomain: "example.com",
}
var value any = mail
if section == SectionSMTP {
value = SMTPSectionConfig{Meta: mail.Meta, Listener: mail.Listener, Relay: mail.Relay}
}
payload, err := json.Marshal(value)
if err != nil {
t.Fatal(err)
}
updated, err := manager.Update(context.Background(), UpdateRequest{
Section: section, ExpectedGeneration: 1, Payload: payload, Actor: authorizedConfigActor(),
})
if relaySecurity == "" {
if err == nil {
t.Fatal("enabled relay without an explicit security mode must be rejected")
}
if manager.Snapshot().SMTP.Relay.RelayEnabled {
t.Fatal("invalid update changed active relay")
}
return
}
if err != nil {
t.Fatal(err)
}
if _, err := manager.ApplyPendingAuthorized(context.Background(), updated.Generation, updated.CandidateID, section, authorizedConfigActor()); err != nil {
t.Fatal(err)
}
reloaded, err := NewConfigLoader(root, options).Load()
if err != nil {
t.Fatal(err)
}
if reloaded.SMTP.Relay != mail.Relay || reloaded.SMTP.Listener.Security != listenerSecurity {
t.Fatal("independent relay or listener configuration changed after reload")
}
})
}
}
}
}