- Fix for #596: add unit test for nsdname trigger and signal unset RA.

diff --git a/doc/Changelog b/doc/Changelog
index b7f0d7e2ee3ee06a1e7902d4f4a45e7a00c676f2..a6683ec7d1a36c9605437a67cec7e3640509d0de 100644 (file)
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -4,6 +4,7 @@
          after a CNAME.
        - Fix unit tests for rpz now that the AA flag returns successfully from
          the iterator loop.
+       - Fix for #596: add unit test for nsdname trigger and signal unset RA.
 
 4 January 2022: Wouter
        - Fix #596: unset the RA bit when a query is blocked by an unbound

diff --git a/testdata/rpz_signal_nxdomain_ra.rpl b/testdata/rpz_signal_nxdomain_ra.rpl
index bab4b65a02cefc728544b32870f83466d3207344..f0ce5e56ed79e6c679c1c4d4abdb91d10a1c3e90 100644 (file)
--- a/testdata/rpz_signal_nxdomain_ra.rpl
+++ b/testdata/rpz_signal_nxdomain_ra.rpl
@@ -18,6 +18,7 @@ rpz   3600    IN      SOA     ns1.rpz.example.com. hostmaster.rpz.example.com. (
 $ORIGIN rpz.example.com.
 a.a CNAME .
 b.a CNAME .
+ns1.a.rpz-nsdname CNAME .
 TEMPFILE_END
 
 stub-zone:
@@ -71,6 +72,45 @@ SECTION ANSWER
 c.a.  IN  CNAME b.a
 ENTRY_END
 
+ENTRY_BEGIN
+MATCH opcode subdomain
+ADJUST copy_id copy_query
+REPLY QR NOERROR
+SECTION QUESTION
+d.a.  IN  NS
+SECTION ANSWER
+SECTION AUTHORITY
+d.a.  IN  NS ns1.a.
+SECTION ADDITIONAL
+ns1.a. IN A 10.20.30.50
+ENTRY_END
+
+RANGE_END
+
+RANGE_BEGIN 0 100
+       ADDRESS 10.20.30.50
+ENTRY_BEGIN
+MATCH opcode qtype qname
+ADJUST copy_id
+REPLY QR NOERROR
+SECTION QUESTION
+d.a. IN NS
+SECTION ANSWER
+d.a. IN NS ns1.a.
+SECTION ADDITIONAL
+ns1.a. IN A 10.20.30.50
+ENTRY_END
+
+ENTRY_BEGIN
+MATCH opcode qtype qname
+ADJUST copy_id
+REPLY QR NOERROR
+SECTION QUESTION
+d.d.a. IN TXT
+SECTION ANSWER
+d.d.a. IN TXT "upstream answer for d.d.a"
+ENTRY_END
+
 RANGE_END
 
 STEP 10 QUERY
@@ -106,4 +146,20 @@ SECTION ANSWER
 c.a.  IN  CNAME b.a
 ENTRY_END
 
+STEP 30 QUERY
+ENTRY_BEGIN
+REPLY RD
+SECTION QUESTION
+d.d.a.  IN TXT
+ENTRY_END
+
+STEP 31 CHECK_ANSWER
+ENTRY_BEGIN
+MATCH all
+REPLY QR RD AA NXDOMAIN
+SECTION QUESTION
+d.d.a.  IN TXT
+SECTION ANSWER
+ENTRY_END
+
 SCENARIO_END