up

midoks · Sep 30, 2022 · 31ec46c · 31ec46c
1 parent 1912b6d
commit 31ec46c
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 10 deletions.
diff --git a/internal/imap/imap.go b/internal/imap/imap.go
@@ -128,13 +128,12 @@ func (this *ImapServer) D(format string, args ...interface{}) {
 	info := fmt.Sprintf(format, args...)
 	info = strings.TrimSpace(info)
 
-	if this.LinkSSL {
-		log.Debugf("[SSL]:%s", info)
-		return
-	}
-
 	if conf.Imap.Debug {
 		log.Debug(info)
+
+		if this.LinkSSL {
+			log.Debugf("[SSL]:%s", info)
+		}
 	}
 }
 
@@ -676,15 +675,15 @@ func (this *ImapServer) StartSSLPort(port int) {
 	addr := fmt.Sprintf(":%d", port)
 	this.nlSSL, err = tls.Listen("tcp", addr, this.TLSConfig)
 	if err != nil {
-		log.Infof("imap[ssl][conn][listen]: %v", err)
+		this.D("[imap][ssl][conn][listen]: %v", err)
 		return
 	}
 	defer this.nlSSL.Close()
 
 	for {
 		this.nlConnSSL, err = this.nlSSL.Accept()
 		if err != nil {
-			log.Infof("imap[ssl][conn][accept]: %v", err)
+			this.D("[imap][ssl][conn][accept]: %v", err)
 			return
 		}
 		this.start(this.nlConnSSL)

diff --git a/internal/pop3/pop3.go b/internal/pop3/pop3.go
@@ -427,8 +427,16 @@ func (this *Pop3Server) handle() {
 	}
 }
 
+// func (this *Pop3Server) initTLSConfigBk() {
+// 	this.TLSConfig = tools.InitAutoMakeTLSConfig()
+// }
+
 func (this *Pop3Server) initTLSConfig() {
-	this.TLSConfig = tools.InitAutoMakeTLSConfig()
+	if conf.Ssl.Enable {
+		this.TLSConfig = tools.InitAutoMakeTLSConfigWithArgs(conf.Ssl.CertFile, conf.Ssl.KeyFile)
+	} else {
+		this.TLSConfig = tools.InitAutoMakeTLSConfig()
+	}
 }
 
 func (this *Pop3Server) ready() {
@@ -456,7 +464,7 @@ func (this *Pop3Server) StartPort(port int) {
 	addr := fmt.Sprintf(":%d", port)
 	ln, err := net.Listen("tcp", addr)
 	if err != nil {
-		this.D("pop[start]:%s", err)
+		this.D("[pop][start]:%s", err)
 		return
 	}
 	defer ln.Close()
@@ -476,7 +484,7 @@ func (this *Pop3Server) StartSSLPort(port int) {
 	addr := fmt.Sprintf(":%d", port)
 	ln, err := tls.Listen("tcp", addr, this.TLSConfig)
 	if err != nil {
-		this.D("pop[start][ssl]:%T", err)
+		this.D("[pop][start][ssl]:%T", err)
 		return
 	}
 	defer ln.Close()