cristiancmoises
/
gophish
mirror of https://github.com/gophish/gophish
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Using SetAddressHeader to better format the SMTP From Address. Fixes #135.

pull/843/merge
Jordan Wright 2017-09-21 19:39:27 -05:00
parent 8433882186
commit 10ff5c181b
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
worker/worker.go
View File

@ -114,7 +114,7 @@ func processCampaign(c *models.Campaign) {
// Send each email
e := gomail.NewMessage()
for _, t := range c.Results {
e.SetHeader("From", c.SMTP.FromAddress)
e.SetAddressHeader("From", f.Address, f.Name)
td := struct {
models.Result
URL string
@ -249,6 +249,11 @@ func processCampaign(c *models.Campaign) {
}
func SendTestEmail(s *models.SendTestEmailRequest) error {
f, err := mail.ParseAddress(s.SMTP.FromAddress)
if err != nil {
Logger.Println(err)
return err
}
hp := strings.Split(s.SMTP.Host, ":")
if len(hp) < 2 {
hp = append(hp, "25")
@ -303,7 +308,7 @@ func SendTestEmail(s *models.SendTestEmailRequest) error {
// Add our header immediately
e.SetHeader(parsedHeader.Key.String(), parsedHeader.Value.String())
}
e.SetHeader("From", s.SMTP.FromAddress)
e.SetAddressHeader("From", f.Address, f.Name)
e.SetHeader("To", s.FormatAddress())
// Parse the templates
var subjBuff bytes.Buffer