From ed8c46065d79c271c1908f55b36b4e8c195a6f0f Mon Sep 17 00:00:00 2001
From: Miod Vallat <miod.vallat@powerdns.com>
Date: Wed, 5 Mar 2025 14:04:35 +0100
Subject: [PATCH] Add NAPTR tests with multiple records to process.

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

diff --git a/modules/tinydnsbackend/data b/modules/tinydnsbackend/data
index c09744d5cf..4e683714b9 100644
--- a/modules/tinydnsbackend/data
+++ b/modules/tinydnsbackend/data
@@ -20196,6 +20196,9 @@ Zexample.com:ns1.example.com.:ahu.example.com.:2847484148:28800:7200:604800:8640
 :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
+:naptr.test.com:35:\000d\0002\001a\007e2u\053sip\000\007server1\004test\003com\000:3600
+:naptr.test.com:35:\000d\0002\001s\007e2u\053sip\000\007_double\004_tcp\002dc\004test\003com\000:3600
+:naptr.test.com:35:\000d\0002\001u\007e2u\053sip\000\007server1\004test\003com\000:3600
 :server1.test.com:17:\003ahu\004ds9a\002nl\000\007counter\004test\003com\000:3600
 :urc65226.test.com:65226:ABC:3600
 :very-long-txt.test.com:16:\377A\040very\040long\040TXT\040record\041\040boy\040you\040won\047t\040believe\040how\040long.\040A\040very\040long\040TXT\040record\041\040boy\040you\040won\047t\040believe\040how\040long.\040A\040very\040long\040TXT\040record\041\040boy\040you\040won\047t\040believe\040how\040long.\040A\040very\040long\040TXT\040record\041\040boy\040you\040won\047t\040believe\040how\040long.\040A\040very\040long\040TXT\040record\041\040boy\040you\030\040won\047t\040believe\040how\040long\041:3600
