From b3fe23e8a3dcfe17c74697268a88b3b4b93c17d6 Mon Sep 17 00:00:00 2001 From: Kabeer Ahmed Date: Fri, 6 Nov 2026 11:04:40 +0500 Subject: [PATCH] feat(endpoint/smtp): Add rdns_lookup option to disable client reverse DNS lookups Fixes #150 --- docs/reference/endpoints/smtp.md | 10 ++++++++++ internal/endpoint/smtp/session.go | 2 +- internal/endpoint/smtp/smtp.go | 2 ++ internal/endpoint/smtp/smtp_test.go | 30 +++++++++++++++++++++++++++++ 4 files changed, 43 insertions(+), 1 deletion(-) diff --git a/docs/reference/endpoints/smtp.md b/docs/reference/endpoints/smtp.md index 293832c8..05a575d9 100644 --- a/docs/reference/endpoints/smtp.md +++ b/docs/reference/endpoints/smtp.md @@ -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` diff --git a/internal/endpoint/smtp/session.go b/internal/endpoint/smtp/session.go index f9490b79..8a658672 100644 --- a/internal/endpoint/smtp/session.go +++ b/internal/endpoint/smtp/session.go @@ -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 diff --git a/internal/endpoint/smtp/smtp.go b/internal/endpoint/smtp/smtp.go index d0f1593d..b8c4033b 100644 --- a/internal/endpoint/smtp/smtp.go +++ b/internal/endpoint/smtp/smtp.go @@ -70,6 +70,7 @@ type Endpoint struct { submission bool lmtp bool deferServerReject bool + rdnsLookup bool maxLoggedRcptErrors int maxReceived int maxHeaderBytes int64 @@ -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 diff --git a/internal/endpoint/smtp/smtp_test.go b/internal/endpoint/smtp/smtp_test.go index 3e9d32a4..657f84a8 100644 --- a/internal/endpoint/smtp/smtp_test.go +++ b/internal/endpoint/smtp/smtp_test.go @@ -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)