fix sending email bug, fix #1834

src/ui/controllers/base.go

@@ -9,13 +9,13 @@ import (
 
 	"github.com/astaxie/beego"
 	"github.com/beego/i18n"
-	"github.com/vmware/harbor/src/common"
 	"github.com/vmware/harbor/src/common/dao"
 	"github.com/vmware/harbor/src/common/models"
 	"github.com/vmware/harbor/src/common/utils"
-	"github.com/vmware/harbor/src/common/utils/email"
+	email_util "github.com/vmware/harbor/src/common/utils/email"
 	"github.com/vmware/harbor/src/common/utils/log"
 	"github.com/vmware/harbor/src/ui/auth"
+	"github.com/vmware/harbor/src/ui/config"
 )
 
 // CommonController handles request from UI that doesn't expect a page, such as /SwitchLanguage /logout ...
@@ -87,72 +87,79 @@ func (cc *CommonController) UserExists() {
 // SendEmail verifies the Email address and contact SMTP server to send reset password Email.
 func (cc *CommonController) SendEmail() {
 
-	emailStr := cc.GetString("email")
-
-	pass, _ := regexp.MatchString(`^(([^<>()[\]\\.,;:\s@\"]+(\.[^<>()[\]\\.,;:\s@\"]+)*)|(\".+\"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$`, emailStr)
-
-	if !pass {
-		cc.CustomAbort(http.StatusBadRequest, "email_content_illegal")
-	} else {
-
-		queryUser := models.User{Email: emailStr}
-		exist, err := dao.UserExists(queryUser, "email")
-		if err != nil {
-			log.Errorf("Error occurred in UserExists: %v", err)
-			cc.CustomAbort(http.StatusInternalServerError, "Internal error.")
-		}
-		if !exist {
-			cc.CustomAbort(http.StatusNotFound, "email_does_not_exist")
-		}
-
-		messageTemplate, err := template.ParseFiles("views/reset-password-mail.tpl")
-		if err != nil {
-			log.Errorf("Parse email template file failed: %v", err)
-			cc.CustomAbort(http.StatusInternalServerError, err.Error())
-		}
-
-		message := new(bytes.Buffer)
-
-		harborURL := common.ExtEndpoint
-		if harborURL == "" {
-			harborURL = "localhost"
-		}
-		uuid := utils.GenerateRandomString()
-		err = messageTemplate.Execute(message, messageDetail{
-			Hint: cc.Tr("reset_email_hint"),
-			URL:  harborURL,
-			UUID: uuid,
-		})
-
-		if err != nil {
-			log.Errorf("Message template error: %v", err)
-			cc.CustomAbort(http.StatusInternalServerError, "internal_error")
-		}
-
-		config, err := beego.AppConfig.GetSection("mail")
-		if err != nil {
-			log.Errorf("Can not load app.conf: %v", err)
-			cc.CustomAbort(http.StatusInternalServerError, "internal_error")
-		}
-
-		mail := email.Mail{
-			From:    config["from"],
-			To:      []string{emailStr},
-			Subject: cc.Tr("reset_email_subject"),
-			Message: message.String()}
-
-		err = mail.SendMail()
-
-		if err != nil {
-			log.Errorf("Send email failed: %v", err)
-			cc.CustomAbort(http.StatusInternalServerError, "send_email_failed")
-		}
-
-		user := models.User{ResetUUID: uuid, Email: emailStr}
-		dao.UpdateUserResetUUID(user)
+	email := cc.GetString("email")
 
+	valid, err := regexp.MatchString(`^(([^<>()[\]\\.,;:\s@\"]+(\.[^<>()[\]\\.,;:\s@\"]+)*)|(\".+\"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$`, email)
+	if err != nil {
+		log.Errorf("failed to match regexp: %v", err)
+		cc.CustomAbort(http.StatusInternalServerError, "Internal error.")
 	}
 
+	if !valid {
+		cc.CustomAbort(http.StatusBadRequest, "invalid email")
+	}
+
+	queryUser := models.User{Email: email}
+	exist, err := dao.UserExists(queryUser, "email")
+	if err != nil {
+		log.Errorf("Error occurred in UserExists: %v", err)
+		cc.CustomAbort(http.StatusInternalServerError, "Internal error.")
+	}
+	if !exist {
+		log.Debugf("email %s not found", email)
+		cc.CustomAbort(http.StatusNotFound, "email_does_not_exist")
+	}
+
+	messageTemplate, err := template.ParseFiles("views/reset-password-mail.tpl")
+	if err != nil {
+		log.Errorf("Parse email template file failed: %v", err)
+		cc.CustomAbort(http.StatusInternalServerError, err.Error())
+	}
+
+	message := new(bytes.Buffer)
+
+	harborURL, err := config.ExtEndpoint()
+	if err != nil {
+		log.Errorf("failed to get domain name: %v", err)
+		cc.CustomAbort(http.StatusInternalServerError, http.StatusText(http.StatusInternalServerError))
+	}
+
+	uuid := utils.GenerateRandomString()
+	err = messageTemplate.Execute(message, messageDetail{
+		Hint: cc.Tr("reset_email_hint"),
+		URL:  harborURL,
+		UUID: uuid,
+	})
+
+	if err != nil {
+		log.Errorf("Message template error: %v", err)
+		cc.CustomAbort(http.StatusInternalServerError, "internal_error")
+	}
+
+	emailSettings, err := config.Email()
+	if err != nil {
+		log.Errorf("failed to get email configurations: %v", err)
+		cc.CustomAbort(http.StatusInternalServerError, "internal_error")
+	}
+
+	mail := email_util.Mail{
+		From:    emailSettings.From,
+		To:      []string{email},
+		Subject: cc.Tr("reset_email_subject"),
+		Message: message.String()}
+
+	err = mail.SendMail()
+
+	if err != nil {
+		log.Errorf("Send email failed: %v", err)
+		cc.CustomAbort(http.StatusInternalServerError, "send_email_failed")
+	}
+
+	user := models.User{ResetUUID: uuid, Email: email}
+	if err = dao.UpdateUserResetUUID(user); err != nil {
+		log.Errorf("failed to update user reset UUID: %v", err)
+		cc.CustomAbort(http.StatusInternalServerError, http.StatusText(http.StatusInternalServerError))
+	}
 }
 
 // ResetPassword handles request from the reset page and reset password

src/ui/views/mail.tpl

@@ -0,0 +1,7 @@
+From: {{.From}}
+To: {{.To}}
+Subject: {{.Subject}}
+MIME-version: 1.0;
+Content-Type: text/html; charset="UTF-8"
+
+{{.Message}}