From 9f30cfb7dd26e5f4e4e4d955b783a0a52d4100bb Mon Sep 17 00:00:00 2001
From: Miod Vallat <miod.vallat@open-xchange.com>
Date: Fri, 24 Jan 2025 09:38:32 +0100
Subject: [PATCH 1/2] Provide NAPTR replacement information as additional
 answers whenever possible.

---
 pdns/packethandler.cc | 30 ++++++++++++++++++++++++++++--
 1 file changed, 28 insertions(+), 2 deletions(-)

diff --git a/pdns/packethandler.cc b/pdns/packethandler.cc
index 8483814d1954..00b8ad5d2e09 100644
--- a/pdns/packethandler.cc
+++ b/pdns/packethandler.cc
@@ -514,9 +514,11 @@ DNSName PacketHandler::doAdditionalServiceProcessing(const DNSName &firstTarget,
 }
 
 
+// NOLINTNEXTLINE(readability-function-cognitive-complexity)
 void PacketHandler::doAdditionalProcessing(DNSPacket& p, std::unique_ptr<DNSPacket>& r)
 {
   DNSName content;
+  DNSZoneRecord dzr;
   std::unordered_set<DNSName> lookup;
   vector<DNSZoneRecord> extraRecords;
   const auto& rrs = r->getRRS();
@@ -524,6 +526,7 @@ void PacketHandler::doAdditionalProcessing(DNSPacket& p, std::unique_ptr<DNSPack
   lookup.reserve(rrs.size());
   for(auto& rr : rrs) {
     if(rr.dr.d_place != DNSResourceRecord::ADDITIONAL) {
+      content.clear();
       switch(rr.dr.d_type) {
         case QType::NS:
           content=getRR<NSRecordContent>(rr.dr)->getNS();
@@ -546,10 +549,34 @@ void PacketHandler::doAdditionalProcessing(DNSPacket& p, std::unique_ptr<DNSPack
           }
           break;
         }
+        case QType::NAPTR: {
+          auto naptrContent = getRR<NAPTRRecordContent>(rr.dr);
+          auto flags = naptrContent->getFlags();
+          toLowerInPlace(flags);
+          if (flags.find('a') != string::npos) {
+            content = naptrContent->getReplacement();
+            DLOG(g_log<<Logger::Debug<<"adding NAPTR replacement 'a'="<<content<<endl);
+          }
+          else if (flags.find('s') != string::npos) {
+            content = naptrContent->getReplacement();
+            DLOG(g_log<<Logger::Debug<<"adding NAPTR replacement 's'="<<content<<endl);
+            B.lookup(QType(QType::SRV), content, d_sd.domain_id, &p);
+            while(B.get(dzr)) {
+              content=getRR<SRVRecordContent>(dzr.dr)->d_target;
+              if(content.isPartOf(d_sd.qname)) {
+                lookup.emplace(content);
+              }
+              dzr.dr.d_place=DNSResourceRecord::ADDITIONAL;
+              r->addRecord(std::move(dzr));
+            }
+            content.clear();
+          }
+          break;
+        }
         default:
           continue;
       }
-      if(content.isPartOf(d_sd.qname)) {
+      if(!content.empty() && content.isPartOf(d_sd.qname)) {
         lookup.emplace(content);
       }
     }
@@ -603,7 +630,6 @@ void PacketHandler::doAdditionalProcessing(DNSPacket& p, std::unique_ptr<DNSPack
     }
   }
 
-  DNSZoneRecord dzr;
   for(const auto& name : lookup) {
     B.lookup(QType(QType::ANY), name, d_sd.domain_id, &p);
     while(B.get(dzr)) {

From 1bd1a20c5011d2bb6abb5c1ce99568b9bbe17796 Mon Sep 17 00:00:00 2001
From: Miod Vallat <miod.vallat@open-xchange.com>
Date: Fri, 24 Jan 2025 09:40:23 +0100
Subject: [PATCH 2/2] Add 'a' and 's' flags NAPTR tests to exercize previous
 commit.

---
 modules/tinydnsbackend/data                   |   4 +++-
 modules/tinydnsbackend/data.cdb               | Bin 1356573 -> 1356752 bytes
 .../tinydns-data-check/expected_result        |   6 +++---
 .../tests/ent-axfr/expected_result            |   4 +++-
 .../tests/ent-axfr/expected_result.nsec3      |   6 ++++--
 .../ent-axfr/expected_result.nsec3-optout     |   6 ++++--
 regression-tests/tests/naptr/command          |   3 ++-
 regression-tests/tests/naptr/expected_result  |  12 +++++++++++-
 regression-tests/zones/test.com               |   4 +++-
 9 files changed, 33 insertions(+), 12 deletions(-)

diff --git a/modules/tinydnsbackend/data b/modules/tinydnsbackend/data
index 06c8f6161170..c09744d5cff2 100644
--- a/modules/tinydnsbackend/data
+++ b/modules/tinydnsbackend/data
@@ -20190,7 +20190,9 @@ Zexample.com:ns1.example.com.:ahu.example.com.:2847484148:28800:7200:604800:8640
 :_underscore.test.com:16:\030underscores\040are\040terrible:3600
 :aland.test.com:16:\016\303\205LAND\040ISLANDS:3600
 :d.test.com:39:\002d2\005test2\003com\000:3600
-:enum.test.com:35:\000d\0002\001u\007e2u\053sip\000\010testuser\006domain\003com\000:3600
+:enam.test.com:35:\000d\0002\001a\007e2u\053sip\000\007server1\004test\003com\000:3600
+:ensm.test.com:35:\000d\0002\001s\007e2u\053sip\000\007_double\004_tcp\002dc\004test\003com\000:3600
+:enum.test.com:35:\000d\0002\001u\007e2u\053sip\000\007server1\004test\003com\000:3600
 :hightxt.test.com:16:\042v\075spf1\040mx\040ip4\07278.46.192.210\040\342\200\223all:3600
 :hightxt.test.com:99:\042v\075spf1\040mx\040ip4\07278.46.192.210\040\342\200\223all:3600
 :interrupted-rrset.test.com:16:\023check\040AXFR\040signpipe:3600
diff --git a/modules/tinydnsbackend/data.cdb b/modules/tinydnsbackend/data.cdb
index 98225edd8ca8b4720e734abe1417e0dab172b592..d23f0e58877777bcf70c0f73d61469ecea81daa1 100644
GIT binary patch
delta 5233
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
F@c#;{2Q>fy

delta 5136
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%0DDL3`6%dQY
z4gQ(dyt0osM#^K+$0RgR^qA@R^G7cre*AIvsSv2ZrSj$HqF^K??s0PtsQB1W&ab0K
z^P7XAh(88%RESu&kiT>g3NuZ6^!K+lKx}o`7We)if%sUM8dsdnQ}XK6aN|$T*8OFK
zw`vGEqJAH)Os+7MTOnq}RUCRj05QF#B5@GON5X`e#GNH=H!gSHyz_^+qU@KJtMJx0
zZe3=N!p)vi6)&H>(pPL>aH0<W(@}h>tjO0wKW(jV&p?=`uteF&=2sGRY$#^>vfrIm
zbx<It^*OQHi!=f8_O{2dqh7@&`b{}AF$x~Iv8rW64U}u+A3i&0ymoN7Z(wW!v|Cqz
zpOo-mTjH*3u<wa4!k7>RjDFRn{`V$B{$Tj=L$DKxecJ~)u0wz5=MMXwxNXttVUytg
z9&(?34?UqQa|V)wR(lD7eK@;<{^=+Q8qF$`0=5DPM+nX^?v$KaahL@6cGQlvy710n
z;bJ%!=TCfAE(DL~64dGx*iHUSy1k+BZxwnpLhUrJijW^GclDC}3EXr-HdN3gawFZ<
zNB5E7$<ltw|Nhkjx87yR+*pFxS}0VfaNE5JV;-Mi;-34Rvyh;r>&XfCZfHQubX)K<
Oi9_ruq^{y-4g3#yZO<M6

diff --git a/regression-tests.nobackend/tinydns-data-check/expected_result b/regression-tests.nobackend/tinydns-data-check/expected_result
index c65a7f4d26a4..ecdbff15686e 100644
--- a/regression-tests.nobackend/tinydns-data-check/expected_result
+++ b/regression-tests.nobackend/tinydns-data-check/expected_result
@@ -1,5 +1,5 @@
 f3e86fd522b08d4812505da489ecb5b0  ../regression-tests/zones/example.com
-f8f0d7b157495ec8ee70851e3d5cb65e  ../regression-tests/zones/test.com
+971435ef3a1f47e459c992c5875b4363  ../regression-tests/zones/test.com
 e5e3ee998d151fe194b98997eaa36c53  ../regression-tests/zones/test.dyndns
 dee3e8b568549d9450134b555ca73990  ../regression-tests/zones/sub.test.dyndns
 e7c0fd528e8aaedb1ea3b6daaead4de2  ../regression-tests/zones/wtest.com
@@ -15,5 +15,5 @@ a98864b315f16bcf49ce577426063c42  ../regression-tests/zones/cdnskey-cds-test.com
 9aeed2c26d0c3ba3baf22dfa9568c451  ../regression-tests/zones/2.0.192.in-addr.arpa
 99c73e8b5db5781fec1ac3fa6a2662a9  ../regression-tests/zones/cryptokeys.org
 1f9e19be0cff67330f3a0a5347654f91  ../regression-tests/zones/hiddencryptokeys.org
-16ca9f82f476f5910ed89830dc0f183b  ../modules/tinydnsbackend/data
-022f54332046eb386d636bd9141a4e77  ../modules/tinydnsbackend/data.cdb
+c38877660e9ea3ca06bef9a655373013  ../modules/tinydnsbackend/data
+4bb3554f17c50327ba392cfbe5faaaa3  ../modules/tinydnsbackend/data.cdb
diff --git a/regression-tests/tests/ent-axfr/expected_result b/regression-tests/tests/ent-axfr/expected_result
index 6421d01dbea0..feb1f1aecca1 100644
--- a/regression-tests/tests/ent-axfr/expected_result
+++ b/regression-tests/tests/ent-axfr/expected_result
@@ -5,13 +5,15 @@
 15.order.test.com.	3600	IN	NSEC	server1.test.com. A RRSIG NSEC
 _double._tcp.dc.test.com.	3600	IN	NSEC	_ldap._tcp.dc.test.com. SRV RRSIG NSEC
 _ldap._tcp.dc.test.com.	3600	IN	NSEC	_root._tcp.dc.test.com. SRV RRSIG NSEC
-_root._tcp.dc.test.com.	3600	IN	NSEC	enum.test.com. SRV RRSIG NSEC
+_root._tcp.dc.test.com.	3600	IN	NSEC	enam.test.com. SRV RRSIG NSEC
 _underscore.test.com.	3600	IN	NSEC	aland.test.com. TXT RRSIG NSEC
 aland.test.com.	3600	IN	NSEC	blah.test.com. TXT RRSIG NSEC
 b.c.test.com.	3600	IN	NSEC	*.a.b.c.test.com. A RRSIG NSEC
 blah.test.com.	3600	IN	NSEC	b.c.test.com. NS RRSIG NSEC
 counter.test.com.	3600	IN	NSEC	d.test.com. A RRSIG NSEC
 d.test.com.	3600	IN	NSEC	_double._tcp.dc.test.com. DNAME RRSIG NSEC
+enam.test.com.	3600	IN	NSEC	ensm.test.com. NAPTR RRSIG NSEC
+ensm.test.com.	3600	IN	NSEC	enum.test.com. NAPTR RRSIG NSEC
 enum.test.com.	3600	IN	NSEC	hightxt.test.com. NAPTR RRSIG NSEC
 hightxt.test.com.	3600	IN	NSEC	interrupted-rrset.test.com. TXT RRSIG NSEC SPF
 interrupted-rrset.test.com.	3600	IN	NSEC	ns1.test.com. A TXT RRSIG NSEC
diff --git a/regression-tests/tests/ent-axfr/expected_result.nsec3 b/regression-tests/tests/ent-axfr/expected_result.nsec3
index 1a516046258b..d1db18186165 100644
--- a/regression-tests/tests/ent-axfr/expected_result.nsec3
+++ b/regression-tests/tests/ent-axfr/expected_result.nsec3
@@ -1,4 +1,5 @@
-0bh8di769i8vvtkdds8efjda19abigo5.test.com.	3600	IN	NSEC3	1 0 1 abcd 23E9S542JEHG7KBKNCNJPJHPHUPCD1JE TXT RRSIG SPF
+0bh8di769i8vvtkdds8efjda19abigo5.test.com.	3600	IN	NSEC3	1 0 1 abcd 0POCAINVSVDVCPJNL9NQ2LU1T245OI1A TXT RRSIG SPF
+0pocainvsvdvcpjnl9nq2lu1t245oi1a.test.com.	3600	IN	NSEC3	1 0 1 abcd 23E9S542JEHG7KBKNCNJPJHPHUPCD1JE NAPTR RRSIG
 23e9s542jehg7kbkncnjpjhphupcd1je.test.com.	3600	IN	NSEC3	1 0 1 abcd 2EU2GULBU53H9UVHFALSHPBO2A83T6L2 A RRSIG
 2eu2gulbu53h9uvhfalshpbo2a83t6l2.test.com.	3600	IN	NSEC3	1 0 1 abcd 2GKS2N3JPQF62QOHAVFQ1PHOLM3HR7RA NS SOA MX RRSIG DNSKEY NSEC3PARAM
 2gks2n3jpqf62qohavfq1pholm3hr7ra.test.com.	3600	IN	NSEC3	1 0 1 abcd 4UL8F3M96VCONEA85U93DH9SG570J4FU TXT RRSIG
@@ -16,7 +17,8 @@ b022o9dksaj737fh77e7kqqtj3om56ki.test.com.	3600	IN	NSEC3	1 0 1 abcd BAE1G74DOIMC
 bae1g74doimcdkg03dafhmgrlh2l19tu.test.com.	3600	IN	NSEC3	1 0 1 abcd CGFU8T55L510A9K688GBO9UACMBBS2AB
 cgfu8t55l510a9k688gbo9uacmbbs2ab.test.com.	3600	IN	NSEC3	1 0 1 abcd DAFC69CV5N2TFCF6OVBVTV94DRGMQJO5 A RRSIG
 dafc69cv5n2tfcf6ovbvtv94drgmqjo5.test.com.	3600	IN	NSEC3	1 0 1 abcd DE592K86U3HEVDJ57JPBT7J5KV7DOO78 TXT RRSIG
-de592k86u3hevdj57jpbt7j5kv7doo78.test.com.	3600	IN	NSEC3	1 0 1 abcd EBAN51BJGUGORB20UNP5PEEC7S5D2EKA NS
+de592k86u3hevdj57jpbt7j5kv7doo78.test.com.	3600	IN	NSEC3	1 0 1 abcd DH5R2B2JT3BB1BP7EUS2I7RS70DTS850 NS
+dh5r2b2jt3bb1bp7eus2i7rs70dts850.test.com.	3600	IN	NSEC3	1 0 1 abcd EBAN51BJGUGORB20UNP5PEEC7S5D2EKA NAPTR RRSIG
 eban51bjgugorb20unp5peec7s5d2eka.test.com.	3600	IN	NSEC3	1 0 1 abcd ENG6HBK77VJMQFVG6S04HAJOA2201LII SRV RRSIG
 eng6hbk77vjmqfvg6s04hajoa2201lii.test.com.	3600	IN	NSEC3	1 0 1 abcd H5855RVON2AASM8QV1NK49I1B2MKBEJP A TXT RRSIG
 h5855rvon2aasm8qv1nk49i1b2mkbejp.test.com.	3600	IN	NSEC3	1 0 1 abcd IAI9HIN25MEH689R5V5GTIFK8OM5DI0E A RRSIG
diff --git a/regression-tests/tests/ent-axfr/expected_result.nsec3-optout b/regression-tests/tests/ent-axfr/expected_result.nsec3-optout
index f56193cb858d..cfec54f6ae2b 100644
--- a/regression-tests/tests/ent-axfr/expected_result.nsec3-optout
+++ b/regression-tests/tests/ent-axfr/expected_result.nsec3-optout
@@ -1,4 +1,5 @@
-0bh8di769i8vvtkdds8efjda19abigo5.test.com.	3600	IN	NSEC3	1 1 1 abcd 23E9S542JEHG7KBKNCNJPJHPHUPCD1JE TXT RRSIG SPF
+0bh8di769i8vvtkdds8efjda19abigo5.test.com.	3600	IN	NSEC3	1 1 1 abcd 0POCAINVSVDVCPJNL9NQ2LU1T245OI1A TXT RRSIG SPF
+0pocainvsvdvcpjnl9nq2lu1t245oi1a.test.com.	3600	IN	NSEC3	1 1 1 abcd 23E9S542JEHG7KBKNCNJPJHPHUPCD1JE NAPTR RRSIG
 23e9s542jehg7kbkncnjpjhphupcd1je.test.com.	3600	IN	NSEC3	1 1 1 abcd 2EU2GULBU53H9UVHFALSHPBO2A83T6L2 A RRSIG
 2eu2gulbu53h9uvhfalshpbo2a83t6l2.test.com.	3600	IN	NSEC3	1 1 1 abcd 2GKS2N3JPQF62QOHAVFQ1PHOLM3HR7RA NS SOA MX RRSIG DNSKEY NSEC3PARAM
 2gks2n3jpqf62qohavfq1pholm3hr7ra.test.com.	3600	IN	NSEC3	1 1 1 abcd 4UL8F3M96VCONEA85U93DH9SG570J4FU TXT RRSIG
@@ -15,7 +16,8 @@ aovp95mr44hqefrqus6nomsd944bm3vb.test.com.	3600	IN	NSEC3	1 1 1 abcd B022O9DKSAJ7
 b022o9dksaj737fh77e7kqqtj3om56ki.test.com.	3600	IN	NSEC3	1 1 1 abcd BAE1G74DOIMCDKG03DAFHMGRLH2L19TU
 bae1g74doimcdkg03dafhmgrlh2l19tu.test.com.	3600	IN	NSEC3	1 1 1 abcd CGFU8T55L510A9K688GBO9UACMBBS2AB
 cgfu8t55l510a9k688gbo9uacmbbs2ab.test.com.	3600	IN	NSEC3	1 1 1 abcd DAFC69CV5N2TFCF6OVBVTV94DRGMQJO5 A RRSIG
-dafc69cv5n2tfcf6ovbvtv94drgmqjo5.test.com.	3600	IN	NSEC3	1 1 1 abcd EBAN51BJGUGORB20UNP5PEEC7S5D2EKA TXT RRSIG
+dafc69cv5n2tfcf6ovbvtv94drgmqjo5.test.com.	3600	IN	NSEC3	1 1 1 abcd DH5R2B2JT3BB1BP7EUS2I7RS70DTS850 TXT RRSIG
+dh5r2b2jt3bb1bp7eus2i7rs70dts850.test.com.	3600	IN	NSEC3	1 1 1 abcd EBAN51BJGUGORB20UNP5PEEC7S5D2EKA NAPTR RRSIG
 eban51bjgugorb20unp5peec7s5d2eka.test.com.	3600	IN	NSEC3	1 1 1 abcd ENG6HBK77VJMQFVG6S04HAJOA2201LII SRV RRSIG
 eng6hbk77vjmqfvg6s04hajoa2201lii.test.com.	3600	IN	NSEC3	1 1 1 abcd H5855RVON2AASM8QV1NK49I1B2MKBEJP A TXT RRSIG
 h5855rvon2aasm8qv1nk49i1b2mkbejp.test.com.	3600	IN	NSEC3	1 1 1 abcd IAI9HIN25MEH689R5V5GTIFK8OM5DI0E A RRSIG
diff --git a/regression-tests/tests/naptr/command b/regression-tests/tests/naptr/command
index 1a367cfaf424..0da7367864a5 100755
--- a/regression-tests/tests/naptr/command
+++ b/regression-tests/tests/naptr/command
@@ -1,3 +1,4 @@
 #!/bin/sh
 cleandig enum.test.com NAPTR
-
+cleandig ensm.test.com NAPTR
+cleandig enam.test.com NAPTR
diff --git a/regression-tests/tests/naptr/expected_result b/regression-tests/tests/naptr/expected_result
index 4a4aa625613d..9ed15187f850 100644
--- a/regression-tests/tests/naptr/expected_result
+++ b/regression-tests/tests/naptr/expected_result
@@ -1,3 +1,13 @@
-0	enum.test.com.	3600	IN	NAPTR	100 50 "u" "e2u+sip" "" testuser.domain.com.
+0	enum.test.com.	3600	IN	NAPTR	100 50 "u" "e2u+sip" "" server1.test.com.
 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='enum.test.com.', qtype=NAPTR
+0	ensm.test.com.	3600	IN	NAPTR	100 50 "s" "e2u+sip" "" _double._tcp.dc.test.com.
+2	_double._tcp.dc.test.com.	3600	IN	SRV	0 100 389 server1.test.com.
+2	_double._tcp.dc.test.com.	3600	IN	SRV	1 100 389 server1.test.com.
+2	server1.test.com.	3600	IN	A	1.2.3.4
+Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
+Reply to question for qname='ensm.test.com.', qtype=NAPTR
+0	enam.test.com.	3600	IN	NAPTR	100 50 "a" "e2u+sip" "" server1.test.com.
+2	server1.test.com.	3600	IN	A	1.2.3.4
+Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
+Reply to question for qname='enam.test.com.', qtype=NAPTR
diff --git a/regression-tests/zones/test.com b/regression-tests/zones/test.com
index f3adcb1fe7ed..dd32a827c661 100644
--- a/regression-tests/zones/test.com
+++ b/regression-tests/zones/test.com
@@ -20,7 +20,9 @@ server1			IN	A	1.2.3.4
 *.test			IN	CNAME	server1
 www.test		IN	A	4.3.2.1
 sub.test		IN	NS	ns-test.example.net
-enum			IN	NAPTR 100 50 "u" "e2u+sip" "" testuser.domain.com.
+enum			IN	NAPTR 100 50 "u" "e2u+sip" "" server1.test.com.
+ensm			IN	NAPTR 100 50 "s" "e2u+sip" "" _double._tcp.dc.test.com.
+enam			IN	NAPTR 100 50 "a" "e2u+sip" "" server1.test.com.
 counter			IN	A	1.1.1.5
 _ldap._tcp.dc		IN	SRV 	0 100 389 server2.example.net.
 _double._tcp.dc		IN	SRV 	0 100 389 server1