From: Peter van Dijk Date: Tue, 6 Dec 2022 14:40:51 +0000 (+0100) Subject: add ordername testing X-Git-Tag: auth-4.7.4~1^2 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=refs%2Fpull%2F12746%2Fhead;p=thirdparty%2Fpdns.git add ordername testing --- diff --git a/modules/tinydnsbackend/data b/modules/tinydnsbackend/data index 70e8392fe8..7a262b3eda 100644 --- a/modules/tinydnsbackend/data +++ b/modules/tinydnsbackend/data @@ -20167,6 +20167,9 @@ Zexample.com:ns1.example.com.:ahu.example.com.:2847484148:28800:7200:604800:8640 &sub.test.test.com::ns-test.example.net.test.com.:3600 &test.com::ns1.test.com.:3600 &test.com::ns2.test.com.:3600 ++10.order.test.com:192.168.0.1:3600 ++100.order.test.com:192.168.0.1:3600 ++15.order.test.com:192.168.0.1:3600 +\052.a.b.c.test.com:8.7.6.5:3600 +b.c.test.com:5.6.7.8:3600 +blah.test.com:192.168.6.1:3600 diff --git a/modules/tinydnsbackend/data.cdb b/modules/tinydnsbackend/data.cdb index bdaff5fd8d..b71ae2d51e 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 3a9281cb54..71c0ebda7a 100644 --- a/regression-tests.nobackend/tinydns-data-check/expected_result +++ b/regression-tests.nobackend/tinydns-data-check/expected_result @@ -1,5 +1,5 @@ 229dad9ea0464a429685d3dda8a8e9ef ../regression-tests/zones/example.com -fe49d2784b1bcc3b91ddd5619f0b6cc1 ../regression-tests/zones/test.com +f8f0d7b157495ec8ee70851e3d5cb65e ../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 -72a8a8dcaf116b4c770743d4ad090146 ../modules/tinydnsbackend/data -ea497141c22e13c145cf7d7b93787186 ../modules/tinydnsbackend/data.cdb +964425367cec0d828222b144c4e1c540 ../modules/tinydnsbackend/data +f3932b1df41d683f47516455b571c358 ../modules/tinydnsbackend/data.cdb diff --git a/regression-tests/tests/ent-axfr/expected_result b/regression-tests/tests/ent-axfr/expected_result index 756c5d0fbb..6421d01dbe 100644 --- a/regression-tests/tests/ent-axfr/expected_result +++ b/regression-tests/tests/ent-axfr/expected_result @@ -1,5 +1,8 @@ *.a.b.c.test.com. 3600 IN NSEC counter.test.com. A RRSIG NSEC *.test.test.com. 3600 IN NSEC sub.test.test.com. CNAME RRSIG NSEC +10.order.test.com. 3600 IN NSEC 100.order.test.com. A RRSIG NSEC +100.order.test.com. 3600 IN NSEC 15.order.test.com. A RRSIG NSEC +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 @@ -13,7 +16,7 @@ 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 ns1.test.com. 3600 IN NSEC ns2.test.com. A RRSIG NSEC -ns2.test.com. 3600 IN NSEC server1.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 sub.test.test.com. 3600 IN NSEC www.test.test.com. NS RRSIG NSEC test.com. 3600 IN NSEC _underscore.test.com. NS SOA MX RRSIG NSEC DNSKEY diff --git a/regression-tests/tests/ent-axfr/expected_result.nsec3 b/regression-tests/tests/ent-axfr/expected_result.nsec3 index 08586761b1..1a51604625 100644 --- a/regression-tests/tests/ent-axfr/expected_result.nsec3 +++ b/regression-tests/tests/ent-axfr/expected_result.nsec3 @@ -1,16 +1,20 @@ -0bh8di769i8vvtkdds8efjda19abigo5.test.com. 3600 IN NSEC3 1 0 1 abcd 2EU2GULBU53H9UVHFALSHPBO2A83T6L2 TXT RRSIG SPF +0bh8di769i8vvtkdds8efjda19abigo5.test.com. 3600 IN NSEC3 1 0 1 abcd 23E9S542JEHG7KBKNCNJPJHPHUPCD1JE TXT RRSIG SPF +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 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 79RA8K3G5KAI1HG9JLHBR6P0TP933M7V RRSIG TYPE65226 +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 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 88f1bqrb2iscvfel2sqqcksvflnekap6.test.com. 3600 IN NSEC3 1 0 1 abcd A5LABAGJJEVR86GH0HF3JG7NUFHGA5AR CNAME RRSIG a5labagjjevr86gh0hf3jg7nufhga5ar.test.com. 3600 IN NSEC3 1 0 1 abcd AOVP95MR44HQEFRQUS6NOMSD944BM3VB A RRSIG aovp95mr44hqefrqus6nomsd944bm3vb.test.com. 3600 IN NSEC3 1 0 1 abcd B022O9DKSAJ737FH77E7KQQTJ3OM56KI A RRSIG -b022o9dksaj737fh77e7kqqtj3om56ki.test.com. 3600 IN NSEC3 1 0 1 abcd DAFC69CV5N2TFCF6OVBVTV94DRGMQJO5 +b022o9dksaj737fh77e7kqqtj3om56ki.test.com. 3600 IN NSEC3 1 0 1 abcd BAE1G74DOIMCDKG03DAFHMGRLH2L19TU +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 eban51bjgugorb20unp5peec7s5d2eka.test.com. 3600 IN NSEC3 1 0 1 abcd ENG6HBK77VJMQFVG6S04HAJOA2201LII SRV RRSIG diff --git a/regression-tests/tests/ent-axfr/expected_result.nsec3-optout b/regression-tests/tests/ent-axfr/expected_result.nsec3-optout index ea77f5093a..f56193cb85 100644 --- a/regression-tests/tests/ent-axfr/expected_result.nsec3-optout +++ b/regression-tests/tests/ent-axfr/expected_result.nsec3-optout @@ -1,16 +1,20 @@ -0bh8di769i8vvtkdds8efjda19abigo5.test.com. 3600 IN NSEC3 1 1 1 abcd 2EU2GULBU53H9UVHFALSHPBO2A83T6L2 TXT RRSIG SPF +0bh8di769i8vvtkdds8efjda19abigo5.test.com. 3600 IN NSEC3 1 1 1 abcd 23E9S542JEHG7KBKNCNJPJHPHUPCD1JE TXT RRSIG SPF +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 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 79RA8K3G5KAI1HG9JLHBR6P0TP933M7V RRSIG TYPE65226 +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 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 88f1bqrb2iscvfel2sqqcksvflnekap6.test.com. 3600 IN NSEC3 1 1 1 abcd A5LABAGJJEVR86GH0HF3JG7NUFHGA5AR CNAME RRSIG a5labagjjevr86gh0hf3jg7nufhga5ar.test.com. 3600 IN NSEC3 1 1 1 abcd AOVP95MR44HQEFRQUS6NOMSD944BM3VB A RRSIG aovp95mr44hqefrqus6nomsd944bm3vb.test.com. 3600 IN NSEC3 1 1 1 abcd B022O9DKSAJ737FH77E7KQQTJ3OM56KI A RRSIG -b022o9dksaj737fh77e7kqqtj3om56ki.test.com. 3600 IN NSEC3 1 1 1 abcd DAFC69CV5N2TFCF6OVBVTV94DRGMQJO5 +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 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 diff --git a/regression-tests/zones/test.com b/regression-tests/zones/test.com index d040d06edf..f3adcb1fe7 100644 --- a/regression-tests/zones/test.com +++ b/regression-tests/zones/test.com @@ -41,3 +41,8 @@ urc65226 IN TYPE65226 \# 3 414243 interrupted-rrset IN A 1.1.1.1 interrupted-rrset IN TXT "check AXFR signpipe" interrupted-rrset IN A 2.2.2.2 + +; ordername sorting +10.order IN A 192.168.0.1 +15.order IN A 192.168.0.1 +100.order IN A 192.168.0.1