Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
10 changes: 10 additions & 0 deletions docs/reference/endpoints/smtp.md
Original file line number Diff line number Diff line change
Expand Up @@ -166,6 +166,16 @@ clients that don't expect an error early in session.

---

### rdns_lookup _boolean_
Default: `yes`

Perform a reverse DNS lookup for the IP address of each connecting client.
The result is used in the `Received` header and by checks such as
`require_matching_rdns`. If disabled, no PTR query is sent and checks that
depend on it are skipped.

---

### max_logged_rcpt_errors _integer_
Default: `5`

Expand Down
2 changes: 1 addition & 1 deletion internal/endpoint/smtp/session.go
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,7 @@ func (s *Session) initFromConn(conn *smtp.Conn) {
}
}

if s.endp.resolver != nil && (prevRemoteAddr == nil || s.connState.RemoteAddr.String() == prevRemoteAddr.String()) {
if s.endp.resolver != nil && s.endp.rdnsLookup && (prevRemoteAddr == nil || s.connState.RemoteAddr.String() == prevRemoteAddr.String()) {
rdnsCtx, cancelRDNS := context.WithCancel(s.sessionCtx)
s.connState.RDNSName = future.New()
s.cancelRDNS = cancelRDNS
Expand Down
2 changes: 2 additions & 0 deletions internal/endpoint/smtp/smtp.go
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,7 @@ type Endpoint struct {
submission bool
lmtp bool
deferServerReject bool
rdnsLookup bool
maxLoggedRcptErrors int
maxReceived int
maxHeaderBytes int64
Expand Down Expand Up @@ -271,6 +272,7 @@ func (endp *Endpoint) setConfig(cfg *config.Map) error {
cfg.Bool("io_debug", false, false, &ioDebug)
cfg.Bool("debug", true, false, &endp.log.Debug)
cfg.Bool("defer_sender_reject", false, true, &endp.deferServerReject)
cfg.Bool("rdns_lookup", false, true, &endp.rdnsLookup)
cfg.Int("max_logged_rcpt_errors", false, false, 5, &endp.maxLoggedRcptErrors)
cfg.Custom("limits", false, false, func() (interface{}, error) {
return limits.Empty(endp.log.Sublogger("limits")), nil
Expand Down
30 changes: 30 additions & 0 deletions internal/endpoint/smtp/smtp_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -194,6 +194,36 @@ func TestSMTPDelivery(t *testing.T) {
}
}

func TestSMTPDelivery_rDNSLookupDisabled(t *testing.T) {
tgt := testutils.Target{}
endp := testEndpoint(t, "smtp", nil, &tgt, nil, []config.Node{
{Name: "rdns_lookup", Args: []string{"no"}},
})
defer func() {
assert.NoError(t, endp.Stop())
}()

cl, err := smtp.Dial("127.0.0.1:" + testPort)
if err != nil {
t.Fatal(err)
}
defer func() {
assert.NoError(t, cl.Close())
}()

err = submitMsg(t, cl, "sender@example.org", []string{"rcpt1@example.com"}, testMsg)
if err != nil {
t.Fatal(err)
}

if len(tgt.Messages) != 1 {
t.Fatal("Expected a message, got", len(tgt.Messages))
}
if tgt.Messages[0].MsgMeta.Conn.RDNSName != nil {
t.Error("rDNS lookup was performed")
}
}

func TestSMTPDelivery_rDNSError(t *testing.T) {
tgt := testutils.Target{}
endp := testEndpoint(t, "smtp", nil, &tgt, nil, nil)
Expand Down
Loading