fix(reporter/email): do not use Client.StartTLS

Author: MaineK00n

reporter/email.go

@@ -92,13 +92,11 @@ func (e *emailSender) sendMail(smtpServerAddr, message string) (err error) {
 	var c *smtp.Client
 	var auth sasl.Client
 	emailConf := e.conf
-	//TLS Config
 	tlsConfig := &tls.Config{
 		ServerName: emailConf.SMTPAddr,
 	}
 	switch emailConf.SMTPPort {
 	case "465":
-		//New TLS connection
 		c, err = smtp.DialTLS(smtpServerAddr, tlsConfig)
 		if err != nil {
 			return xerrors.Errorf("Failed to create TLS connection to SMTP server: %w", err)
@@ -111,16 +109,17 @@ func (e *emailSender) sendMail(smtpServerAddr, message string) (err error) {
 	}
 	defer c.Close()
 
-	if err = c.Hello("localhost"); err != nil {
-		return xerrors.Errorf("Failed to send Hello command: %w", err)
-	}
-
 	if ok, _ := c.Extension("STARTTLS"); ok {
-		if err := c.StartTLS(tlsConfig); err != nil {
-			return xerrors.Errorf("Failed to STARTTLS: %w", err)
+		c, err = smtp.DialStartTLS(smtpServerAddr, tlsConfig)
+		if err != nil {
+			return xerrors.Errorf("Failed to create STARTTLS connection to SMTP server: %w", err)
 		}
 	}
 
+	if err = c.Hello("localhost"); err != nil {
+		return xerrors.Errorf("Failed to send Hello command: %w", err)
+	}
+
 	if ok, param := c.Extension("AUTH"); ok {
 		authList := strings.Split(param, " ")
 		auth = e.newSaslClient(authList)