Update to 3.0.0-rc.1 - Read the HISTORY.md. Relative: #183 #184 #166 #176 #181

Read https://github.com/kataras/iris/tree/master/HISTORY.md

mail/service.go

@@ -6,23 +6,26 @@ import (
 	"net/mail"
 	"net/smtp"
 	"strings"
+	"sync"
 
 	"github.com/kataras/iris/config"
 	"github.com/kataras/iris/utils"
 )
 
 var buf = utils.NewBufferPool(64)
+var once sync.Once
 
 type (
 	// Service is the interface which mail sender should implement
 	Service interface {
 		// Send sends a mail to recipients
 		// the body can be html also
-		Send(to []string, subject, body string) error
+		Send(string, string, ...string) error
+		UpdateConfig(config.Mail)
 	}
 
 	mailer struct {
-		config        config.Mail
+		config        *config.Mail
 		fromAddr      mail.Address
 		auth          smtp.Auth
 		authenticated bool
@@ -31,44 +34,46 @@ type (
 
 // New creates and returns a new Service
 func New(cfg config.Mail) Service {
-	m := &mailer{config: cfg}
-
+	m := &mailer{config: &cfg}
 	if cfg.FromAlias == "" {
 		if !cfg.UseCommand && cfg.Username != "" && strings.Contains(cfg.Username, "@") {
-			m.fromAddr = mail.Address{cfg.Username[0:strings.IndexByte(cfg.Username, '@')], cfg.Username}
+			m.fromAddr = mail.Address{Name: cfg.Username[0:strings.IndexByte(cfg.Username, '@')], Address: cfg.Username}
 		}
 	} else {
-		m.fromAddr = mail.Address{cfg.FromAlias, cfg.Username}
+		m.fromAddr = mail.Address{Name: cfg.FromAlias, Address: cfg.Username}
 	}
-
 	return m
 }
 
+func (m *mailer) UpdateConfig(cfg config.Mail) {
+	m.config = &cfg
+}
+
 // Send sends a mail to recipients
 // the body can be html also
-func (m *mailer) Send(to []string, subject, body string) error {
+func (m *mailer) Send(subject string, body string, to ...string) error {
 	if m.config.UseCommand {
-		return m.sendCmd(to, subject, body)
+		return m.sendCmd(subject, body, to)
 	}
 
-	return m.sendSMTP(to, subject, body)
+	return m.sendSMTP(subject, body, to)
 }
 
-func (m *mailer) sendSMTP(to []string, subject, body string) error {
+func (m *mailer) sendSMTP(subject string, body string, to []string) error {
 	buffer := buf.Get()
 	defer buf.Put(buffer)
 
 	if !m.authenticated {
-		if m.config.Username == "" || m.config.Password == "" || m.config.Host == "" || m.config.Port <= 0 {
+		cfg := m.config
+		if cfg.Username == "" || cfg.Password == "" || cfg.Host == "" || cfg.Port <= 0 {
 			return fmt.Errorf("Username, Password, Host & Port cannot be empty when using SMTP!")
 		}
-		m.auth = smtp.PlainAuth("", m.config.Username, m.config.Password, m.config.Host)
+		m.auth = smtp.PlainAuth("", cfg.Username, cfg.Password, cfg.Host)
 		m.authenticated = true
 	}
 
 	fullhost := fmt.Sprintf("%s:%d", m.config.Host, m.config.Port)
 
-	/* START: This one helped me https://gist.github.com/andelf/5004821 */
 	header := make(map[string]string)
 	header["From"] = m.fromAddr.String()
 	header["To"] = strings.Join(to, ",")
@@ -83,8 +88,6 @@ func (m *mailer) sendSMTP(to []string, subject, body string) error {
 	}
 	message += "\r\n" + base64.StdEncoding.EncodeToString([]byte(body))
 
-	/* END */
-
 	return smtp.SendMail(
 		fmt.Sprintf(fullhost),
 		m.auth,
@@ -94,14 +97,27 @@ func (m *mailer) sendSMTP(to []string, subject, body string) error {
 	)
 }
 
-func (m *mailer) sendCmd(to []string, subject, body string) error {
+func (m *mailer) sendCmd(subject string, body string, to []string) error {
 	buffer := buf.Get()
 	defer buf.Put(buffer)
 
-	cmd := utils.CommandBuilder("mail", "-s", subject, strings.Join(to, ","))
-	cmd.AppendArguments("-a", "Content-type: text/html") //always html on
+	header := make(map[string]string)
+	header["To"] = strings.Join(to, ",")
+	header["Subject"] = subject
+	header["MIME-Version"] = "1.0"
+	header["Content-Type"] = "text/html; charset=\"utf-8\""
+	header["Content-Transfer-Encoding"] = "base64"
+
+	message := ""
+	for k, v := range header {
+		message += fmt.Sprintf("%s: %s\r\n", k, v)
+	}
+	message += "\r\n" + base64.StdEncoding.EncodeToString([]byte(body))
+	buffer.WriteString(message)
+	// fix by @qskousen
+	cmd := utils.CommandBuilder("sendmail", "-F", m.fromAddr.Name, "-f", m.fromAddr.Address, "-t")
 
 	cmd.Stdin = buffer
-	_, err := cmd.Output()
+	_, err := cmd.CombinedOutput()
 	return err
 }