Add nsec-middle test; support NSEC3 for all tests; add gmysql-nsec3 testing mode

git-svn-id: svn://svn.powerdns.com/pdns/trunk/pdns@2444 d19b8d6e-7fed-0310-83ef-9ca221ded41b

diff --git a/regression-tests/any-query/description b/regression-tests/any-query/description
index 7eda3a6b2a737387ca1e9349348f0a0a1bf7a943..bda59eb7cf4f4fad682f8d19b27e61aa3a9c6266 100644 (file)
--- a/regression-tests/any-query/description
+++ b/regression-tests/any-query/description
@@ -2,3 +2,4 @@ An ANY query should return in the answer section all records with a certain
 qname. All these queries should receive, if applicable, additional
 processing and further records in the additional section. This test might
 fail because of different record ordering - check the diff to be sure.
+(The NSEC3-variant has a superfluous but harmless NSEC3).

diff --git a/regression-tests/any-query/expected_result.nsec3 b/regression-tests/any-query/expected_result.nsec3
new file mode 100644 (file)
index 0000000..0d24984
--- /dev/null
+++ b/regression-tests/any-query/expected_result.nsec3
@@ -0,0 +1,10 @@
+0      9f8hti7cc7oqnqjv84klnp89glqrss3r.example.com.   IN      NSEC3   120     1 1 1 abcd 9FDAOFPLLN0FQFU9DP274GOU59QFHSLD A RRSIG
+0      example.com.    IN      DNSKEY  120     256 3 5 AwEAAarTiHhPgvD28WCN8UBXcEcf8f+OF+d/bEoN6zTuHl/oVra5/qfonhYK/RjI74RzHc2wli9TpXOWycQV3YSfpFZ9z+GB/bbsvBon1XMyNf5KXuOwRdHZXIZh1cku3AcIyNroD26MPkbFLHY0+xRI+7u7OsQ6nYcPBpqDiJnB2BMh
+0      example.com.    IN      MX      120     10 smtp-servers.example.com.
+0      example.com.    IN      MX      120     15 smtp-servers.test.com.
+0      example.com.    IN      NS      120     ns1.example.com.
+0      example.com.    IN      NS      120     ns2.example.com.
+0      example.com.    IN      SOA     120     ns1.example.com. ahu.example.com. 2000081501 28800 7200 604800 86400
+0      vtnq6ocn2vkuiv3nju14oqtaen2mt5sk.example.com.   IN      NSEC3   120     1 1 1 abcd VTP9NUQBEH436S7J0K8TI2A32MMKCUUL NS SOA MX RRSIG DNSKEY NSEC3PARAM
+Rcode: 0, RD: 0, QR: 1, TC: 1, AA: 1, opcode: 0
+Reply to question for qname='example.com.', qtype=ANY

diff --git a/regression-tests/nsec-middle/command b/regression-tests/nsec-middle/command
new file mode 100755 (executable)
index 0000000..ac28105
--- /dev/null
+++ b/regression-tests/nsec-middle/command
@@ -0,0 +1,3 @@
+#!/bin/sh
+cleandig outerpost.example.com A dnssec | egrep 'IN[[:space:]]+NSEC'
+

diff --git a/regression-tests/nsec-middle/description b/regression-tests/nsec-middle/description
new file mode 100644 (file)
index 0000000..f129195
--- /dev/null
+++ b/regression-tests/nsec-middle/description
@@ -0,0 +1,2 @@
+This test verifies that an NXDOMAIN in the middle of a zone
+generates a correct NSEC(3).

diff --git a/regression-tests/nsec-middle/expected_result b/regression-tests/nsec-middle/expected_result
new file mode 100644 (file)
index 0000000..1683007
--- /dev/null
+++ b/regression-tests/nsec-middle/expected_result
@@ -0,0 +1 @@
+1      ns2.example.com.        IN      NSEC    120     outpost.example.com. A RRSIG NSEC

diff --git a/regression-tests/nsec-middle/expected_result.nsec3 b/regression-tests/nsec-middle/expected_result.nsec3
new file mode 100644 (file)
index 0000000..68f5fb0
--- /dev/null
+++ b/regression-tests/nsec-middle/expected_result.nsec3
@@ -0,0 +1,3 @@
+1      9f8hti7cc7oqnqjv84klnp89glqrss3r.example.com.   IN      NSEC3   120     1 1 1 abcd 9FDAOFPLLN0FQFU9DP274GOU59QFHSLD A RRSIG
+1      sthkgrndv06hbdrfe7a329lup4mctmqr.example.com.   IN      NSEC3   120     1 1 1 abcd STKPKJBN0URUBBIM832MF33V5OGJR396 A RRSIG
+1      vtnq6ocn2vkuiv3nju14oqtaen2mt5sk.example.com.   IN      NSEC3   120     1 1 1 abcd VTP9NUQBEH436S7J0K8TI2A32MMKCUUL NS SOA MX RRSIG DNSKEY NSEC3PARAM