diff --git a/modules/tinydnsbackend/data.cdb b/modules/tinydnsbackend/data.cdb
index d23f0e58877777bcf70c0f73d61469ecea81daa1..a65f96efaae52a351d3996410201efb4d7cb766a 100644
GIT binary patch
delta 4647
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
Q$u`04JZXVNd~eXd0S3H3@c;k-

delta 4496
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

diff --git a/regression-tests.nobackend/tinydns-data-check/expected_result b/regression-tests.nobackend/tinydns-data-check/expected_result
index ecdbff1568..c0711c41e1 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
-971435ef3a1f47e459c992c5875b4363  ../regression-tests/zones/test.com
+5cce94d1d050925d3bb8c5271a10961b  ../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
-c38877660e9ea3ca06bef9a655373013  ../modules/tinydnsbackend/data
-4bb3554f17c50327ba392cfbe5faaaa3  ../modules/tinydnsbackend/data.cdb
+291489428c41bb9391e22bead5e94511  ../modules/tinydnsbackend/data
+cac5364329a0c45f7ac4c8eeeb0cf774  ../modules/tinydnsbackend/data.cdb
diff --git a/regression-tests/tests/ent-axfr/expected_result b/regression-tests/tests/ent-axfr/expected_result
index feb1f1aecc..6906e4cc43 100644
--- a/regression-tests/tests/ent-axfr/expected_result
+++ b/regression-tests/tests/ent-axfr/expected_result
@@ -16,7 +16,8 @@ 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
+interrupted-rrset.test.com.	3600	IN	NSEC	naptr.test.com. A TXT RRSIG NSEC
+naptr.test.com.	3600	IN	NSEC	ns1.test.com. NAPTR RRSIG NSEC
 ns1.test.com.	3600	IN	NSEC	ns2.test.com. A RRSIG NSEC
 ns2.test.com.	3600	IN	NSEC	10.order.test.com. A RRSIG NSEC
 server1.test.com.	3600	IN	NSEC	*.test.test.com. A RP RRSIG NSEC
diff --git a/regression-tests/tests/ent-axfr/expected_result.nsec3 b/regression-tests/tests/ent-axfr/expected_result.nsec3
index d1db181861..ec98d29f3d 100644
--- a/regression-tests/tests/ent-axfr/expected_result.nsec3
+++ b/regression-tests/tests/ent-axfr/expected_result.nsec3
@@ -6,7 +6,8 @@
 4ul8f3m96vconea85u93dh9sg570j4fu.test.com.	3600	IN	NSEC3	1 0 1 abcd 53L445R26RG1CSBI4TS1K3I3EL1F30VM DNAME RRSIG
 53l445r26rg1csbi4ts1k3i3el1f30vm.test.com.	3600	IN	NSEC3	1 0 1 abcd 53LJH1SKI76U8MVC0TPOA423TDUR0KL8 SRV RRSIG
 53ljh1ski76u8mvc0tpoa423tdur0kl8.test.com.	3600	IN	NSEC3	1 0 1 abcd 5VE0V7KDJ5BSD70O75FC4GTF8T2QJRB8 RRSIG TYPE65226
-5ve0v7kdj5bsd70o75fc4gtf8t2qjrb8.test.com.	3600	IN	NSEC3	1 0 1 abcd 79RA8K3G5KAI1HG9JLHBR6P0TP933M7V A RRSIG
+5ve0v7kdj5bsd70o75fc4gtf8t2qjrb8.test.com.	3600	IN	NSEC3	1 0 1 abcd 6B8NAEE3OO0QOSQER6OB6C5PN2RF1B02 A RRSIG
+6b8naee3oo0qosqer6ob6c5pn2rf1b02.test.com.	3600	IN	NSEC3	1 0 1 abcd 79RA8K3G5KAI1HG9JLHBR6P0TP933M7V NAPTR RRSIG
 79ra8k3g5kai1hg9jlhbr6p0tp933m7v.test.com.	3600	IN	NSEC3	1 0 1 abcd 79U3DAS6UCCTNS1BR3TVD8QKANNI351L A RRSIG
 79u3das6ucctns1br3tvd8qkanni351l.test.com.	3600	IN	NSEC3	1 0 1 abcd 7MMURA8H40BE5N4KOAN7RNMKURSAMH99
 7mmura8h40be5n4koan7rnmkursamh99.test.com.	3600	IN	NSEC3	1 0 1 abcd 88F1BQRB2ISCVFEL2SQQCKSVFLNEKAP6
diff --git a/regression-tests/tests/ent-axfr/expected_result.nsec3-optout b/regression-tests/tests/ent-axfr/expected_result.nsec3-optout
index cfec54f6ae..c02d2da405 100644
--- a/regression-tests/tests/ent-axfr/expected_result.nsec3-optout
+++ b/regression-tests/tests/ent-axfr/expected_result.nsec3-optout
@@ -6,7 +6,8 @@
 4ul8f3m96vconea85u93dh9sg570j4fu.test.com.	3600	IN	NSEC3	1 1 1 abcd 53L445R26RG1CSBI4TS1K3I3EL1F30VM DNAME RRSIG
 53l445r26rg1csbi4ts1k3i3el1f30vm.test.com.	3600	IN	NSEC3	1 1 1 abcd 53LJH1SKI76U8MVC0TPOA423TDUR0KL8 SRV RRSIG
 53ljh1ski76u8mvc0tpoa423tdur0kl8.test.com.	3600	IN	NSEC3	1 1 1 abcd 5VE0V7KDJ5BSD70O75FC4GTF8T2QJRB8 RRSIG TYPE65226
-5ve0v7kdj5bsd70o75fc4gtf8t2qjrb8.test.com.	3600	IN	NSEC3	1 1 1 abcd 79RA8K3G5KAI1HG9JLHBR6P0TP933M7V A RRSIG
+5ve0v7kdj5bsd70o75fc4gtf8t2qjrb8.test.com.	3600	IN	NSEC3	1 1 1 abcd 6B8NAEE3OO0QOSQER6OB6C5PN2RF1B02 A RRSIG
+6b8naee3oo0qosqer6ob6c5pn2rf1b02.test.com.	3600	IN	NSEC3	1 1 1 abcd 79RA8K3G5KAI1HG9JLHBR6P0TP933M7V NAPTR RRSIG
 79ra8k3g5kai1hg9jlhbr6p0tp933m7v.test.com.	3600	IN	NSEC3	1 1 1 abcd 79U3DAS6UCCTNS1BR3TVD8QKANNI351L A RRSIG
 79u3das6ucctns1br3tvd8qkanni351l.test.com.	3600	IN	NSEC3	1 1 1 abcd 7MMURA8H40BE5N4KOAN7RNMKURSAMH99
 7mmura8h40be5n4koan7rnmkursamh99.test.com.	3600	IN	NSEC3	1 1 1 abcd 88F1BQRB2ISCVFEL2SQQCKSVFLNEKAP6
diff --git a/regression-tests/tests/naptr/command b/regression-tests/tests/naptr/command
index 0da7367864..d12ffffe91 100755
--- a/regression-tests/tests/naptr/command
+++ b/regression-tests/tests/naptr/command
@@ -2,3 +2,4 @@
 cleandig enum.test.com NAPTR
 cleandig ensm.test.com NAPTR
 cleandig enam.test.com NAPTR
+cleandig naptr.test.com NAPTR
diff --git a/regression-tests/tests/naptr/expected_result b/regression-tests/tests/naptr/expected_result
index 9ed15187f8..f093f5516c 100644
--- a/regression-tests/tests/naptr/expected_result
+++ b/regression-tests/tests/naptr/expected_result
@@ -11,3 +11,11 @@ Reply to question for qname='ensm.test.com.', qtype=NAPTR
 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
+0	naptr.test.com.	3600	IN	NAPTR	100 50 "a" "e2u+sip" "" server1.test.com.
+0	naptr.test.com.	3600	IN	NAPTR	100 50 "s" "e2u+sip" "" _double._tcp.dc.test.com.
+0	naptr.test.com.	3600	IN	NAPTR	100 50 "u" "e2u+sip" "" server1.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='naptr.test.com.', qtype=NAPTR
diff --git a/regression-tests/zones/test.com b/regression-tests/zones/test.com
index dd32a827c6..8a673b14b8 100644
--- a/regression-tests/zones/test.com
+++ b/regression-tests/zones/test.com
@@ -23,6 +23,9 @@ sub.test		IN	NS	ns-test.example.net
 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.
+naptr			IN	NAPTR 100 50 "u" "e2u+sip" "" server1.test.com.
+naptr			IN	NAPTR 100 50 "s" "e2u+sip" "" _double._tcp.dc.test.com.
+naptr			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
-- 
2.47.2