From: Kees Monshouwer Date: Thu, 20 Feb 2014 08:05:19 +0000 (+0100) Subject: add test for ent which is only derived from an insecure delegation X-Git-Tag: rec-3.6.0-rc1~169^2~20 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=eb0d024e359463292d4dc750567fd5c41eb349d7;p=thirdparty%2Fpdns.git add test for ent which is only derived from an insecure delegation --- diff --git a/modules/tinydnsbackend/data b/modules/tinydnsbackend/data index c06e291469..a324e7728f 100644 --- a/modules/tinydnsbackend/data +++ b/modules/tinydnsbackend/data @@ -20232,6 +20232,7 @@ Zdnssec-parent.com:ns1.dnssec-parent.com.:ahu.example.com.:2005092501:28800:7200 &delegated.dnssec-parent.com::ns2.delegated.dnssec-parent.com.:3600 +ns1.delegated.dnssec-parent.com:4.5.6.7:3600 +ns2.delegated.dnssec-parent.com:5.6.7.8:3600 +&insecure-delegated.ent.dnssec-parent.com::ns.example.com.:3600 +ns1.dnssec-parent.com:1.2.3.4:3600 +ns2.dnssec-parent.com:4.3.2.1:3600 &secure-delegated.dnssec-parent.com::ns1.secure-delegated.dnssec-parent.com.:3600 diff --git a/modules/tinydnsbackend/data.cdb b/modules/tinydnsbackend/data.cdb index e9deacee8a..e258c3d33b 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 311bd03c5e..ceddb4d79f 100644 --- a/regression-tests.nobackend/tinydns-data-check/expected_result +++ b/regression-tests.nobackend/tinydns-data-check/expected_result @@ -3,10 +3,10 @@ 005b3381db2a7dc70b690484f6ab7770 ../regression-tests/zones/test.dyndns 21213b4e8cd56e4184696a1bafd987d7 ../regression-tests/zones/wtest.com 42b442de632686e94bde75acf66cf524 ../regression-tests/zones/nztest.com -6e4ac6e3a6cd717df107a7bc2e466ac7 ../regression-tests/zones/dnssec-parent.com +e7d974086e9b73dda2656cb043e90de4 ../regression-tests/zones/dnssec-parent.com 6510bf48aa3ca3501b73a1f510852a34 ../regression-tests/zones/delegated.dnssec-parent.com a63dc120391d9df0003f2ec4f461a6af ../regression-tests/zones/secure-delegated.dnssec-parent.com 24514dc104b22206daeb973ff9303545 ../regression-tests/zones/minimal.com 0b20d7a0250576451135483b863750bf ../regression-tests/zones/tsig.com b1f775045fa2cf0a3b91aa834af06e49 ../regression-tests/zones/stest.com -80927ffb754402270483d06c0ebeaaad ../modules/tinydnsbackend/data.cdb +c21e01a6158f03732c911fe22f4ce1db ../modules/tinydnsbackend/data.cdb diff --git a/regression-tests/tests/ds-at-unsecure-zone-cut/expected_result b/regression-tests/tests/ds-at-unsecure-zone-cut/expected_result index 42a8352647..890b4559a9 100644 --- a/regression-tests/tests/ds-at-unsecure-zone-cut/expected_result +++ b/regression-tests/tests/ds-at-unsecure-zone-cut/expected_result @@ -1,4 +1,4 @@ -1 delegated.dnssec-parent.com. IN NSEC 86400 ns1.dnssec-parent.com. NS RRSIG NSEC +1 delegated.dnssec-parent.com. IN NSEC 86400 insecure-delegated.ent.dnssec-parent.com. NS RRSIG NSEC 1 delegated.dnssec-parent.com. IN RRSIG 86400 NSEC 8 3 86400 [expiry] [inception] [keytag] dnssec-parent.com. ... 1 dnssec-parent.com. IN RRSIG 3600 SOA 8 2 3600 [expiry] [inception] [keytag] dnssec-parent.com. ... 1 dnssec-parent.com. IN SOA 3600 ns1.dnssec-parent.com. ahu.example.com. 2005092501 28800 7200 604800 86400 diff --git a/regression-tests/tests/ent-unsigned-delegation/command b/regression-tests/tests/ent-unsigned-delegation/command new file mode 100755 index 0000000000..72f284f96f --- /dev/null +++ b/regression-tests/tests/ent-unsigned-delegation/command @@ -0,0 +1,2 @@ +#!/bin/sh +cleandig ent.dnssec-parent.com A dnssec showflags diff --git a/regression-tests/tests/ent-unsigned-delegation/description b/regression-tests/tests/ent-unsigned-delegation/description new file mode 100644 index 0000000000..7302f1bb04 --- /dev/null +++ b/regression-tests/tests/ent-unsigned-delegation/description @@ -0,0 +1 @@ +Check if we generate empty non-terminals for delegations (NS records) diff --git a/regression-tests/tests/ent-unsigned-delegation/expected_result b/regression-tests/tests/ent-unsigned-delegation/expected_result new file mode 100644 index 0000000000..344f9704a2 --- /dev/null +++ b/regression-tests/tests/ent-unsigned-delegation/expected_result @@ -0,0 +1,4 @@ +1 dnssec-parent.com. IN SOA 3600 ns1.dnssec-parent.com. ahu.example.com. 2005092501 28800 7200 604800 86400 +2 . IN OPT 32768 +Rcode: 0, RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0 +Reply to question for qname='ent.dnssec-parent.com.', qtype=A diff --git a/regression-tests/tests/ent-unsigned-delegation/expected_result.dnssec b/regression-tests/tests/ent-unsigned-delegation/expected_result.dnssec new file mode 100644 index 0000000000..869148f0be --- /dev/null +++ b/regression-tests/tests/ent-unsigned-delegation/expected_result.dnssec @@ -0,0 +1,7 @@ +1 delegated.dnssec-parent.com. IN NSEC 86400 insecure-delegated.ent.dnssec-parent.com. NS RRSIG NSEC +1 delegated.dnssec-parent.com. IN RRSIG 86400 NSEC 8 3 86400 [expiry] [inception] [keytag] dnssec-parent.com. ... +1 dnssec-parent.com. IN RRSIG 3600 SOA 8 2 3600 [expiry] [inception] [keytag] dnssec-parent.com. ... +1 dnssec-parent.com. IN SOA 3600 ns1.dnssec-parent.com. ahu.example.com. 2005092501 28800 7200 604800 86400 +2 . IN OPT 32768 +Rcode: 0, RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0 +Reply to question for qname='ent.dnssec-parent.com.', qtype=A diff --git a/regression-tests/tests/ent-unsigned-delegation/expected_result.narrow b/regression-tests/tests/ent-unsigned-delegation/expected_result.narrow new file mode 100644 index 0000000000..79364ba623 --- /dev/null +++ b/regression-tests/tests/ent-unsigned-delegation/expected_result.narrow @@ -0,0 +1,7 @@ +1 0gi0g3b7aatt101lke76c7pjoir5meap.dnssec-parent.com. IN NSEC3 86400 1 1 1 abcd 0GI0G3B7AATT101LKE76C7PJOIR5MEAQ +1 0gi0g3b7aatt101lke76c7pjoir5meap.dnssec-parent.com. IN RRSIG 86400 NSEC3 8 3 86400 [expiry] [inception] [keytag] dnssec-parent.com. ... +1 dnssec-parent.com. IN RRSIG 3600 SOA 8 2 3600 [expiry] [inception] [keytag] dnssec-parent.com. ... +1 dnssec-parent.com. IN SOA 3600 ns1.dnssec-parent.com. ahu.example.com. 2005092501 28800 7200 604800 86400 +2 . IN OPT 32768 +Rcode: 0, RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0 +Reply to question for qname='ent.dnssec-parent.com.', qtype=A diff --git a/regression-tests/tests/ent-unsigned-delegation/expected_result.nsec3 b/regression-tests/tests/ent-unsigned-delegation/expected_result.nsec3 new file mode 100644 index 0000000000..5aff632133 --- /dev/null +++ b/regression-tests/tests/ent-unsigned-delegation/expected_result.nsec3 @@ -0,0 +1,7 @@ +1 0gi0g3b7aatt101lke76c7pjoir5meap.dnssec-parent.com. IN NSEC3 86400 1 0 1 abcd 1SCAQA30LQ0DO5EIRNE4KPJFBEBFGR54 +1 0gi0g3b7aatt101lke76c7pjoir5meap.dnssec-parent.com. IN RRSIG 86400 NSEC3 8 3 86400 [expiry] [inception] [keytag] dnssec-parent.com. ... +1 dnssec-parent.com. IN RRSIG 3600 SOA 8 2 3600 [expiry] [inception] [keytag] dnssec-parent.com. ... +1 dnssec-parent.com. IN SOA 3600 ns1.dnssec-parent.com. ahu.example.com. 2005092501 28800 7200 604800 86400 +2 . IN OPT 32768 +Rcode: 0, RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0 +Reply to question for qname='ent.dnssec-parent.com.', qtype=A diff --git a/regression-tests/tests/ent-unsigned-delegation/expected_result.nsec3-optout b/regression-tests/tests/ent-unsigned-delegation/expected_result.nsec3-optout new file mode 100644 index 0000000000..b98f45dee6 --- /dev/null +++ b/regression-tests/tests/ent-unsigned-delegation/expected_result.nsec3-optout @@ -0,0 +1,7 @@ +1 dnssec-parent.com. IN RRSIG 3600 SOA 8 2 3600 [expiry] [inception] [keytag] dnssec-parent.com. ... +1 dnssec-parent.com. IN SOA 3600 ns1.dnssec-parent.com. ahu.example.com. 2005092501 28800 7200 604800 86400 +1 dvkuo8kja65gcsq600e6di9u719lsj8u.dnssec-parent.com. IN NSEC3 86400 1 1 1 abcd 1SCAQA30LQ0DO5EIRNE4KPJFBEBFGR54 A NS SOA RRSIG DNSKEY NSEC3PARAM +1 dvkuo8kja65gcsq600e6di9u719lsj8u.dnssec-parent.com. IN RRSIG 86400 NSEC3 8 3 86400 [expiry] [inception] [keytag] dnssec-parent.com. ... +2 . IN OPT 32768 +Rcode: 0, RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0 +Reply to question for qname='ent.dnssec-parent.com.', qtype=A diff --git a/regression-tests/tests/ent-unsigned-delegation/skip.noent b/regression-tests/tests/ent-unsigned-delegation/skip.noent new file mode 100644 index 0000000000..e69de29bb2 diff --git a/regression-tests/zones/dnssec-parent.com b/regression-tests/zones/dnssec-parent.com index 5515ad7631..6e32cc524c 100644 --- a/regression-tests/zones/dnssec-parent.com +++ b/regression-tests/zones/dnssec-parent.com @@ -21,4 +21,4 @@ secure-delegated IN NS ns1.secure-delegated.dnssec-parent.com. secure-delegated IN NS ns2.secure-delegated.dnssec-parent.com. ns1.secure-delegated IN A 1.2.3.4 ns2.secure-delegated IN A 5.6.7.8 - +insecure-delegated.ent IN NS ns.example.com.