diff --git a/regression-tests/nsec-middle/skip.nodnssec b/regression-tests/nsec-middle/skip.nodnssec
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/regression-tests/nsec-wraparound/expected_result.nsec3 b/regression-tests/nsec-wraparound/expected_result.nsec3
new file mode 100644 (file)
index 0000000..b35b714
--- /dev/null
+++ b/regression-tests/nsec-wraparound/expected_result.nsec3
@@ -0,0 +1,3 @@
+1      9f8hti7cc7oqnqjv84klnp89glqrss3r.example.com.   IN      NSEC3   120     1 1 1 abcd 9FDAOFPLLN0FQFU9DP274GOU59QFHSLD A RRSIG
+1      gnk5kv3h2h1h8ge405j6093608ukp3i5.example.com.   IN      NSEC3   120     1 1 1 abcd GNO4LESKG6U7HKEJ9UL71SF1HD7F1P96 A RRSIG
+1      vtnq6ocn2vkuiv3nju14oqtaen2mt5sk.example.com.   IN      NSEC3   120     1 1 1 abcd VTP9NUQBEH436S7J0K8TI2A32MMKCUUL NS SOA MX RRSIG DNSKEY NSEC3PARAM

diff --git a/regression-tests/nsec-wrong-type-at-apex/expected_result.nsec3 b/regression-tests/nsec-wrong-type-at-apex/expected_result.nsec3
new file mode 100644 (file)
index 0000000..2235390
--- /dev/null
+++ b/regression-tests/nsec-wrong-type-at-apex/expected_result.nsec3
@@ -0,0 +1,2 @@
+1      9f8hti7cc7oqnqjv84klnp89glqrss3r.example.com.   IN      NSEC3   120     1 1 1 abcd 9FDAOFPLLN0FQFU9DP274GOU59QFHSLD A RRSIG
+1      vtnq6ocn2vkuiv3nju14oqtaen2mt5sk.example.com.   IN      NSEC3   120     1 1 1 abcd VTP9NUQBEH436S7J0K8TI2A32MMKCUUL NS SOA MX RRSIG DNSKEY NSEC3PARAM

diff --git a/regression-tests/nsec-wrong-type/expected_result.nsec3 b/regression-tests/nsec-wrong-type/expected_result.nsec3
new file mode 100644 (file)
index 0000000..fa12aa2
--- /dev/null
+++ b/regression-tests/nsec-wrong-type/expected_result.nsec3
@@ -0,0 +1,3 @@
+1      5uvgfm2vjcje09svs7lfb22i1uuqjf98.example.com.   IN      NSEC3   120     1 1 1 abcd 5V0S7HPRC5IAFH3C3RO0HHNH543D3UIU A RRSIG
+1      9f8hti7cc7oqnqjv84klnp89glqrss3r.example.com.   IN      NSEC3   120     1 1 1 abcd 9FDAOFPLLN0FQFU9DP274GOU59QFHSLD A RRSIG
+1      vtnq6ocn2vkuiv3nju14oqtaen2mt5sk.example.com.   IN      NSEC3   120     1 1 1 abcd VTP9NUQBEH436S7J0K8TI2A32MMKCUUL NS SOA MX RRSIG DNSKEY NSEC3PARAM

diff --git a/regression-tests/start-test-stop b/regression-tests/start-test-stop
index 84e2546ae155ff5fa159e40fee4fb81c8c8e1dc5..cb916ebe5fa791577788f35af727dc217b4e884a 100755 (executable)
--- a/regression-tests/start-test-stop
+++ b/regression-tests/start-test-stop
@@ -11,6 +11,7 @@ port=$1
 [ -z "$port" ] && port=5300
 context=$2
 [ -z "$context" ] && context=bind-gsqlite3
+wait=$3
 
 case $context in
                bind)
@@ -98,7 +99,7 @@ __EOF__
                                --gmysql-password="$GMYSQLPASS" &
                        if [ $context = gmysql-nsec3 ]
                        then
-                               subcontexts=nsec3
+                               extracontexts=nsec3
                        fi
                        ;;                      
                *)
@@ -117,5 +118,10 @@ export skipreasons
 ## TODO: give pdns a few seconds to startup or fail, then check if it did not fail
 ## TODO: give sdig a timeout
 nameserver=127.0.0.1 ./runtests
+if [ "$wait" = "wait" ]
+then
+       echo tests done! push enter to terminate instance
+       read l
+fi
 kill $(cat pdns.pid)
 ./toxml