发邮件支持 tls 加密

zhima1234 · zhima1234 · commit d23a492f03ae · 2017-05-23T20:30:08.000+08:00
diff --git a/config/env.sample.ini b/config/env.sample.ini
@@ -33,6 +33,8 @@ smtp_username = xxxx@studygolang.com
 smtp_password = xxx
 smtp_host = smtp.exmail.qq.com
 smtp_port = 25
+; 是否 tls 安全传输
+tls = 0
 ; 发件人
 from_email = xxxx@studygolang.com
 
diff --git a/getpkg.sh b/getpkg.sh
@@ -31,6 +31,7 @@ else
 	"github.com/robfig/cron" "github.com/gorilla/sessions" "github.com/polaris1119/echoutils"
 	"golang.org/x/net/websocket" "github.com/polaris1119/slices" "github.com/qiniu/api.v6"
 	"github.com/polaris1119/times" "github.com/PuerkitoBio/goquery" "github.com/go-validator/validator"
+	"github.com/polaris1119/email"
 	"github.com/gorilla/schema" "github.com/facebookgo/grace/gracehttp")
 
 	for pkg in "${pkgs[@]}"; do
diff --git a/src/logic/email.go b/src/logic/email.go
@@ -8,6 +8,7 @@ package logic
 
 import (
 	"bytes"
+	"crypto/tls"
 	"fmt"
 	"global"
 	"html/template"
@@ -16,6 +17,7 @@ import (
 	"time"
 
 	"github.com/polaris1119/config"
+	"github.com/polaris1119/email"
 	"github.com/polaris1119/goutils"
 	"github.com/polaris1119/logger"
 
@@ -29,24 +31,35 @@ type EmailLogic struct{}
 var DefaultEmail = EmailLogic{}
 
 // SendMail 发送电子邮件
-func (EmailLogic) SendMail(subject, content string, tos []string) error {
+func (EmailLogic) SendMail(subject, content string, tos []string) (err error) {
 	emailConfig, _ := config.ConfigFile.GetSection("email")
-	message := `From: ` + WebsiteSetting.Name + `<` + emailConfig["from_email"] + `>
-To: ` + strings.Join(tos, ",") + `
-Subject: ` + subject + `
-Content-Type: text/html;charset=UTF-8
 
-` + content
+	e := email.NewEmail()
+	e.From = WebsiteSetting.Name + ` <` + emailConfig["from_email"] + `>`
+	e.To = tos
+	e.Subject = subject
+	e.HTML = []byte(content)
 
-	smtpAddr := emailConfig["smtp_host"] + ":" + emailConfig["smtp_port"]
 	auth := smtp.PlainAuth("", emailConfig["smtp_username"], emailConfig["smtp_password"], emailConfig["smtp_host"])
-	err := smtp.SendMail(smtpAddr, auth, emailConfig["from_email"], tos, []byte(message))
+	smtpAddr := emailConfig["smtp_host"] + ":" + emailConfig["smtp_port"]
+
+	if goutils.MustBool(emailConfig["tls"]) {
+		err = e.Send(smtpAddr, auth)
+	} else {
+		tlsConfig := &tls.Config{
+			InsecureSkipVerify: true,
+			ServerName:         emailConfig["smtp_host"],
+		}
+
+		err = e.SendWithTLS(smtpAddr, auth, tlsConfig)
+	}
+
 	if err != nil {
 		logger.Errorln("Send Mail to", strings.Join(tos, ","), "error:", err)
-		return err
+		return
 	}
 	logger.Infoln("Send Mail to", strings.Join(tos, ","), "Successfully")
-	return nil
+	return
 }
 
 // 保存uuid和email的对应关系（TODO:重启如何处理）
diff --git a/src/vendor/manifest b/src/vendor/manifest
@@ -266,6 +266,12 @@
 			"revision": "5e14d4b37f74bad4fee32be3674c6d7bf7c1f5c3",
 			"branch": "master"
 		},
+		{
+			"importpath": "github.com/polaris1119/email",
+			"repository": "https://github.com/polaris1119/email",
+			"revision": "fab6eb4568abf395404252a598ff32d7fe445dbf",
+			"branch": "master"
+		},
 		{
 			"importpath": "github.com/polaris1119/goutils",
 			"repository": "https://github.com/polaris1119/goutils",
