Elgato_dark/fleet
1
0
Fork 0
mirror of https://github.com/fleetdm/fleet synced 2026-05-23 17:08:53 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 83

Include RFC822 From header. (#1743)

Browse source 
The DMARC and DKIM email authentication systems both require the RFC822
From header to function.  Kolide currently only includes the configured
sender address as the SMTP Envelop From address (e.g., the MAIL FROM
command).  This patch also includes the configured sender address in the
RFC822 email From header which should allow these emails to pass both
DKIM and DMARC authentication.
This commit is contained in:
angrylogic 2018-04-25 12:02:09 -04:00 committed by Zachary Wasserman
parent 4784eb2322
commit c873833a5f
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
server/mail/mail.go
View file

@ -54,7 +54,8 @@ func getMessageBody(e kolide.Email) ([]byte, error) {
mime := `MIME-version: 1.0;` + "\r\n"
content := `Content-Type: text/html; charset="UTF-8";` + "\r\n"
subject := "Subject: " + e.Subject + "\r\n"
msg := []byte(subject + mime + content + "\r\n" + string(body) + "\r\n")
from := "From: " + e.Config.SMTPSenderAddress + "\r\n"
msg := []byte(subject + from + mime + content + "\r\n" + string(body) + "\r\n")
return msg, nil
}