From 3b3f5a72dc2c7fc81640495703ebcff59d71f158 Mon Sep 17 00:00:00 2001 From: Peter van Dijk Date: Tue, 6 Dec 2022 15:40:51 +0100 Subject: [PATCH] add ordername testing --- modules/tinydnsbackend/data | 3 +++ modules/tinydnsbackend/data.cdb | Bin 1356068 -> 1356349 bytes .../tinydns-data-check/expected_result | 6 +++--- .../tests/ent-axfr/expected_result | 5 ++++- .../tests/ent-axfr/expected_result.nsec3 | 10 +++++++--- .../ent-axfr/expected_result.nsec3-optout | 10 +++++++--- regression-tests/zones/test.com | 5 +++++ 7 files changed, 29 insertions(+), 10 deletions(-) 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 bdaff5fd8d0e22a0a8c16c569963b2673f53991d..b71ae2d51ecda7103f1a61fb5fa10ea28aebb0ab 100644 GIT binary patch delta 7646 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 LG(KQ8Ywq=bp^+bo 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 -- 2.47.2