From e62ba1c9d614bc5639b1748a2f5f240b19279052 Mon Sep 17 00:00:00 2001 From: Peter van Dijk Date: Fri, 23 Nov 2012 13:58:54 +0000 Subject: [PATCH] add named-checkzone to tests git-svn-id: svn://svn.powerdns.com/pdns/trunk/pdns@2919 d19b8d6e-7fed-0310-83ef-9ca221ded41b --- modules/tinydnsbackend/data | 4 +++ modules/tinydnsbackend/data.cdb | Bin 1345813 -> 1346043 bytes .../tinydns-data-check/expected_result | 6 ++-- .../apex-level-ns/expected_result | 2 ++ regression-tests/ent-axfr/expected_result | 4 ++- .../ent-axfr/expected_result.nsec3 | 6 ++-- .../five-levels-wildcard/expected_result | 2 +- .../expected_result.nsec3 | 2 +- .../nsec-wildcard/expected_result.nsec3 | 4 +-- regression-tests/test.com | 2 ++ .../underscore-sorting/expected_result.nsec3 | 2 +- regression-tests/verify-dnssec-zone/command | 10 ++++-- .../verify-dnssec-zone/expected_result | 29 +++++++++++++++++- regression-tests/wtest.com | 2 ++ 14 files changed, 60 insertions(+), 15 deletions(-) diff --git a/modules/tinydnsbackend/data b/modules/tinydnsbackend/data index ae9af86e3..954829870 100644 --- a/modules/tinydnsbackend/data +++ b/modules/tinydnsbackend/data @@ -20150,6 +20150,8 @@ Ztest.com:ns1.test.com.:ahu.example.com.:2005092501:28800:7200:604800:86400:3600 :_double._tcp.dc.test.com:33:\000\001\000d\001\205\007server1\004test\003com\000:3600 :_ldap._tcp.dc.test.com:33:\000\000\000d\001\205\007server2\007example\003net\000:3600 :enum.test.com:35:\000d\0002\001u\007e2u\053sip\000\010testuser\006domain\003com\000:3600 ++ns1.test.com:1.1.1.1:3600 ++ns2.test.com:2.2.2.2:3600 +server1.test.com:1.2.3.4:3600 :server1.test.com:17:\003ahu\004ds9a\002nl\000\007counter\004test\003com\000:3600 C\052.test.test.com:server1.test.com.:3600 @@ -20172,6 +20174,8 @@ C\052.wtest.com:server1.wtest.com.:3600 :b.c.d.e.wtest.com:16:\011non-empty:3600 :a.b.c.d.e.wtest.com:16:\011non-empty:3600 +\052.a.b.c.d.e.wtest.com:6.7.8.9:3600 ++ns1.wtest.com:2.3.4.5:3600 ++ns2.wtest.com:5.6.7.8:3600 @secure.wtest.com::server1.wtest.com.:10:3600 +server1.wtest.com:1.2.3.4:3600 :something.wtest.com:16:\045make\040the\040empty\040non-terminal\040non-empty:3600 diff --git a/modules/tinydnsbackend/data.cdb b/modules/tinydnsbackend/data.cdb index 8be5308663ada3bfdd64179bd667ca9c29d9d342..47d9f629f006a6844cac5713fb34ff929f6cde55 100644 GIT binary patch delta 6619 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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 f91691f99..206edb2a7 100644 --- a/regression-tests.nobackend/tinydns-data-check/expected_result +++ b/regression-tests.nobackend/tinydns-data-check/expected_result @@ -1,7 +1,7 @@ d59f36f23f780429676fbab5ac07e0d9 ../regression-tests/example.com -dde2d1eaa47f453e0d64705a5315adb0 ../regression-tests/test.com -7d726bc367bf5e6ee5f1689994c6b6d4 ../regression-tests/wtest.com +41ed80b8b9666ae6e02d4b8fee578963 ../regression-tests/test.com +21213b4e8cd56e4184696a1bafd987d7 ../regression-tests/wtest.com a0670eef8fba3e16908057af8de2c2f2 ../regression-tests/dnssec-parent.com 42dd3a56c7d268e75836371878819ec4 ../regression-tests/delegated.dnssec-parent.com 24514dc104b22206daeb973ff9303545 ../regression-tests/minimal.com -c499970b7dc7372f431665990a9f6692 ../modules/tinydnsbackend/data.cdb +88f6aaf1f4273ed9e5a45cfdde27de00 ../modules/tinydnsbackend/data.cdb diff --git a/regression-tests/apex-level-ns/expected_result b/regression-tests/apex-level-ns/expected_result index 5709ba939..02494a9d7 100644 --- a/regression-tests/apex-level-ns/expected_result +++ b/regression-tests/apex-level-ns/expected_result @@ -1,4 +1,6 @@ 0 test.com. IN NS 3600 ns1.test.com. 0 test.com. IN NS 3600 ns2.test.com. +2 ns1.test.com. IN A 3600 1.1.1.1 +2 ns2.test.com. IN A 3600 2.2.2.2 Rcode: 0, RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0 Reply to question for qname='test.com.', qtype=NS diff --git a/regression-tests/ent-axfr/expected_result b/regression-tests/ent-axfr/expected_result index e7c6915e3..ae79b66e3 100644 --- a/regression-tests/ent-axfr/expected_result +++ b/regression-tests/ent-axfr/expected_result @@ -6,7 +6,9 @@ _underscore.test.com. 86400 IN NSEC blah.test.com. TXT RRSIG NSEC b.c.test.com. 86400 IN NSEC *.a.b.c.test.com. A RRSIG NSEC blah.test.com. 86400 IN NSEC b.c.test.com. NS RRSIG NSEC counter.test.com. 86400 IN NSEC _double._tcp.dc.test.com. A RRSIG NSEC -enum.test.com. 86400 IN NSEC server1.test.com. NAPTR RRSIG NSEC +enum.test.com. 86400 IN NSEC ns1.test.com. NAPTR RRSIG NSEC +ns1.test.com. 86400 IN NSEC ns2.test.com. A RRSIG NSEC +ns2.test.com. 86400 IN NSEC server1.test.com. A RRSIG NSEC server1.test.com. 86400 IN NSEC *.test.test.com. A RP RRSIG NSEC sub.test.test.com. 86400 IN NSEC www.test.test.com. NS RRSIG NSEC test.com. 86400 IN NSEC _underscore.test.com. NS SOA MX RRSIG NSEC DNSKEY diff --git a/regression-tests/ent-axfr/expected_result.nsec3 b/regression-tests/ent-axfr/expected_result.nsec3 index 1bdb90174..a7428fbf5 100644 --- a/regression-tests/ent-axfr/expected_result.nsec3 +++ b/regression-tests/ent-axfr/expected_result.nsec3 @@ -1,4 +1,5 @@ -2eu2gulbu53h9uvhfalshpbo2a83t6l2.test.com. 86400 IN NSEC3 1 1 1 abcd 79u3das6ucctns1br3tvd8qkanni351l NS SOA MX RRSIG DNSKEY NSEC3PARAM +2eu2gulbu53h9uvhfalshpbo2a83t6l2.test.com. 86400 IN NSEC3 1 1 1 abcd 79ra8k3g5kai1hg9jlhbr6p0tp933m7v NS SOA MX RRSIG DNSKEY NSEC3PARAM +79ra8k3g5kai1hg9jlhbr6p0tp933m7v.test.com. 86400 IN NSEC3 1 1 1 abcd 79u3das6ucctns1br3tvd8qkanni351l A RRSIG 79u3das6ucctns1br3tvd8qkanni351l.test.com. 86400 IN NSEC3 1 1 1 abcd 7mmura8h40be5n4koan7rnmkursamh99 7mmura8h40be5n4koan7rnmkursamh99.test.com. 86400 IN NSEC3 1 1 1 abcd 88f1bqrb2iscvfel2sqqcksvflnekap6 88f1bqrb2iscvfel2sqqcksvflnekap6.test.com. 86400 IN NSEC3 1 1 1 abcd a5labagjjevr86gh0hf3jg7nufhga5ar CNAME RRSIG @@ -15,6 +16,7 @@ plud9qqecuril62gcfp8br44i7eoq7c9.test.com. 86400 IN NSEC3 1 1 1 abcd qd81ag9inq qd81ag9inqts1ocs7api0pji94k27btr.test.com. 86400 IN NSEC3 1 1 1 abcd s6g5shc1jvovl5fl9e943adlonqln7g4 CNAME RRSIG s6g5shc1jvovl5fl9e943adlonqln7g4.test.com. 86400 IN NSEC3 1 1 1 abcd sa5vvpqn1coejgj3hbkfekdnii8kksqa sa5vvpqn1coejgj3hbkfekdnii8kksqa.test.com. 86400 IN NSEC3 1 1 1 abcd sra2sm4pl136bultass7qqnlblipe8am NAPTR RRSIG -sra2sm4pl136bultass7qqnlblipe8am.test.com. 86400 IN NSEC3 1 1 1 abcd vlvujatanof6feajoesti9kq4s0crst3 CNAME RRSIG +sra2sm4pl136bultass7qqnlblipe8am.test.com. 86400 IN NSEC3 1 1 1 abcd u02utt5q2bhjcq986f05mbap0pgamt5o CNAME RRSIG test.com. 86400 IN NSEC3PARAM 1 0 1 abcd +u02utt5q2bhjcq986f05mbap0pgamt5o.test.com. 86400 IN NSEC3 1 1 1 abcd vlvujatanof6feajoesti9kq4s0crst3 A RRSIG vlvujatanof6feajoesti9kq4s0crst3.test.com. 86400 IN NSEC3 1 1 1 abcd 2eu2gulbu53h9uvhfalshpbo2a83t6l2 diff --git a/regression-tests/five-levels-wildcard/expected_result b/regression-tests/five-levels-wildcard/expected_result index 9d5a4fe24..072a52693 100644 --- a/regression-tests/five-levels-wildcard/expected_result +++ b/regression-tests/five-levels-wildcard/expected_result @@ -1,6 +1,6 @@ 0 www.a.b.c.d.e.wtest.com. IN A 3600 6.7.8.9 0 www.a.b.c.d.e.wtest.com. IN RRSIG 3600 A 8 7 3600 [expiry] [inception] [keytag] wtest.com. ... -1 *.a.b.c.d.e.wtest.com. IN NSEC 86400 secure.wtest.com. A RRSIG NSEC +1 *.a.b.c.d.e.wtest.com. IN NSEC 86400 ns1.wtest.com. A RRSIG NSEC 1 *.a.b.c.d.e.wtest.com. IN RRSIG 86400 NSEC 8 7 86400 [expiry] [inception] [keytag] wtest.com. ... 2 . IN OPT 32768 Rcode: 0, RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0 diff --git a/regression-tests/nsec-glue-at-delegation/expected_result.nsec3 b/regression-tests/nsec-glue-at-delegation/expected_result.nsec3 index c290970e5..95996f325 100644 --- a/regression-tests/nsec-glue-at-delegation/expected_result.nsec3 +++ b/regression-tests/nsec-glue-at-delegation/expected_result.nsec3 @@ -1,4 +1,4 @@ -1 2eu2gulbu53h9uvhfalshpbo2a83t6l2.test.com. IN NSEC3 86400 1 1 1 abcd 79U3DAS6UCCTNS1BR3TVD8QKANNI351L NS SOA MX RRSIG DNSKEY NSEC3PARAM +1 2eu2gulbu53h9uvhfalshpbo2a83t6l2.test.com. IN NSEC3 86400 1 1 1 abcd 79RA8K3G5KAI1HG9JLHBR6P0TP933M7V NS SOA MX RRSIG DNSKEY NSEC3PARAM 1 2eu2gulbu53h9uvhfalshpbo2a83t6l2.test.com. IN RRSIG 86400 NSEC3 8 3 86400 [expiry] [inception] [keytag] test.com. ... 1 blah.test.com. IN NS 3600 blah.test.com. 1 s6g5shc1jvovl5fl9e943adlonqln7g4.test.com. IN NSEC3 86400 1 1 1 abcd SA5VVPQN1COEJGJ3HBKFEKDNII8KKSQA diff --git a/regression-tests/nsec-wildcard/expected_result.nsec3 b/regression-tests/nsec-wildcard/expected_result.nsec3 index 30a9c881b..3456f6076 100644 --- a/regression-tests/nsec-wildcard/expected_result.nsec3 +++ b/regression-tests/nsec-wildcard/expected_result.nsec3 @@ -1,9 +1,9 @@ +1 2uspqp0ldid6481h33c7lakfkk2g2rdq.wtest.com. IN NSEC3 86400 1 1 1 abcd 44PRS96U2Q7MTAV4DNQMOSMSSI0K7630 A RRSIG +1 2uspqp0ldid6481h33c7lakfkk2g2rdq.wtest.com. IN RRSIG 86400 NSEC3 8 3 86400 [expiry] [inception] [keytag] wtest.com. ... 1 54njs65s8u96tkffrft6l7j1t1556vik.wtest.com. IN NSEC3 86400 1 1 1 abcd 67I2ESLUBOJ7DPG4263L3T8DV19G6D0G TXT RRSIG 1 54njs65s8u96tkffrft6l7j1t1556vik.wtest.com. IN RRSIG 86400 NSEC3 8 3 86400 [expiry] [inception] [keytag] wtest.com. ... 1 pd15qdsjjbfosu5fg2oqrnlb8r8oifl6.wtest.com. IN NSEC3 86400 1 1 1 abcd SHEGK154N8362AG22AR9VDDRF3127M6I A RRSIG 1 pd15qdsjjbfosu5fg2oqrnlb8r8oifl6.wtest.com. IN RRSIG 86400 NSEC3 8 3 86400 [expiry] [inception] [keytag] wtest.com. ... -1 shegk154n8362ag22ar9vddrf3127m6i.wtest.com. IN NSEC3 86400 1 1 1 abcd 53I5J7TGM8QG2GBV716RVQVARQCIJUE2 A NS SOA MX RRSIG DNSKEY NSEC3PARAM -1 shegk154n8362ag22ar9vddrf3127m6i.wtest.com. IN RRSIG 86400 NSEC3 8 3 86400 [expiry] [inception] [keytag] wtest.com. ... 1 wtest.com. IN RRSIG 3600 SOA 8 2 3600 [expiry] [inception] [keytag] wtest.com. ... 1 wtest.com. IN SOA 3600 ns1.wtest.com. ahu.example.com. 2005092501 28800 7200 604800 86400 2 . IN OPT 32768 diff --git a/regression-tests/test.com b/regression-tests/test.com index 2d9f374ae..ba1f0a255 100644 --- a/regression-tests/test.com +++ b/regression-tests/test.com @@ -11,6 +11,8 @@ $ORIGIN test.com. @ IN NS ns2 @ IN MX 10 smtp-servers.example.com. @ IN MX 15 smtp-servers +ns1 IN A 1.1.1.1 +ns2 IN A 2.2.2.2 www IN CNAME server1 server1 IN A 1.2.3.4 IN RP ahu.ds9a.nl. counter diff --git a/regression-tests/underscore-sorting/expected_result.nsec3 b/regression-tests/underscore-sorting/expected_result.nsec3 index 3f24c777c..6b3c7224e 100644 --- a/regression-tests/underscore-sorting/expected_result.nsec3 +++ b/regression-tests/underscore-sorting/expected_result.nsec3 @@ -1,2 +1,2 @@ -1 2eu2gulbu53h9uvhfalshpbo2a83t6l2.test.com. IN NSEC3 86400 1 1 1 abcd 79U3DAS6UCCTNS1BR3TVD8QKANNI351L NS SOA MX RRSIG DNSKEY NSEC3PARAM +1 2eu2gulbu53h9uvhfalshpbo2a83t6l2.test.com. IN NSEC3 86400 1 1 1 abcd 79RA8K3G5KAI1HG9JLHBR6P0TP933M7V NS SOA MX RRSIG DNSKEY NSEC3PARAM 1 igf4m7otecach14p0a6ingi7dbuas5b2.test.com. IN NSEC3 86400 1 1 1 abcd O1L0FB73HI3QP4A3FNQJSLEANLC883I3 A RP RRSIG diff --git a/regression-tests/verify-dnssec-zone/command b/regression-tests/verify-dnssec-zone/command index a5f3e5aa1..ff2e54f4b 100755 --- a/regression-tests/verify-dnssec-zone/command +++ b/regression-tests/verify-dnssec-zone/command @@ -1,13 +1,17 @@ #!/bin/sh -ldns-verify-zone -h | head -n 1 for zone in $(grep zone named.conf | cut -f2 -d\" | grep -v '^example.com$') do TFILE=$(mktemp) dig axfr $zone @$nameserver -p $port | ldns-read-zone -z > $TFILE - for validator in "ldns-verify-zone -V2" validns jdnssec-verifyzone + for validator in "ldns-verify-zone -V2" validns jdnssec-verifyzone named-checkzone do echo --- $validator $zone - $validator $TFILE 2>&1 + if [ "$validator" = "named-checkzone" ] + then + named-checkzone -i local $zone $TFILE 2>&1 | grep -v 'addnode: NSEC node already exists' + else + $validator $TFILE 2>&1 + fi RETVAL=$? echo RETVAL: $RETVAL if [ $RETVAL -gt 0 ] diff --git a/regression-tests/verify-dnssec-zone/expected_result b/regression-tests/verify-dnssec-zone/expected_result index 75613f398..038085921 100644 --- a/regression-tests/verify-dnssec-zone/expected_result +++ b/regression-tests/verify-dnssec-zone/expected_result @@ -1,4 +1,3 @@ -Usage: ldns-verify-zone [OPTIONS] --- ldns-verify-zone -V2 test.com RETVAL: 0 @@ -9,6 +8,13 @@ RETVAL: 0 zone verified. RETVAL: 0 +--- named-checkzone test.com +zone test.com/IN: test.com/MX 'smtp-servers.test.com' has no address records (A or AAAA) +zone test.com/IN: sub.test.test.com/NS 'ns-test.example.net.test.com' has no address records (A or AAAA) +zone test.com/IN: loaded serial 2005092501 (DNSSEC signed) +OK +RETVAL: 0 + --- ldns-verify-zone -V2 wtest.com RETVAL: 0 @@ -19,6 +25,12 @@ RETVAL: 0 zone verified. RETVAL: 0 +--- named-checkzone wtest.com +zone wtest.com/IN: wtest.com/MX 'smtp-servers.wtest.com' is a CNAME (illegal) +zone wtest.com/IN: loaded serial 2005092501 (DNSSEC signed) +OK +RETVAL: 0 + --- ldns-verify-zone -V2 dnssec-parent.com RETVAL: 0 @@ -29,6 +41,11 @@ RETVAL: 0 zone verified. RETVAL: 0 +--- named-checkzone dnssec-parent.com +zone dnssec-parent.com/IN: loaded serial 2005092501 (DNSSEC signed) +OK +RETVAL: 0 + --- ldns-verify-zone -V2 delegated.dnssec-parent.com RETVAL: 0 @@ -39,6 +56,11 @@ RETVAL: 0 zone verified. RETVAL: 0 +--- named-checkzone delegated.dnssec-parent.com +zone delegated.dnssec-parent.com/IN: loaded serial 2005092501 (DNSSEC signed) +OK +RETVAL: 0 + --- ldns-verify-zone -V2 minimal.com RETVAL: 0 @@ -49,3 +71,8 @@ RETVAL: 0 zone verified. RETVAL: 0 +--- named-checkzone minimal.com +zone minimal.com/IN: loaded serial 2000081501 (DNSSEC signed) +OK +RETVAL: 0 + diff --git a/regression-tests/wtest.com b/regression-tests/wtest.com index adcc71a3c..7049fefc6 100644 --- a/regression-tests/wtest.com +++ b/regression-tests/wtest.com @@ -12,6 +12,8 @@ $ORIGIN wtest.com. @ IN MX 10 smtp-servers.example.com. @ IN MX 15 smtp-servers @ IN A 9.9.9.9 +ns1 IN A 2.3.4.5 +ns2 IN A 5.6.7.8 * IN CNAME server1 secure IN MX 10 server1 server1 IN A 1.2.3.4 -- 2.40.0