From 373731f5e85566eb385e92f604e81232e3d6ba1a Mon Sep 17 00:00:00 2001
From: Unknwon <u@gogs.io>
Date: Thu, 17 Sep 2015 01:54:12 -0400
Subject: user gomail and new activate account email tpl
- #1496: fallback plain text
- #1002: add date header
- #913: fix encoding of header
---
modules/mailer/mailer.go | 182 +++++++++++++++++------------------------------
1 file changed, 64 insertions(+), 118 deletions(-)
(limited to 'modules/mailer/mailer.go')
diff --git a/modules/mailer/mailer.go b/modules/mailer/mailer.go
index b877bdaa..4dbcf118 100644
--- a/modules/mailer/mailer.go
+++ b/modules/mailer/mailer.go
@@ -7,16 +7,44 @@ package mailer
import (
"crypto/tls"
"fmt"
+ "io"
"net"
- "net/mail"
"net/smtp"
"os"
"strings"
+ "time"
+
+ "gopkg.in/gomail.v2"
"github.com/gogits/gogs/modules/log"
"github.com/gogits/gogs/modules/setting"
)
+type Message struct {
+ Info string // Message information for log purpose.
+ *gomail.Message
+}
+
+// NewMessageFrom creates new mail message object with custom From header.
+func NewMessageFrom(to []string, from, subject, body string) *Message {
+ msg := gomail.NewMessage()
+ msg.SetHeader("From", from)
+ msg.SetHeader("To", to...)
+ msg.SetHeader("Subject", subject)
+ msg.SetDateHeader("Date", time.Now())
+ msg.SetBody("text/plain", body)
+ msg.AddAlternative("text/html", body)
+
+ return &Message{
+ Message: msg,
+ }
+}
+
+// NewMessage creates new mail message object with default From header.
+func NewMessage(to []string, subject, body string) *Message {
+ return NewMessageFrom(to, setting.MailService.From, subject, body)
+}
+
type loginAuth struct {
username, password string
}
@@ -44,74 +72,24 @@ func (a *loginAuth) Next(fromServer []byte, more bool) ([]byte, error) {
return nil, nil
}
-type Message struct {
- To []string
- From string
- Subject string
- ReplyTo string
- Body string
- Type string
- Massive bool
- Info string
-}
-
-// create mail content
-func (m Message) Content() string {
- // set mail type
- contentType := "text/plain; charset=UTF-8"
- if m.Type == "html" {
- contentType = "text/html; charset=UTF-8"
- }
-
- // create mail content
- content := "From: " + m.From + "\r\nReply-To: " + m.ReplyTo + "\r\nSubject: " + m.Subject + "\r\nContent-Type: " + contentType + "\r\n\r\n" + m.Body
- return content
+type Sender struct {
}
-var mailQueue chan *Message
-
-func NewContext() {
- if setting.MailService == nil {
- return
- }
-
- mailQueue = make(chan *Message, setting.MailService.QueueLength)
- go processMailQueue()
-}
-
-func processMailQueue() {
- for {
- select {
- case msg := <-mailQueue:
- num, err := Send(msg)
- tos := strings.Join(msg.To, ", ")
- info := ""
- if err != nil {
- if len(msg.Info) > 0 {
- info = ", info: " + msg.Info
- }
- log.Error(4, fmt.Sprintf("Async sent email %d succeed, not send emails: %s%s err: %s", num, tos, info, err))
- } else {
- log.Trace(fmt.Sprintf("Async sent email %d succeed, sent emails: %s%s", num, tos, info))
- }
- }
- }
-}
+func (s *Sender) Send(from string, to []string, msg io.WriterTo) error {
+ opts := setting.MailService
-// sendMail allows mail with self-signed certificates.
-func sendMail(settings *setting.Mailer, recipients []string, msgContent []byte) error {
- host, port, err := net.SplitHostPort(settings.Host)
+ host, port, err := net.SplitHostPort(opts.Host)
if err != nil {
return err
}
tlsconfig := &tls.Config{
- InsecureSkipVerify: settings.SkipVerify,
+ InsecureSkipVerify: opts.SkipVerify,
ServerName: host,
}
- if settings.UseCertificate {
- cert, err := tls.LoadX509KeyPair(settings.CertFile, settings.KeyFile)
+ if opts.UseCertificate {
+ cert, err := tls.LoadX509KeyPair(opts.CertFile, opts.KeyFile)
if err != nil {
return err
}
@@ -159,17 +137,16 @@ func sendMail(settings *setting.Mailer, recipients []string, msgContent []byte)
}
canAuth, options := client.Extension("AUTH")
-
- if canAuth && len(settings.User) > 0 {
+ if canAuth && len(opts.User) > 0 {
var auth smtp.Auth
if strings.Contains(options, "CRAM-MD5") {
- auth = smtp.CRAMMD5Auth(settings.User, settings.Passwd)
+ auth = smtp.CRAMMD5Auth(opts.User, opts.Passwd)
} else if strings.Contains(options, "PLAIN") {
- auth = smtp.PlainAuth("", settings.User, settings.Passwd, host)
+ auth = smtp.PlainAuth("", opts.User, opts.Passwd, host)
} else if strings.Contains(options, "LOGIN") {
// Patch for AUTH LOGIN
- auth = LoginAuth(settings.User, settings.Passwd)
+ auth = LoginAuth(opts.User, opts.Passwd)
}
if auth != nil {
@@ -179,15 +156,11 @@ func sendMail(settings *setting.Mailer, recipients []string, msgContent []byte)
}
}
- if fromAddress, err := mail.ParseAddress(settings.From); err != nil {
+ if err = client.Mail(from); err != nil {
return err
- } else {
- if err = client.Mail(fromAddress.Address); err != nil {
- return err
- }
}
- for _, rec := range recipients {
+ for _, rec := range to {
if err = client.Rcpt(rec); err != nil {
return err
}
@@ -196,71 +169,44 @@ func sendMail(settings *setting.Mailer, recipients []string, msgContent []byte)
w, err := client.Data()
if err != nil {
return err
- }
- if _, err = w.Write([]byte(msgContent)); err != nil {
+ } else if _, err = msg.WriteTo(w); err != nil {
return err
- }
-
- if err = w.Close(); err != nil {
+ } else if err = w.Close(); err != nil {
return err
}
return client.Quit()
}
-// Direct Send mail message
-func Send(msg *Message) (int, error) {
- log.Trace("Sending mails to: %s", strings.Join(msg.To, ", "))
-
- // get message body
- content := msg.Content()
-
- if len(msg.To) == 0 {
- return 0, fmt.Errorf("empty receive emails")
- } else if len(msg.Body) == 0 {
- return 0, fmt.Errorf("empty email body")
- }
+func processMailQueue() {
+ sender := &Sender{}
- if msg.Massive {
- // send mail to multiple emails one by one
- num := 0
- for _, to := range msg.To {
- body := []byte("To: " + to + "\r\n" + content)
- err := sendMail(setting.MailService, []string{to}, body)
- if err != nil {
- return num, err
+ for {
+ select {
+ case msg := <-mailQueue:
+ log.Trace("New e-mail sending request %s: %s", msg.GetHeader("To"), msg.Info)
+ if err := gomail.Send(sender, msg.Message); err != nil {
+ log.Error(4, "Fail to send e-mails %s: %s - %v", msg.GetHeader("To"), msg.Info, err)
+ } else {
+ log.Trace("E-mails sent %s: %s", msg.GetHeader("To"), msg.Info)
}
- num++
}
- return num, nil
- } else {
- body := []byte("To: " + strings.Join(msg.To, ",") + "\r\n" + content)
+ }
+}
- // send to multiple emails in one message
- err := sendMail(setting.MailService, msg.To, body)
- if err != nil {
- return 0, err
- } else {
- return 1, nil
- }
+var mailQueue chan *Message
+
+func NewContext() {
+ if setting.MailService == nil {
+ return
}
+
+ mailQueue = make(chan *Message, setting.MailService.QueueLength)
+ go processMailQueue()
}
-// Async Send mail message
func SendAsync(msg *Message) {
go func() {
mailQueue <- msg
}()
}
-
-// Create html mail message
-func NewHtmlMessage(To []string, From, Subject, Body string) Message {
- return Message{
- To: To,
- From: setting.MailService.From,
- ReplyTo: From,
- Subject: Subject,
- Body: Body,
- Type: "html",
- }
-}
--
cgit v1.2.3