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

diff --git a/doc/Changelog b/doc/Changelog
index a6683ec7d1a36c9605437a67cec7e3640509d0de..cb1ff554fa477dedd7462369eb84b3c42589003a 100644 (file)
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -5,6 +5,7 @@
        - 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.
+       - Fix for #596: add unit test for nsip 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 f0ce5e56ed79e6c679c1c4d4abdb91d10a1c3e90..d0fbaaa5c99a6bca388174a65daecca4e02839f4 100644 (file)
--- a/testdata/rpz_signal_nxdomain_ra.rpl
+++ b/testdata/rpz_signal_nxdomain_ra.rpl
@@ -19,6 +19,7 @@ $ORIGIN rpz.example.com.
 a.a CNAME .
 b.a CNAME .
 ns1.a.rpz-nsdname CNAME .
+24.0.0.0.192.rpz-nsip CNAME .
 TEMPFILE_END
 
 stub-zone:
@@ -85,6 +86,19 @@ SECTION ADDITIONAL
 ns1.a. IN A 10.20.30.50
 ENTRY_END
 
+ENTRY_BEGIN
+MATCH opcode subdomain
+ADJUST copy_id copy_query
+REPLY QR NOERROR
+SECTION QUESTION
+e.a.  IN  NS
+SECTION ANSWER
+SECTION AUTHORITY
+e.a.  IN  NS ns2.a.
+SECTION ADDITIONAL
+ns2.a. IN A 192.0.0.5
+ENTRY_END
+
 RANGE_END
 
 RANGE_BEGIN 0 100
@@ -113,6 +127,33 @@ ENTRY_END
 
 RANGE_END
 
+RANGE_BEGIN 0 100
+       ADDRESS 192.0.0.5
+ENTRY_BEGIN
+MATCH opcode qtype qname
+ADJUST copy_id
+REPLY QR NOERROR
+SECTION QUESTION
+e.a. IN NS
+SECTION ANSWER
+e.a. IN NS ns2.a.
+SECTION ADDITIONAL
+ns2.a. IN A 192.0.0.5
+ENTRY_END
+
+ENTRY_BEGIN
+MATCH opcode qtype qname
+ADJUST copy_id
+REPLY QR NOERROR
+SECTION QUESTION
+e.e.a. IN TXT
+SECTION ANSWER
+e.e.a. IN TXT "upstream answer for e.e.a"
+ENTRY_END
+
+RANGE_END
+
+; qname trigger
 STEP 10 QUERY
 ENTRY_BEGIN
 REPLY RD
@@ -129,6 +170,7 @@ a.a.  IN TXT
 SECTION ANSWER
 ENTRY_END
 
+; qname trigger after cname
 STEP 20 QUERY
 ENTRY_BEGIN
 REPLY RD
@@ -146,6 +188,7 @@ SECTION ANSWER
 c.a.  IN  CNAME b.a
 ENTRY_END
 
+; nsdname trigger
 STEP 30 QUERY
 ENTRY_BEGIN
 REPLY RD
@@ -162,4 +205,21 @@ d.d.a.  IN TXT
 SECTION ANSWER
 ENTRY_END
 
+; nsip trigger
+STEP 40 QUERY
+ENTRY_BEGIN
+REPLY RD
+SECTION QUESTION
+e.e.a.  IN TXT
+ENTRY_END
+
+STEP 41 CHECK_ANSWER
+ENTRY_BEGIN
+MATCH all
+REPLY QR RD AA NXDOMAIN
+SECTION QUESTION
+e.e.a.  IN TXT
+SECTION ANSWER
+ENTRY_END
+
 SCENARIO_END