From: Pieter Lexis Date: Wed, 22 Aug 2018 08:22:32 +0000 (+0200) Subject: Add out-of-zone additional data test. X-Git-Tag: auth-4.2.0-alpha1~25^2~5 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=99f29d7fb1014d461ec2edb5d7ab1ea13c65d0fb;p=thirdparty%2Fpdns.git Add out-of-zone additional data test. --- diff --git a/modules/remotebackend/regression-tests/apex-test/expected_result b/modules/remotebackend/regression-tests/apex-test/expected_result index e8f5ca6aa9..fad2018733 100644 --- a/modules/remotebackend/regression-tests/apex-test/expected_result +++ b/modules/remotebackend/regression-tests/apex-test/expected_result @@ -1,6 +1,4 @@ 0 up.example.com. IN NS 120 ns1.example.com. 0 up.example.com. IN NS 120 ns2.example.com. -2 ns1.example.com. IN A 120 192.168.2.2 -2 ns2.example.com. IN A 120 192.168.2.3 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0 Reply to question for qname='up.example.com.', qtype=NS diff --git a/modules/remotebackend/regression-tests/ns-at-delegation/expected_result b/modules/remotebackend/regression-tests/ns-at-delegation/expected_result index e8f5ca6aa9..fad2018733 100644 --- a/modules/remotebackend/regression-tests/ns-at-delegation/expected_result +++ b/modules/remotebackend/regression-tests/ns-at-delegation/expected_result @@ -1,6 +1,4 @@ 0 up.example.com. IN NS 120 ns1.example.com. 0 up.example.com. IN NS 120 ns2.example.com. -2 ns1.example.com. IN A 120 192.168.2.2 -2 ns2.example.com. IN A 120 192.168.2.3 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0 Reply to question for qname='up.example.com.', qtype=NS diff --git a/modules/tinydnsbackend/data b/modules/tinydnsbackend/data index 72c7a00632..bcbeb035f8 100644 --- a/modules/tinydnsbackend/data +++ b/modules/tinydnsbackend/data @@ -20100,24 +20100,25 @@ +toomuchinfo-b.example.com:192.168.99.90:120 +usa-ns1.usa.example.com:192.168.4.1:120 +usa-ns2.usa.example.com:192.168.4.2:120 +3ipv6.example.com:200106a80000000102104bfffe4b4c61:120 +:_imap._tcp.example.com:33:\000\000\000\001\000\217\004blah\004test\003com\000:120 :dsdelegation.example.com:43:m\341\010\001\312\361\352\256\315\253\347afpx\217\220\042EK\365\375\237\332:120 :escapedtext.example.com:16:\005begin\022the\040\042middle\042\040p\134art\007the\040end:120 :google-alias.example.com:65401:\023google-public-dns-a\006google\003com\000:120 :hightype.example.com:65534:\007\355\046\000\001:120 :host-0.example.com:108:\000PV\233\000\347:120 :host-1.example.com:109:\000PV\233\000\347\176W:120 -:hostmaster.mb.example.com:8:\004phil\303\177:120 -:hostmaster.mb.example.com:8:\006sheila\303\177:120 +:hostmaster.mb.example.com:8:\004phil\303\231:120 +:hostmaster.mb.example.com:8:\006sheila\303\231:120 :hwinfo.example.com:13:\003abc\003def:120 -:ipv6.example.com:28:\040\001\006\250\000\000\000\001\002\020K\377\376KLa:120 :location.example.com:29:\0002\026\023\213\044\323e\176\273\347\100\000\230\230\020:120 :location.example.com:29:\000B\026\023t\333\053\274\176\273\347\100\000\230\230\020:120 :location.example.com:29:\000\022\026\023\213\044\310\373\201D\030\300\000\230\230\020:120 :location.example.com:29:\000\042\026\023t\3331\320\201D\030\300\000\230\230\020:120 :multitext.example.com:16:\015text\040part\040one\015text\040part\040two\017text\040part\040three:120 -:phil.mb.example.com:7:\002pc\303\177:120 -:philip.mb.example.com:9:\303\216:120 -:sheila.mb.example.com:7:\004bill\303\177:120 +:phil.mb.example.com:7:\002pc\303\231:120 +:philip.mb.example.com:9:\303\250:120 +:sheila.mb.example.com:7:\004bill\303\231:120 :text.example.com:16:\025Hi\054\040this\040is\040some\040text:120 :text0.example.com:16:\014k\075rsa\073\040p\075one:120 :text1.example.com:16:\014k\075rsa\073\040p\075one:120 diff --git a/modules/tinydnsbackend/data.cdb b/modules/tinydnsbackend/data.cdb index e2bf2c3e58..c41b7e6a89 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 215d8240d0..bace48899d 100644 --- a/regression-tests.nobackend/tinydns-data-check/expected_result +++ b/regression-tests.nobackend/tinydns-data-check/expected_result @@ -1,4 +1,4 @@ -9f88091d3d1b793bf15a2cf5015bf92d ../regression-tests/zones/example.com +16f36b572fcb576e465f061e417626f8 ../regression-tests/zones/example.com fe49d2784b1bcc3b91ddd5619f0b6cc1 ../regression-tests/zones/test.com f0df67fa656d33fd85098cbe43893395 ../regression-tests/zones/test.dyndns dee3e8b568549d9450134b555ca73990 ../regression-tests/zones/sub.test.dyndns @@ -12,4 +12,4 @@ a63dc120391d9df0003f2ec4f461a6af ../regression-tests/zones/secure-delegated.dns b1f775045fa2cf0a3b91aa834af06e49 ../regression-tests/zones/stest.com a98864b315f16bcf49ce577426063c42 ../regression-tests/zones/cdnskey-cds-test.com 9aeed2c26d0c3ba3baf22dfa9568c451 ../regression-tests/zones/2.0.192.in-addr.arpa -7145702efe04410a480114206dea2da6 ../modules/tinydnsbackend/data.cdb +dcf9536d23ecffbdb706aa7d95bfb725 ../modules/tinydnsbackend/data.cdb diff --git a/regression-tests/tests/any-nxdomain/expected_result.dnssec b/regression-tests/tests/any-nxdomain/expected_result.dnssec index ea3fe09806..5775bc95cc 100644 --- a/regression-tests/tests/any-nxdomain/expected_result.dnssec +++ b/regression-tests/tests/any-nxdomain/expected_result.dnssec @@ -1,4 +1,4 @@ -1 example.com. IN NSEC 86400 double.example.com. NS SOA MX RRSIG NSEC DNSKEY +1 example.com. IN NSEC 86400 _imap._tcp.example.com. NS SOA MX RRSIG NSEC DNSKEY 1 example.com. IN RRSIG 86400 NSEC 13 2 86400 [expiry] [inception] [keytag] example.com. ... 1 example.com. IN RRSIG 86400 SOA 13 2 100000 [expiry] [inception] [keytag] example.com. ... 1 example.com. IN SOA 86400 ns1.example.com. ahu.example.com. 2847484148 28800 7200 604800 86400 diff --git a/regression-tests/tests/cname-to-nxdomain/expected_result.dnssec b/regression-tests/tests/cname-to-nxdomain/expected_result.dnssec index f0c08b3c21..44341762a6 100644 --- a/regression-tests/tests/cname-to-nxdomain/expected_result.dnssec +++ b/regression-tests/tests/cname-to-nxdomain/expected_result.dnssec @@ -1,6 +1,6 @@ 0 nxd.example.com. IN CNAME 120 nxdomain.example.com. 0 nxd.example.com. IN RRSIG 120 CNAME 13 3 120 [expiry] [inception] [keytag] example.com. ... -1 example.com. IN NSEC 86400 double.example.com. NS SOA MX RRSIG NSEC DNSKEY +1 example.com. IN NSEC 86400 _imap._tcp.example.com. NS SOA MX RRSIG NSEC DNSKEY 1 example.com. IN RRSIG 86400 NSEC 13 2 86400 [expiry] [inception] [keytag] example.com. ... 1 example.com. IN RRSIG 86400 SOA 13 2 100000 [expiry] [inception] [keytag] example.com. ... 1 example.com. IN SOA 86400 ns1.example.com. ahu.example.com. 2847484148 28800 7200 604800 86400 diff --git a/regression-tests/tests/direct-nsec-nxdomain/expected_result.dnssec b/regression-tests/tests/direct-nsec-nxdomain/expected_result.dnssec index 15ec6c7ed8..fa82444fdf 100644 --- a/regression-tests/tests/direct-nsec-nxdomain/expected_result.dnssec +++ b/regression-tests/tests/direct-nsec-nxdomain/expected_result.dnssec @@ -1,4 +1,4 @@ -1 example.com. IN NSEC 86400 double.example.com. NS SOA MX RRSIG NSEC DNSKEY +1 example.com. IN NSEC 86400 _imap._tcp.example.com. NS SOA MX RRSIG NSEC DNSKEY 1 example.com. IN RRSIG 86400 NSEC 13 2 86400 [expiry] [inception] [keytag] example.com. ... 1 example.com. IN RRSIG 86400 SOA 13 2 100000 [expiry] [inception] [keytag] example.com. ... 1 example.com. IN SOA 86400 ns1.example.com. ahu.example.com. 2847484148 28800 7200 604800 86400 diff --git a/regression-tests/tests/ds-at-apex-noerror/expected_result.dnssec b/regression-tests/tests/ds-at-apex-noerror/expected_result.dnssec index 503c1dd715..f668ae2542 100644 --- a/regression-tests/tests/ds-at-apex-noerror/expected_result.dnssec +++ b/regression-tests/tests/ds-at-apex-noerror/expected_result.dnssec @@ -1,4 +1,4 @@ -1 example.com. IN NSEC 86400 double.example.com. NS SOA MX RRSIG NSEC DNSKEY +1 example.com. IN NSEC 86400 _imap._tcp.example.com. NS SOA MX RRSIG NSEC DNSKEY 1 example.com. IN RRSIG 86400 NSEC 13 2 86400 [expiry] [inception] [keytag] example.com. ... 1 example.com. IN RRSIG 86400 SOA 13 2 100000 [expiry] [inception] [keytag] example.com. ... 1 example.com. IN SOA 86400 ns1.example.com. ahu.example.com. 2847484148 28800 7200 604800 86400 diff --git a/regression-tests/tests/no-out-of-zone-data/command b/regression-tests/tests/no-out-of-zone-data/command new file mode 100755 index 0000000000..bbf8ccd44d --- /dev/null +++ b/regression-tests/tests/no-out-of-zone-data/command @@ -0,0 +1,2 @@ +#!/bin/sh +cleandig _imap._tcp.example.com SRV diff --git a/regression-tests/tests/no-out-of-zone-data/description b/regression-tests/tests/no-out-of-zone-data/description new file mode 100644 index 0000000000..04e360d764 --- /dev/null +++ b/regression-tests/tests/no-out-of-zone-data/description @@ -0,0 +1,2 @@ +Ensure that we don't send out of zone data in the additional section when processing +e.g. SRV, MX and NS records diff --git a/regression-tests/tests/no-out-of-zone-data/expected_result b/regression-tests/tests/no-out-of-zone-data/expected_result new file mode 100644 index 0000000000..2266411381 --- /dev/null +++ b/regression-tests/tests/no-out-of-zone-data/expected_result @@ -0,0 +1,3 @@ +0 _imap._tcp.example.com. IN SRV 120 0 1 143 blah.test.com. +Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0 +Reply to question for qname='_imap._tcp.example.com.', qtype=SRV diff --git a/regression-tests/tests/nsec-glue/expected_result b/regression-tests/tests/nsec-glue/expected_result index 3bed7062b3..f3879c9a18 100644 --- a/regression-tests/tests/nsec-glue/expected_result +++ b/regression-tests/tests/nsec-glue/expected_result @@ -1,4 +1,4 @@ -1 example.com. IN NSEC 86400 double.example.com. NS SOA MX RRSIG NSEC DNSKEY +1 example.com. IN NSEC 86400 _imap._tcp.example.com. NS SOA MX RRSIG NSEC DNSKEY 1 example.com. IN RRSIG 86400 NSEC 13 2 86400 [expiry] [inception] [keytag] example.com. ... 1 example.com. IN RRSIG 86400 SOA 13 2 100000 [expiry] [inception] [keytag] example.com. ... 1 example.com. IN SOA 86400 ns1.example.com. ahu.example.com. 2847484148 28800 7200 604800 86400 diff --git a/regression-tests/tests/nsec-middle/expected_result b/regression-tests/tests/nsec-middle/expected_result index 2e36f49906..fb2388fde1 100644 --- a/regression-tests/tests/nsec-middle/expected_result +++ b/regression-tests/tests/nsec-middle/expected_result @@ -1,4 +1,4 @@ -1 example.com. IN NSEC 86400 double.example.com. NS SOA MX RRSIG NSEC DNSKEY +1 example.com. IN NSEC 86400 _imap._tcp.example.com. NS SOA MX RRSIG NSEC DNSKEY 1 example.com. IN RRSIG 86400 NSEC 13 2 86400 [expiry] [inception] [keytag] example.com. ... 1 example.com. IN RRSIG 86400 SOA 13 2 100000 [expiry] [inception] [keytag] example.com. ... 1 example.com. IN SOA 86400 ns1.example.com. ahu.example.com. 2847484148 28800 7200 604800 86400 diff --git a/regression-tests/tests/nsec-wraparound/expected_result b/regression-tests/tests/nsec-wraparound/expected_result index c44ef36048..4d7890d937 100644 --- a/regression-tests/tests/nsec-wraparound/expected_result +++ b/regression-tests/tests/nsec-wraparound/expected_result @@ -1,4 +1,4 @@ -1 example.com. IN NSEC 86400 double.example.com. NS SOA MX RRSIG NSEC DNSKEY +1 example.com. IN NSEC 86400 _imap._tcp.example.com. NS SOA MX RRSIG NSEC DNSKEY 1 example.com. IN RRSIG 86400 NSEC 13 2 86400 [expiry] [inception] [keytag] example.com. ... 1 example.com. IN RRSIG 86400 SOA 13 2 100000 [expiry] [inception] [keytag] example.com. ... 1 example.com. IN SOA 86400 ns1.example.com. ahu.example.com. 2847484148 28800 7200 604800 86400 diff --git a/regression-tests/tests/nsec-wrong-type-at-apex/expected_result b/regression-tests/tests/nsec-wrong-type-at-apex/expected_result index 7b5417d53d..740a02be5b 100644 --- a/regression-tests/tests/nsec-wrong-type-at-apex/expected_result +++ b/regression-tests/tests/nsec-wrong-type-at-apex/expected_result @@ -1,4 +1,4 @@ -1 example.com. IN NSEC 86400 double.example.com. NS SOA MX RRSIG NSEC DNSKEY +1 example.com. IN NSEC 86400 _imap._tcp.example.com. NS SOA MX RRSIG NSEC DNSKEY 1 example.com. IN RRSIG 86400 NSEC 13 2 86400 [expiry] [inception] [keytag] example.com. ... 1 example.com. IN RRSIG 86400 SOA 13 2 100000 [expiry] [inception] [keytag] example.com. ... 1 example.com. IN SOA 86400 ns1.example.com. ahu.example.com. 2847484148 28800 7200 604800 86400 diff --git a/regression-tests/tests/nsec3-hash-query/expected_result.dnssec b/regression-tests/tests/nsec3-hash-query/expected_result.dnssec index 09452d5f5c..8e50e49533 100644 --- a/regression-tests/tests/nsec3-hash-query/expected_result.dnssec +++ b/regression-tests/tests/nsec3-hash-query/expected_result.dnssec @@ -1,4 +1,4 @@ -1 example.com. IN NSEC 86400 double.example.com. NS SOA MX RRSIG NSEC DNSKEY +1 example.com. IN NSEC 86400 _imap._tcp.example.com. NS SOA MX RRSIG NSEC DNSKEY 1 example.com. IN RRSIG 86400 NSEC 13 2 86400 [expiry] [inception] [keytag] example.com. ... 1 example.com. IN RRSIG 86400 SOA 13 2 100000 [expiry] [inception] [keytag] example.com. ... 1 example.com. IN SOA 86400 ns1.example.com. ahu.example.com. 2847484148 28800 7200 604800 86400 diff --git a/regression-tests/tests/space-name/expected_result b/regression-tests/tests/space-name/expected_result index 3893e964c9..da87b5ffd1 100644 --- a/regression-tests/tests/space-name/expected_result +++ b/regression-tests/tests/space-name/expected_result @@ -1,4 +1,4 @@ -1 example.com. IN NSEC 86400 double.example.com. NS SOA MX RRSIG NSEC DNSKEY +1 example.com. IN NSEC 86400 _imap._tcp.example.com. NS SOA MX RRSIG NSEC DNSKEY 1 example.com. IN RRSIG 86400 NSEC 13 2 86400 [expiry] [inception] [keytag] example.com. ... 1 example.com. IN RRSIG 86400 SOA 13 2 100000 [expiry] [inception] [keytag] example.com. ... 1 example.com. IN SOA 86400 ns1.example.com. ahu.example.com. 2847484148 28800 7200 604800 86400 diff --git a/regression-tests/tests/two-level-nxdomain/expected_result b/regression-tests/tests/two-level-nxdomain/expected_result index fe36499ae3..d8d21b0557 100644 --- a/regression-tests/tests/two-level-nxdomain/expected_result +++ b/regression-tests/tests/two-level-nxdomain/expected_result @@ -1,4 +1,4 @@ -1 example.com. IN NSEC 86400 double.example.com. NS SOA MX RRSIG NSEC DNSKEY +1 example.com. IN NSEC 86400 _imap._tcp.example.com. NS SOA MX RRSIG NSEC DNSKEY 1 example.com. IN RRSIG 86400 NSEC 13 2 86400 [expiry] [inception] [keytag] example.com. ... 1 example.com. IN RRSIG 86400 SOA 13 2 100000 [expiry] [inception] [keytag] example.com. ... 1 example.com. IN SOA 86400 ns1.example.com. ahu.example.com. 2847484148 28800 7200 604800 86400 diff --git a/regression-tests/zones/example.com b/regression-tests/zones/example.com index a7667c9ad2..d797d8440a 100644 --- a/regression-tests/zones/example.com +++ b/regression-tests/zones/example.com @@ -20199,3 +20199,6 @@ sheila.mb IN MB bill.mb.example.com. hostmaster.mb IN MG phil.mb.example.com. IN MG sheila.mb.example.com. philip.mb IN MR phil.mb.example.com. + +; Test that no out of zone data is sent +_imap._tcp IN SRV 0 1 143 blah.test.com.