Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Don't lookup mail server when using sendmail #22300

Merged
merged 5 commits into from
Jan 9, 2023
Merged

Don't lookup mail server when using sendmail #22300

Changes from 4 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
8f3d18f
Don't lookup mail server when using sendmail
lunny Dec 31, 2022
eea0eae
use switch
lunny Jan 9, 2023
64bcbef
Merge branch 'main' into lunny/sendmail_dont_resolve_ip
lunny Jan 9, 2023
217debc
Merge branch 'main' into lunny/sendmail_dont_resolve_ip
lunny Jan 9, 2023
73e9a17
Merge branch 'main' into lunny/sendmail_dont_resolve_ip
lunny Jan 9, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 17 additions & 14 deletions modules/setting/mailer.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -178,14 +178,25 @@ func newMailService() {

// we want to warn if users use SMTP on a non-local IP;
// we might as well take the opportunity to check that it has an IP at all
ips := tryResolveAddr(MailService.SMTPAddr)
if MailService.Protocol == "smtp" {
for _, ip := range ips {
if !ip.IsLoopback() {
log.Warn("connecting over insecure SMTP protocol to non-local address is not recommended")
break
// This check is not needed for sendmail
switch MailService.Protocol {
case "sendmail":
var err error
MailService.SendmailArgs, err = shellquote.Split(sec.Key("SENDMAIL_ARGS").String())
if err != nil {
log.Error("Failed to parse Sendmail args: '%s' with error %v", sec.Key("SENDMAIL_ARGS").String(), err)
}
case "smtp", "smtps", "smtp+starttls", "smtp+unix":
ips := tryResolveAddr(MailService.SMTPAddr)
if MailService.Protocol == "smtp" {
for _, ip := range ips {
if !ip.IsLoopback() {
log.Warn("connecting over insecure SMTP protocol to non-local address is not recommended")
break
}
}
}
case "dummy": // just mention and do nothing
}

if MailService.From != "" {
Expand Down Expand Up @@ -214,14 +225,6 @@ func newMailService() {
MailService.EnvelopeFrom = parsed.Address
}

if MailService.Protocol == "sendmail" {
var err error
MailService.SendmailArgs, err = shellquote.Split(sec.Key("SENDMAIL_ARGS").String())
if err != nil {
log.Error("Failed to parse Sendmail args: %s with error %v", CustomConf, err)
}
}

log.Info("Mail Service Enabled")
}

Expand Down