Mirrors/go-chasquid-smtp
1
0
Fork 0
mirror of https://blitiri.com.ar/repos/chasquid synced 2025-12-18 14:47:03 +00:00
Code Releases Activity

smtpsrv: Disable SPF lookups in tests

Browse Source 
When testing, we don't want the server to do SPF lookups, as those cause
real DNS queries which can be problematic and add a dependency on the
environment.

This patch adds an internal boolean to disable the SPF lookups, which is
only set from the tests.
This commit is contained in:
Alberto Bertogli
2016-11-22 22:05:07 +00:00
parent b1a29d8194
commit de09923933
2 changed files with 10 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
internal/smtpsrv/conn.go
View File

@@ -48,6 +48,9 @@ var (
var ( var (
maxReceivedHeaders = flag.Int("testing__max_received_headers", 50, maxReceivedHeaders = flag.Int("testing__max_received_headers", 50,
"max Received headers, for loop detection; ONLY FOR TESTING") "max Received headers, for loop detection; ONLY FOR TESTING")
// Some go tests disable SPF, to avoid leaking DNS lookups.
disableSPFForTesting = false
) )
// Mode for a socket (listening or connection). // Mode for a socket (listening or connection).
@@ -385,6 +388,10 @@ func (c *Conn) checkSPF(addr string) (spf.Result, error) {
return "", nil return "", nil
} }
if disableSPFForTesting {
return "", nil
}
if tcp, ok := c.conn.RemoteAddr().(*net.TCPAddr); ok { if tcp, ok := c.conn.RemoteAddr().(*net.TCPAddr); ok {
res, err := spf.CheckHost( res, err := spf.CheckHost(
tcp.IP, envelope.DomainOf(addr)) tcp.IP, envelope.DomainOf(addr))

3
internal/smtpsrv/server_test.go
View File

@@ -453,6 +453,9 @@ func realMain(m *testing.M) int {
s.AddDomain("localhost") s.AddDomain("localhost")
s.AddUserDB("localhost", udb) s.AddUserDB("localhost", udb)
// Disable SPF lookups, to avoid leaking DNS queries.
disableSPFForTesting = true
go s.ListenAndServe() go s.ListenAndServe()
} }