Merge pull request #6 from harness-community/CI-20805

fix[CI-20805]: use WithTLSPolicy instead of WithTLSPortPolicy to preserve user-configured SMTP port
fix: use WithTLSPolicy instead of WithTLSPortPolicy to preserve user-configured SMTP port
2026-06-13 18:42:17 +08:00 · 2026-02-18 01:19:51 +05:30 · 2026-02-17 19:30:07 +05:30 · 2025-10-16 11:35:25 +05:30
1 changed files with 5 additions and 2 deletions
@@ -185,10 +185,13 @@ func (p Plugin) Exec() error {
 	}

 	// Handle STARTTLS policy
+	// Note: Use WithTLSPolicy (not WithTLSPortPolicy) to avoid overriding
+	// the user-configured port. WithTLSPortPolicy treats port 25 as "default/unset"
+	// and silently changes it to 587 for TLSOpportunistic/TLSMandatory.
 	if p.Config.NoStartTLS {
-		options = append(options, mail.WithTLSPortPolicy(mail.NoTLS))
+		options = append(options, mail.WithTLSPolicy(mail.NoTLS))
 	} else {
-		options = append(options, mail.WithTLSPortPolicy(mail.TLSOpportunistic))
+		options = append(options, mail.WithTLSPolicy(mail.TLSOpportunistic))
 	}

 	client, err := mail.NewClient(p.Config.Host, options...)