From: Miod Vallat Date: Wed, 5 Mar 2025 13:04:35 +0000 (+0100) Subject: Add NAPTR tests with multiple records to process. X-Git-Tag: dnsdist-2.0.0-alpha1~39^2 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ed8c46065d79c271c1908f55b36b4e8c195a6f0f;p=thirdparty%2Fpdns.git Add NAPTR tests with multiple records to process. --- 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 d23f0e5887..a65f96efaa 100644 Binary files a/modules/tinydnsbackend/data.cdb and b/modules/tinydnsbackend/data.cdb differ 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