参考PMail优化邮件加密模式
Security Checks / security (push) Waiting to run

This commit is contained in:
xuans committed 2026-09-08 00:19:04 +08:00
1 parent c469513c1f
commit 566040afc3
5 files changed
+74 -60

No files matched your search

+1 -4
View File
@@ -6,7 +6,7 @@ const (
MailSecurityImplicitTLS = "implicit_tls"
)
// 邮件监听与发信中继相互独立。未设置加密模式的旧配置继续同时开放两套监听。
// 邮件监听与发信中继相互独立。全部启用模式同时开放两套安全监听。
type SMTPListenerConfig struct {
Port int `json:"port"`
STARTTLSPort int `json:"starttlsPort"`
@@ -80,9 +80,6 @@ func ResolveMailPorts(smtp SMTPSectionConfig, email EmailSectionConfig) MailPort
}
func validateMailListeners(smtp SMTPSectionConfig, email EmailSectionConfig) error {
if smtp.Listener.Security == MailSecurityBoth {
return ErrInvalidRuntimeConfig
}
security := ResolveMailSecurity(smtp.Listener)
if security != MailSecurityBoth && security != MailSecuritySTARTTLS && security != MailSecurityImplicitTLS {
return ErrInvalidRuntimeConfig
+4 -3
View File
@@ -152,6 +152,7 @@ func TestUnifiedMailSecurityResolvesOnlySelectedClientListeners(t *testing.T) {
security string
want MailPorts
}{
{MailSecurityBoth, MailPorts{SMTP: 25, SMTPSTARTTLS: 587, SMTPTLS: 465, IMAP: 993, POP3: 110, POP3TLS: 995}},
{MailSecuritySTARTTLS, MailPorts{SMTP: 25, SMTPSTARTTLS: 587, IMAP: 143, POP3: 110}},
{MailSecurityImplicitTLS, MailPorts{SMTP: 25, SMTPTLS: 465, IMAP: 993, POP3TLS: 995}},
} {
@@ -200,13 +201,13 @@ func TestMailListenerValidationRejectsUnknownSecurity(t *testing.T) {
}
}
func TestMailListenerValidationAllowsLegacyEmptySecurityButRejectsExplicitBoth(t *testing.T) {
func TestMailListenerValidationAllowsLegacyEmptyAndExplicitBothSecurity(t *testing.T) {
runtime := validRuntimeConfig()
if err := ValidateRuntimeConfig(runtime, RuntimeValidationOptions{HasSuperAdmin: true}); err != nil {
t.Fatalf("legacy empty security validation = %v", err)
}
runtime.SMTP.Listener.Security = MailSecurityBoth
if err := ValidateRuntimeConfig(runtime, RuntimeValidationOptions{HasSuperAdmin: true}); !errors.Is(err, ErrInvalidRuntimeConfig) {
t.Fatalf("explicit both validation = %v, want invalid runtime configuration", err)
if err := ValidateRuntimeConfig(runtime, RuntimeValidationOptions{HasSuperAdmin: true}); err != nil {
t.Fatalf("explicit both validation = %v", err)
}
}
+36 -23
View File
@@ -525,31 +525,44 @@ func TestConfigManagerMailSectionAppliesBothPartitionsWithoutMailFile(t *testing
func TestConfigManagerMailSectionAcceptsUnifiedSecurityModes(t *testing.T) {
tests := []struct {
name string
security string
listener SMTPListenerConfig
imap IMAPListenerConfig
pop3 POP3ListenerConfig
relayPort int
want MailPorts
name string
security string
relaySecurity string
listener SMTPListenerConfig
imap IMAPListenerConfig
pop3 POP3ListenerConfig
relayPort int
want MailPorts
}{
{
name: "starttls",
security: MailSecuritySTARTTLS,
listener: SMTPListenerConfig{Port: 25, STARTTLSPort: 587, Security: MailSecuritySTARTTLS},
imap: IMAPListenerConfig{TLSPort: 143},
pop3: POP3ListenerConfig{Port: 110},
relayPort: 587,
want: MailPorts{SMTP: 25, SMTPSTARTTLS: 587, IMAP: 143, POP3: 110},
name: "both",
security: MailSecurityBoth,
relaySecurity: MailSecuritySTARTTLS,
listener: SMTPListenerConfig{Port: 25, STARTTLSPort: 587, TLSPort: 465, Security: MailSecurityBoth},
imap: IMAPListenerConfig{TLSPort: 993},
pop3: POP3ListenerConfig{Port: 110, TLSPort: 995},
relayPort: 587,
want: MailPorts{SMTP: 25, SMTPSTARTTLS: 587, SMTPTLS: 465, IMAP: 993, POP3: 110, POP3TLS: 995},
},
{
name: "implicit_tls",
security: MailSecurityImplicitTLS,
listener: SMTPListenerConfig{Port: 25, TLSPort: 465, Security: MailSecurityImplicitTLS},
imap: IMAPListenerConfig{TLSPort: 993},
pop3: POP3ListenerConfig{TLSPort: 995},
relayPort: 465,
want: MailPorts{SMTP: 25, SMTPTLS: 465, IMAP: 993, POP3TLS: 995},
name: "starttls",
security: MailSecuritySTARTTLS,
relaySecurity: MailSecuritySTARTTLS,
listener: SMTPListenerConfig{Port: 25, STARTTLSPort: 587, Security: MailSecuritySTARTTLS},
imap: IMAPListenerConfig{TLSPort: 143},
pop3: POP3ListenerConfig{Port: 110},
relayPort: 587,
want: MailPorts{SMTP: 25, SMTPSTARTTLS: 587, IMAP: 143, POP3: 110},
},
{
name: "implicit_tls",
security: MailSecurityImplicitTLS,
relaySecurity: MailSecurityImplicitTLS,
listener: SMTPListenerConfig{Port: 25, TLSPort: 465, Security: MailSecurityImplicitTLS},
imap: IMAPListenerConfig{TLSPort: 993},
pop3: POP3ListenerConfig{TLSPort: 995},
relayPort: 465,
want: MailPorts{SMTP: 25, SMTPTLS: 465, IMAP: 993, POP3TLS: 995},
},
}
@@ -568,7 +581,7 @@ func TestConfigManagerMailSectionAcceptsUnifiedSecurityModes(t *testing.T) {
mail.IMAP = test.imap
mail.POP3 = test.pop3
mail.Relay.RelayPort = test.relayPort
mail.Relay.Security = test.security
mail.Relay.Security = test.relaySecurity
mail.Relay.FromDomain = "example.com"
mail.Relay.VerificationEnabled = true
payload, err := json.Marshal(mail)
@@ -599,7 +612,7 @@ func TestConfigManagerMailSectionAcceptsUnifiedSecurityModes(t *testing.T) {
if got := ResolveMailPorts(reloaded.SMTP, reloaded.Email); got != test.want {
t.Fatalf("reloaded ports = %+v, want %+v", got, test.want)
}
if ResolveMailSecurity(reloaded.SMTP.Listener) != test.security || NormalizeMailSecurity(reloaded.SMTP.Relay.Security) != test.security {
if ResolveMailSecurity(reloaded.SMTP.Listener) != test.security || NormalizeMailSecurity(reloaded.SMTP.Relay.Security) != test.relaySecurity {
t.Fatalf("reloaded security modes are not unified: listener=%q relay=%q", reloaded.SMTP.Listener.Security, reloaded.SMTP.Relay.Security)
}
})