From 7abe44a59d7bf74762c6967336c775e7d3dc41b0 Mon Sep 17 00:00:00 2001
From: smail <likb_blue@163.com>
Date: Mon, 31 Aug 2026 00:02:50 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A1=A5=E5=85=85=E9=82=AE=E4=BB=B6=E7=AB=AF?=
 =?UTF-8?q?=E5=8F=A3=E5=BF=AB=E7=85=A7=E6=B5=8B=E8=AF=95=E5=B9=B6=E4=BF=9D?=
 =?UTF-8?q?=E7=95=99IMAP=E5=AE=89=E5=85=A8=E7=AB=AF=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 server/config/runtime_access_test.go     | 80 ++++++++++++++++++++++++
 server/listen/imap_server/imap_server.go |  6 +-
 2 files changed, 83 insertions(+), 3 deletions(-)

diff --git a/server/config/runtime_access_test.go b/server/config/runtime_access_test.go
index 0cd92ed..3c77d6d 100644
--- a/server/config/runtime_access_test.go
+++ b/server/config/runtime_access_test.go
@@ -2,6 +2,22 @@ package config
 
 import "testing"
 
+type runtimeAccessSnapshotStore struct {
+	runtime RuntimeConfig
+}
+
+func (s runtimeAccessSnapshotStore) Validate(RuntimeConfig) error {
+	return nil
+}
+
+func (s runtimeAccessSnapshotStore) Publish(RuntimeConfig) error {
+	return nil
+}
+
+func (s runtimeAccessSnapshotStore) Snapshot() (RuntimeConfig, error) {
+	return cloneRuntimeConfig(s.runtime), nil
+}
+
 func TestCurrentConfigReturnsIndependentSnapshot(t *testing.T) {
 	previousInstance := Instance
 	defer func() {
@@ -43,3 +59,67 @@ func TestPublishConfigSnapshotClearsValue(t *testing.T) {
 		t.Fatalf("expected cleared snapshot, got %+v", got)
 	}
 }
+
+func TestCurrentMailPortsUsesSafeDefaultsWithoutRuntimeManager(t *testing.T) {
+	previousManager := CurrentManager()
+	defer SetRuntimeManager(previousManager)
+	SetRuntimeManager(nil)
+
+	if got := CurrentMailPorts(); got != (MailPorts{SMTP: 25, IMAP: 143, POP3: 110}) {
+		t.Fatalf("mail ports = %+v, want safe defaults", got)
+	}
+}
+
+func TestCurrentMailPortsReadsEmailPolicySnapshot(t *testing.T) {
+	previousManager := CurrentManager()
+	defer SetRuntimeManager(previousManager)
+
+	runtime := validRuntimeConfig()
+	runtime.Email.Policy.SMTPPort = 2525
+	runtime.Email.Policy.IMAPPort = 1143
+	runtime.Email.Policy.POP3Port = 1110
+	SetRuntimeManager(&ConfigManager{snapshots: runtimeAccessSnapshotStore{runtime: runtime}})
+
+	if got := CurrentMailPorts(); got != (MailPorts{SMTP: 2525, IMAP: 1143, POP3: 1110}) {
+		t.Fatalf("mail ports = %+v, want policy ports", got)
+	}
+}
+
+func TestCurrentMailPortsFallsBackForInvalidPolicyValues(t *testing.T) {
+	previousManager := CurrentManager()
+	defer SetRuntimeManager(previousManager)
+
+	runtime := validRuntimeConfig()
+	runtime.Email.Policy.SMTPPort = 0
+	runtime.Email.Policy.IMAPPort = 65536
+	runtime.Email.Policy.POP3Port = -1
+	SetRuntimeManager(&ConfigManager{snapshots: runtimeAccessSnapshotStore{runtime: runtime}})
+
+	if got := CurrentMailPorts(); got != (MailPorts{SMTP: 25, IMAP: 143, POP3: 110}) {
+		t.Fatalf("mail ports = %+v, want defaults for invalid policy values", got)
+	}
+}
+
+func TestCurrentMailPortsDoesNotReadLegacyRelayPort(t *testing.T) {
+	previousManager := CurrentManager()
+	defer SetRuntimeManager(previousManager)
+
+	runtime := validRuntimeConfig()
+	runtime.Root.SMTP.RelayPort = 2465
+	runtime.Email.Policy = EmailConfig{}
+	SetRuntimeManager(&ConfigManager{snapshots: runtimeAccessSnapshotStore{runtime: runtime}})
+
+	if got := CurrentMailPorts(); got != (MailPorts{SMTP: 25, IMAP: 143, POP3: 110}) {
+		t.Fatalf("mail ports = %+v, legacy relay port leaked into listener ports", got)
+	}
+}
+
+func TestCurrentMailPortsUsesDefaultsForUnavailableSnapshot(t *testing.T) {
+	previousManager := CurrentManager()
+	defer SetRuntimeManager(previousManager)
+	SetRuntimeManager(&ConfigManager{})
+
+	if got := CurrentMailPorts(); got != (MailPorts{SMTP: 25, IMAP: 143, POP3: 110}) {
+		t.Fatalf("mail ports = %+v, want defaults for unavailable snapshot", got)
+	}
+}
diff --git a/server/listen/imap_server/imap_server.go b/server/listen/imap_server/imap_server.go
index f2868b4..e44680f 100644
--- a/server/listen/imap_server/imap_server.go
+++ b/server/listen/imap_server/imap_server.go
@@ -27,9 +27,9 @@ func StarTLS() error {
 		return err
 	}
 	instanceTLS = server
-	port := config.CurrentMailPorts().IMAP
-	log.Infof("IMAP With TLS Server Start On Port :%d", port)
-	if err := instanceTLS.ListenAndServeTLS(fmt.Sprintf(":%d", port)); err != nil {
+	const imapTLSPort = 993
+	log.Infof("IMAP With TLS Server Start On Port :%d", imapTLSPort)
+	if err := instanceTLS.ListenAndServeTLS(fmt.Sprintf(":%d", imapTLSPort)); err != nil {
 		return fmt.Errorf("serve IMAP TLS: %w", err)
 	}
 	return nil