Merge pull request #608 from NOPTrace/fix/smtp-deadline

fix: set conn deadline in smtp testAnonymousAccess/testOpenRelay to avoid hang on silent servers
2026-09-22 03:10:42 +08:00 · 2026-09-17 12:19:08 +08:00 · 2026-09-17 09:24:05 +08:00
1 changed files with 6 additions and 0 deletions
@@ -243,6 +243,9 @@ func (p *SMTPPlugin) testAnonymousAccess(ctx context.Context, info *common.HostI
 		}
 		defer func() { _ = conn.Close() }()

+		// 修复: 设置读写超时, 防止对只accept不发送banner的服务器(tarpit)永久阻塞
+		_ = conn.SetDeadline(time.Now().Add(session.Config.ModuleTimeout()))
+
 		client, err := smtp.NewClient(conn, info.Host)
 		if err != nil {
 			resultChan <- nil
@@ -295,6 +298,9 @@ func (p *SMTPPlugin) testOpenRelay(ctx context.Context, info *common.HostInfo, s
 		}
 		defer func() { _ = conn.Close() }()

+		// 修复: 设置读写超时, 防止对只accept不发送banner的服务器(tarpit)永久阻塞
+		_ = conn.SetDeadline(time.Now().Add(session.Config.ModuleTimeout()))
+
 		client, err := smtp.NewClient(conn, info.Host)
 		if err != nil {
 			resultChan <- nil