thepaperpilot/forgejo
1
0
Fork 0
Code Issues Pull requests Releases Activity Actions 2

Make mailer SMTP check have timed context (#24751) (#24759)

Browse source 
Backport #24751 by @wxiaoguang

Make mailer SMTP check have timed context

Otherwise Gitea may block for long time if the DNS request blocks.

Co-authored-by: wxiaoguang <wxiaoguang@gmail.com>
(cherry picked from commit 57f520e7e5)
This commit is contained in:
Giteabot 2023-05-17 06:08:39 -04:00 committed by Earl Warren
parent f6919e3e53
commit 9cf864c36d
No known key found for this signature in database
GPG key ID: 0579CB2928A78A00
1 changed files with 9 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
modules/setting/mailer.go
View file

@ -4,6 +4,7 @@
package setting
import (
"context"
"net"
"net/mail"
"strings"
@ -198,7 +199,7 @@ func loadMailerFrom(rootCfg ConfigProvider) {
ips := tryResolveAddr(MailService.SMTPAddr)
if MailService.Protocol == "smtp" {
for _, ip := range ips {
if !ip.IsLoopback() {
if !ip.IP.IsLoopback() {
log.Warn("connecting over insecure SMTP protocol to non-local address is not recommended")
break
}
@ -258,20 +259,21 @@ func loadNotifyMailFrom(rootCfg ConfigProvider) {
log.Info("Notify Mail Service Enabled")
}
func tryResolveAddr(addr string) []net.IP {
func tryResolveAddr(addr string) []net.IPAddr {
if strings.HasPrefix(addr, "[") && strings.HasSuffix(addr, "]") {
addr = addr[1 : len(addr)-1]
}
ip := net.ParseIP(addr)
if ip != nil {
ips := make([]net.IP, 1)
ips[0] = ip
return ips
return []net.IPAddr{{IP: ip}}
}
ips, err := net.LookupIP(addr)
ctx, cancel := context.WithTimeout(context.Background(), 2*time.Second)
defer cancel()
ips, err := net.DefaultResolver.LookupIPAddr(ctx, addr)
if err != nil {
log.Warn("could not look up mailer.SMTP_ADDR: %v", err)
return make([]net.IP, 0)
return nil
}
return ips
}