mirrors/maddy
1
0
Fork 0
mirror of https://github.com/foxcpp/maddy.git synced 2025-04-04 05:37:34 +03:00
Code Issues Projects Releases Packages Wiki Activity

check/spf: Use context.Context and custom resolver interface

Browse source 
Closes #354.
This commit is contained in:
fox.cpp 2021-05-12 06:11:26 +03:00
parent 66cb7170ab
commit 6a2e0ad817
No known key found for this signature in database
GPG key ID: 5B991F6215D2FCC0
3 changed files with 11 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

2
go.mod
View file

@ -3,7 +3,7 @@ module github.com/foxcpp/maddy
go 1.14 go 1.14
require ( require (
blitiri.com.ar/go/spf v1.1.1 blitiri.com.ar/go/spf v1.2.0
github.com/GehirnInc/crypt v0.0.0-20200316065508-bb7000b8a962 github.com/GehirnInc/crypt v0.0.0-20200316065508-bb7000b8a962
github.com/cpuguy83/go-md2man/v2 v2.0.0 // indirect github.com/cpuguy83/go-md2man/v2 v2.0.0 // indirect
github.com/emersion/go-imap v1.0.6 github.com/emersion/go-imap v1.0.6

4
go.sum
View file

@ -1,5 +1,5 @@
blitiri.com.ar/go/spf v1.1.1 h1:H5MKnEe5feN4NjtPDK/vFkkS0fI+ecTIsOfLNCR+6yI= blitiri.com.ar/go/spf v1.2.0 h1:aPpeEVKz5Ue4xb4SEt4AzScCSyES7/pol6znzZGle3A=
blitiri.com.ar/go/spf v1.1.1/go.mod h1:HLmgHxdrsqbBgi5omEopdAKm18PypvUKJGkF/j7BO0w= blitiri.com.ar/go/spf v1.2.0/go.mod h1:HLmgHxdrsqbBgi5omEopdAKm18PypvUKJGkF/j7BO0w=
cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=

12
internal/check/spf/spf.go
View file

@ -56,13 +56,15 @@ type Check struct {
permerrAction modconfig.FailAction permerrAction modconfig.FailAction
temperrAction modconfig.FailAction temperrAction modconfig.FailAction
log log.Logger log log.Logger
resolver dns.Resolver
} }
func New(_, instName string, _, _ []string) (module.Module, error) { func New(_, instName string, _, _ []string) (module.Module, error) {
return &Check{ return &Check{
instName: instName, instName: instName,
log: log.Logger{Name: modName}, log: log.Logger{Name: modName},
resolver: dns.DefaultResolver(),
}, nil }, nil
} }
@ -243,7 +245,7 @@ func (s *state) relyOnDMARC(ctx context.Context, hdr textproto.Header) bool {
return false return false
} }
policyDomain, record, err := maddydmarc.FetchRecord(ctx, dns.DefaultResolver(), fromDomain) policyDomain, record, err := maddydmarc.FetchRecord(ctx, s.c.resolver, fromDomain)
if err != nil { if err != nil {
s.log.Error("DMARC fetch", err, "from_domain", fromDomain) s.log.Error("DMARC fetch", err, "from_domain", fromDomain)
return false return false
@ -323,7 +325,8 @@ func (s *state) CheckConnection(ctx context.Context) module.CheckResult {
if s.c.enforceEarly { if s.c.enforceEarly {
res, err := spf.CheckHostWithSender(ip.IP, res, err := spf.CheckHostWithSender(ip.IP,
dns.FQDN(s.msgMeta.Conn.Hostname), mailFrom) dns.FQDN(s.msgMeta.Conn.Hostname), mailFrom,
spf.WithContext(ctx), spf.WithResolver(s.c.resolver))
s.log.Debugf("result: %s (%v)", res, err) s.log.Debugf("result: %s (%v)", res, err)
return s.spfResult(res, err) return s.spfResult(res, err)
} }
@ -344,7 +347,8 @@ func (s *state) CheckConnection(ctx context.Context) module.CheckResult {
defer trace.StartRegion(ctx, "check.spf/CheckConnection (Async)").End() defer trace.StartRegion(ctx, "check.spf/CheckConnection (Async)").End()
res, err := spf.CheckHostWithSender(ip.IP, dns.FQDN(s.msgMeta.Conn.Hostname), mailFrom) res, err := spf.CheckHostWithSender(ip.IP, dns.FQDN(s.msgMeta.Conn.Hostname), mailFrom,
spf.WithContext(ctx), spf.WithResolver(s.c.resolver))
s.log.Debugf("result: %s (%v)", res, err) s.log.Debugf("result: %s (%v)", res, err)
s.spfFetch <- spfRes{res, err} s.spfFetch <- spfRes{res, err}
}() }()