diff options
Diffstat (limited to 'testdata')
134 files changed, 768 insertions, 200 deletions
diff --git a/testdata/autotrust_init.rpl b/testdata/autotrust_init.rpl index c6bde72ac48b..d722273e0a99 100644 --- a/testdata/autotrust_init.rpl +++ b/testdata/autotrust_init.rpl @@ -4,6 +4,7 @@ server: log-time-ascii: yes fake-sha1: yes trust-anchor-signaling: no + minimal-responses: no stub-zone: name: "." stub-addr: 193.0.14.129 # K.ROOT-SERVERS.NET. diff --git a/testdata/autotrust_init_ds.rpl b/testdata/autotrust_init_ds.rpl index 37a168a1a0ab..ad4019ebec6e 100644 --- a/testdata/autotrust_init_ds.rpl +++ b/testdata/autotrust_init_ds.rpl @@ -4,6 +4,7 @@ server: log-time-ascii: yes fake-sha1: yes trust-anchor-signaling: no + minimal-responses: no stub-zone: name: "." stub-addr: 193.0.14.129 # K.ROOT-SERVERS.NET. diff --git a/testdata/autotrust_init_sigs.rpl b/testdata/autotrust_init_sigs.rpl index fe5eeb0d6509..d5d52f473869 100644 --- a/testdata/autotrust_init_sigs.rpl +++ b/testdata/autotrust_init_sigs.rpl @@ -4,6 +4,7 @@ server: log-time-ascii: yes fake-sha1: yes trust-anchor-signaling: no + minimal-responses: no stub-zone: name: "." stub-addr: 193.0.14.129 # K.ROOT-SERVERS.NET. diff --git a/testdata/autotrust_init_zsk.rpl b/testdata/autotrust_init_zsk.rpl index b807f8ebe046..56a5bc0b3feb 100644 --- a/testdata/autotrust_init_zsk.rpl +++ b/testdata/autotrust_init_zsk.rpl @@ -4,6 +4,7 @@ server: log-time-ascii: yes fake-sha1: yes trust-anchor-signaling: no + minimal-responses: no stub-zone: name: "." stub-addr: 193.0.14.129 # K.ROOT-SERVERS.NET. diff --git a/testdata/black_data.rpl b/testdata/black_data.rpl index 04304d352cf8..de6f57ec1158 100644 --- a/testdata/black_data.rpl +++ b/testdata/black_data.rpl @@ -7,6 +7,7 @@ server: qname-minimisation: "no" fake-sha1: yes trust-anchor-signaling: no + minimal-responses: no stub-zone: name: "." diff --git a/testdata/black_prime.rpl b/testdata/black_prime.rpl index 2cbcc160658a..7e73f32f39ab 100644 --- a/testdata/black_prime.rpl +++ b/testdata/black_prime.rpl @@ -7,6 +7,7 @@ server: qname-minimisation: "no" fake-sha1: yes trust-anchor-signaling: no + minimal-responses: no stub-zone: name: "." diff --git a/testdata/dlv_anchor.rpl b/testdata/dlv_anchor.rpl index 445da0a84ea7..81547454eff6 100644 --- a/testdata/dlv_anchor.rpl +++ b/testdata/dlv_anchor.rpl @@ -7,6 +7,7 @@ server: qname-minimisation: "no" fake-sha1: yes trust-anchor-signaling: no + minimal-responses: no stub-zone: name: "." diff --git a/testdata/dlv_ask_higher.rpl b/testdata/dlv_ask_higher.rpl index 9f9331080e27..51ac3d24aaee 100644 --- a/testdata/dlv_ask_higher.rpl +++ b/testdata/dlv_ask_higher.rpl @@ -7,6 +7,7 @@ server: qname-minimisation: "no" fake-sha1: yes trust-anchor-signaling: no + minimal-responses: no stub-zone: name: "." diff --git a/testdata/dlv_below_ta.rpl b/testdata/dlv_below_ta.rpl index 6f72f261c390..f5d630dfb2d7 100644 --- a/testdata/dlv_below_ta.rpl +++ b/testdata/dlv_below_ta.rpl @@ -8,6 +8,7 @@ server: qname-minimisation: "no" fake-sha1: yes trust-anchor-signaling: no + minimal-responses: no stub-zone: name: "." diff --git a/testdata/dlv_delegation.rpl b/testdata/dlv_delegation.rpl index 1eada40649f7..53074c8e257f 100644 --- a/testdata/dlv_delegation.rpl +++ b/testdata/dlv_delegation.rpl @@ -7,6 +7,7 @@ server: qname-minimisation: "no" fake-sha1: yes trust-anchor-signaling: no + minimal-responses: no stub-zone: name: "." diff --git a/testdata/dlv_insecure.rpl b/testdata/dlv_insecure.rpl index 94ba865d8703..e6515a9fb6ec 100644 --- a/testdata/dlv_insecure.rpl +++ b/testdata/dlv_insecure.rpl @@ -8,6 +8,7 @@ server: qname-minimisation: "no" fake-sha1: yes trust-anchor-signaling: no + minimal-responses: no stub-zone: name: "." diff --git a/testdata/dlv_insecure_negcache.rpl b/testdata/dlv_insecure_negcache.rpl index b91105160ad2..8408870b9969 100644 --- a/testdata/dlv_insecure_negcache.rpl +++ b/testdata/dlv_insecure_negcache.rpl @@ -8,6 +8,7 @@ server: qname-minimisation: "no" fake-sha1: yes trust-anchor-signaling: no + minimal-responses: no stub-zone: name: "." diff --git a/testdata/dlv_remove_empty.rpl b/testdata/dlv_remove_empty.rpl index 2e9b4bcf6638..11b825bc2621 100644 --- a/testdata/dlv_remove_empty.rpl +++ b/testdata/dlv_remove_empty.rpl @@ -5,6 +5,7 @@ server: val-override-date: "20070916134226" target-fetch-policy: "0 0 0 0 0" fake-sha1: yes + minimal-responses: no stub-zone: name: "." diff --git a/testdata/dlv_remove_nodel.rpl b/testdata/dlv_remove_nodel.rpl index 1f2d94721abd..1abe5a32f37a 100644 --- a/testdata/dlv_remove_nodel.rpl +++ b/testdata/dlv_remove_nodel.rpl @@ -6,6 +6,7 @@ server: val-override-date: "20070916134226" target-fetch-policy: "0 0 0 0 0" fake-sha1: yes + minimal-responses: no stub-zone: name: "." diff --git a/testdata/dlv_remove_pos.rpl b/testdata/dlv_remove_pos.rpl index fe2d7fee79d1..892ffa3c0c47 100644 --- a/testdata/dlv_remove_pos.rpl +++ b/testdata/dlv_remove_pos.rpl @@ -8,6 +8,7 @@ server: qname-minimisation: "no" fake-sha1: yes trust-anchor-signaling: no + minimal-responses: no stub-zone: name: "." diff --git a/testdata/dlv_unused.rpl b/testdata/dlv_unused.rpl index 386755835128..aa7d04c1eab4 100644 --- a/testdata/dlv_unused.rpl +++ b/testdata/dlv_unused.rpl @@ -7,6 +7,7 @@ server: target-fetch-policy: "0 0 0 0 0" fake-sha1: yes trust-anchor-signaling: no + minimal-responses: no stub-zone: name: "." diff --git a/testdata/dns64_lookup.rpl b/testdata/dns64_lookup.rpl index e24622c0d4b5..898d0d01ad16 100644 --- a/testdata/dns64_lookup.rpl +++ b/testdata/dns64_lookup.rpl @@ -4,6 +4,7 @@ server: qname-minimisation: "no" module-config: "dns64 validator iterator" dns64-prefix: 64:ff9b::0/96 + minimal-responses: no stub-zone: name: "." diff --git a/testdata/domain_insec_dlv.rpl b/testdata/domain_insec_dlv.rpl index 8c89a70d33ba..c8bd98344d30 100644 --- a/testdata/domain_insec_dlv.rpl +++ b/testdata/domain_insec_dlv.rpl @@ -5,6 +5,7 @@ server: domain-insecure: "example.net" val-override-date: "20070916134226" target-fetch-policy: "0 0 0 0 0" + minimal-responses: no stub-zone: name: "." diff --git a/testdata/edns_keepalive.rpl b/testdata/edns_keepalive.rpl new file mode 100644 index 000000000000..9d00b6cf762a --- /dev/null +++ b/testdata/edns_keepalive.rpl @@ -0,0 +1,126 @@ +server: + verbosity: 3 + edns-tcp-keepalive: yes + edns-tcp-keepalive-timeout: 30000 # Hardwired to this in fake_event.c +stub-zone: + name: "." + stub-addr: 193.0.14.129 # K.ROOT-SERVERS.NET. +CONFIG_END + +SCENARIO_BEGIN TCP Keepalive + +RANGE_BEGIN 0 100 + + ADDRESS 193.0.14.129 + + ENTRY_BEGIN + MATCH opcode qtype qname + ADJUST copy_id + REPLY QR NOERROR + SECTION QUESTION + . IN NS + SECTION ANSWER + . IN NS K.ROOT-SERVERS.NET. + SECTION ADDITIONAL + K.ROOT-SERVERS.NET. IN A 193.0.14.129 + ENTRY_END + +RANGE_END + +;; ---------------------------------------- + +STEP 1 QUERY + + ENTRY_BEGIN + MATCH TCP ednsdata + REPLY RD + SECTION QUESTION + www.example.com. IN A + SECTION ADDITIONAL + HEX_EDNSDATA_BEGIN + 00 0b ; Opcode 11 + 00 02 ; Length 2 + 00 ff ; Timeout + HEX_EDNSDATA_END + ENTRY_END + +STEP 10 CHECK_ANSWER + + ENTRY_BEGIN + MATCH TCP ednsdata + REPLY RD FORMERR + SECTION QUESTION + www.example.com. IN A + SECTION ADDITIONAL + HEX_EDNSDATA_BEGIN + ; Empty + HEX_EDNSDATA_END + ENTRY_END + +STEP 20 QUERY + + ENTRY_BEGIN + MATCH TCP ednsdata + REPLY RD + SECTION QUESTION + . IN NS + SECTION ADDITIONAL + HEX_EDNSDATA_BEGIN + 00 0b ; Opcode 11 + 00 00 ; Length 0 + HEX_EDNSDATA_END + ENTRY_END + +STEP 30 CHECK_ANSWER + + ENTRY_BEGIN + MATCH TCP ednsdata + REPLY QR RD RA NOERROR + SECTION QUESTION + . IN NS + SECTION ANSWER + . IN NS K.ROOT-SERVERS.NET. + SECTION ADDITIONAL + HEX_EDNSDATA_BEGIN + 00 0b ; Opcode 11 + 00 02 ; Length 2 + 01 2c ; 30s = 300 10th secs + HEX_EDNSDATA_END + K.ROOT-SERVERS.NET. IN A 193.0.14.129 + ENTRY_END + +; Check that a subsequent query on the connection without keepalive will +; generate a keepalive reply because we've already seen one. + +STEP 40 QUERY + + ENTRY_BEGIN + MATCH TCP ednsdata + REPLY RD + SECTION QUESTION + . IN NS + SECTION ADDITIONAL + HEX_EDNSDATA_BEGIN + ; Empty + HEX_EDNSDATA_END + ENTRY_END + +STEP 50 CHECK_ANSWER + + ENTRY_BEGIN + MATCH TCP ednsdata + REPLY QR RD RA NOERROR + SECTION QUESTION + . IN NS + SECTION ANSWER + . IN NS K.ROOT-SERVERS.NET. + SECTION ADDITIONAL + HEX_EDNSDATA_BEGIN + 00 0b ; Opcode 11 + 00 02 ; Length 2 + 01 2c ; 30s = 300 10th secs + HEX_EDNSDATA_END + K.ROOT-SERVERS.NET. IN A 193.0.14.129 + ENTRY_END + +SCENARIO_END diff --git a/testdata/fetch_glue.rpl b/testdata/fetch_glue.rpl index 3ecc28abf71c..3e9f64f8d1b0 100644 --- a/testdata/fetch_glue.rpl +++ b/testdata/fetch_glue.rpl @@ -2,6 +2,7 @@ server: target-fetch-policy: "0 0 0 0 0" qname-minimisation: "no" + minimal-responses: no stub-zone: name: "." diff --git a/testdata/fetch_glue_cname.rpl b/testdata/fetch_glue_cname.rpl index e8158f9f07b2..4a86afa50f65 100644 --- a/testdata/fetch_glue_cname.rpl +++ b/testdata/fetch_glue_cname.rpl @@ -2,6 +2,7 @@ server: target-fetch-policy: "0 0 0 0 0" qname-minimisation: "no" + minimal-responses: no stub-zone: name: "." diff --git a/testdata/fwd_cached.rpl b/testdata/fwd_cached.rpl index 23b4a08a2282..2d6b0c2b8cbe 100644 --- a/testdata/fwd_cached.rpl +++ b/testdata/fwd_cached.rpl @@ -1,5 +1,7 @@ ; This is a comment. ; config options go here. +server: + minimal-responses: no forward-zone: name: "." forward-addr: 216.0.0.1 CONFIG_END diff --git a/testdata/fwd_compress_c00c.tdir/fwd_compress_c00c.conf b/testdata/fwd_compress_c00c.tdir/fwd_compress_c00c.conf index 39bd9f5cb23d..08e9d643274c 100644 --- a/testdata/fwd_compress_c00c.tdir/fwd_compress_c00c.conf +++ b/testdata/fwd_compress_c00c.tdir/fwd_compress_c00c.conf @@ -9,6 +9,7 @@ server: chroot: "" username: "" do-not-query-localhost: no + minimal-responses: no forward-zone: name: "." forward-addr: "127.0.0.1@@TOPORT@" diff --git a/testdata/ipsecmod_enabled.crpl b/testdata/ipsecmod_enabled.crpl index 501f18be4857..449842961de1 100644 --- a/testdata/ipsecmod_enabled.crpl +++ b/testdata/ipsecmod_enabled.crpl @@ -10,6 +10,7 @@ server: ipsecmod-max-ttl: 200 ipsecmod-enabled: no qname-minimisation: "no" + minimal-responses: no stub-zone: name: "." diff --git a/testdata/ipsecmod_ignore_bogus_ipseckey.crpl b/testdata/ipsecmod_ignore_bogus_ipseckey.crpl index d62dfafd2d1c..a605c344581b 100644 --- a/testdata/ipsecmod_ignore_bogus_ipseckey.crpl +++ b/testdata/ipsecmod_ignore_bogus_ipseckey.crpl @@ -17,6 +17,7 @@ server: ipsecmod-max-ttl: 200 ipsecmod-ignore-bogus: yes qname-minimisation: "no" + minimal-responses: no stub-zone: name: "." diff --git a/testdata/ipsecmod_max_ttl.crpl b/testdata/ipsecmod_max_ttl.crpl index 50d4adf64e89..592bae046360 100644 --- a/testdata/ipsecmod_max_ttl.crpl +++ b/testdata/ipsecmod_max_ttl.crpl @@ -9,6 +9,7 @@ server: ipsecmod-strict: no ipsecmod-max-ttl: 200 qname-minimisation: "no" + minimal-responses: no stub-zone: name: "." diff --git a/testdata/ipsecmod_strict.crpl b/testdata/ipsecmod_strict.crpl index 13d8e0e4bd5d..f74e308bde44 100644 --- a/testdata/ipsecmod_strict.crpl +++ b/testdata/ipsecmod_strict.crpl @@ -9,6 +9,7 @@ server: ipsecmod-strict: yes ipsecmod-max-ttl: 200 qname-minimisation: "no" + minimal-responses: no stub-zone: name: "." diff --git a/testdata/ipsecmod_whitelist.crpl b/testdata/ipsecmod_whitelist.crpl index d916b0050e4d..34108f3b1161 100644 --- a/testdata/ipsecmod_whitelist.crpl +++ b/testdata/ipsecmod_whitelist.crpl @@ -10,6 +10,7 @@ server: ipsecmod-max-ttl: 200 ipsecmod-whitelist: white.example.com qname-minimisation: "no" + minimal-responses: no stub-zone: name: "." diff --git a/testdata/iter_class_any.rpl b/testdata/iter_class_any.rpl index a4ea822fdba0..6fb296e99d00 100644 --- a/testdata/iter_class_any.rpl +++ b/testdata/iter_class_any.rpl @@ -7,6 +7,7 @@ server: qname-minimisation: "no" fake-sha1: yes trust-anchor-signaling: no + minimal-responses: no stub-zone: name: "." diff --git a/testdata/iter_cycle_noh.rpl b/testdata/iter_cycle_noh.rpl index 6c2982adc94e..eee26ca70d15 100644 --- a/testdata/iter_cycle_noh.rpl +++ b/testdata/iter_cycle_noh.rpl @@ -3,6 +3,7 @@ server: harden-glue: "no" target-fetch-policy: "0 0 0 0 0" qname-minimisation: "no" + minimal-responses: no stub-zone: name: "." diff --git a/testdata/iter_dname_insec.rpl b/testdata/iter_dname_insec.rpl index 791e3848572a..ce593ba5c20a 100644 --- a/testdata/iter_dname_insec.rpl +++ b/testdata/iter_dname_insec.rpl @@ -3,6 +3,7 @@ server: harden-referral-path: no target-fetch-policy: "0 0 0 0 0" qname-minimisation: "no" + minimal-responses: no stub-zone: name: "." diff --git a/testdata/iter_domain_sale.rpl b/testdata/iter_domain_sale.rpl index ff612780a8c8..be05e2f4363d 100644 --- a/testdata/iter_domain_sale.rpl +++ b/testdata/iter_domain_sale.rpl @@ -1,6 +1,7 @@ ; config options server: target-fetch-policy: "0 0 0 0 0" + minimal-responses: no stub-zone: name: "." diff --git a/testdata/iter_domain_sale_nschange.rpl b/testdata/iter_domain_sale_nschange.rpl index bc396f67c6f3..5af54efb9855 100644 --- a/testdata/iter_domain_sale_nschange.rpl +++ b/testdata/iter_domain_sale_nschange.rpl @@ -1,6 +1,7 @@ ; config options server: target-fetch-policy: "0 0 0 0 0" + minimal-responses: no stub-zone: name: "." diff --git a/testdata/iter_emptydp.rpl b/testdata/iter_emptydp.rpl index f61b3064dddb..82ddccfade66 100644 --- a/testdata/iter_emptydp.rpl +++ b/testdata/iter_emptydp.rpl @@ -7,6 +7,7 @@ server: qname-minimisation: "no" fake-sha1: yes trust-anchor-signaling: no + minimal-responses: no stub-zone: name: "." diff --git a/testdata/iter_emptydp_for_glue.rpl b/testdata/iter_emptydp_for_glue.rpl index 33951e790a70..2e7db65e1402 100644 --- a/testdata/iter_emptydp_for_glue.rpl +++ b/testdata/iter_emptydp_for_glue.rpl @@ -7,6 +7,7 @@ server: qname-minimisation: "no" fake-sha1: yes trust-anchor-signaling: no + minimal-responses: no stub-zone: name: "." diff --git a/testdata/iter_fwdfirst.rpl b/testdata/iter_fwdfirst.rpl index 5154babb348b..0f8a85f5ae03 100644 --- a/testdata/iter_fwdfirst.rpl +++ b/testdata/iter_fwdfirst.rpl @@ -1,6 +1,7 @@ ; config options server: target-fetch-policy: "0 0 0 0 0" + minimal-responses: no stub-zone: name: "." diff --git a/testdata/iter_fwdfirstequal.rpl b/testdata/iter_fwdfirstequal.rpl index d8da470cf542..dc648143ce66 100644 --- a/testdata/iter_fwdfirstequal.rpl +++ b/testdata/iter_fwdfirstequal.rpl @@ -1,6 +1,7 @@ ; config options server: target-fetch-policy: "0 0 0 0 0" + minimal-responses: no stub-zone: name: "." diff --git a/testdata/iter_fwdstub.rpl b/testdata/iter_fwdstub.rpl index 06a8789b721b..ad5b57cb7690 100644 --- a/testdata/iter_fwdstub.rpl +++ b/testdata/iter_fwdstub.rpl @@ -1,6 +1,7 @@ ; config options server: target-fetch-policy: "0 0 0 0 0" + minimal-responses: no stub-zone: name: "." diff --git a/testdata/iter_fwdstubroot.rpl b/testdata/iter_fwdstubroot.rpl index e43584cbef17..fa930430d7f5 100644 --- a/testdata/iter_fwdstubroot.rpl +++ b/testdata/iter_fwdstubroot.rpl @@ -1,6 +1,7 @@ ; config options server: target-fetch-policy: "0 0 0 0 0" + minimal-responses: no stub-zone: name: "." diff --git a/testdata/iter_got6only.rpl b/testdata/iter_got6only.rpl index 7363a48b7d52..15522843903b 100644 --- a/testdata/iter_got6only.rpl +++ b/testdata/iter_got6only.rpl @@ -3,6 +3,7 @@ server: do-ip6: no target-fetch-policy: "0 0 0 0 0 " qname-minimisation: "no" + minimal-responses: no stub-zone: name: "." stub-addr: 193.0.14.129 # K.ROOT-SERVERS.NET. diff --git a/testdata/iter_hint_lame.rpl b/testdata/iter_hint_lame.rpl index e9ffbce64c7b..2fb6dde72d91 100644 --- a/testdata/iter_hint_lame.rpl +++ b/testdata/iter_hint_lame.rpl @@ -2,6 +2,7 @@ server: target-fetch-policy: "0 0 0 0 0" qname-minimisation: "no" + minimal-responses: no stub-zone: name: "." diff --git a/testdata/iter_lame_noaa.rpl b/testdata/iter_lame_noaa.rpl index 18d326b77967..7a6eb1b30536 100644 --- a/testdata/iter_lame_noaa.rpl +++ b/testdata/iter_lame_noaa.rpl @@ -3,6 +3,7 @@ server: harden-referral-path: no target-fetch-policy: "0 0 0 0 0" qname-minimisation: "no" + minimal-responses: no stub-zone: name: "." diff --git a/testdata/iter_lame_nosoa.rpl b/testdata/iter_lame_nosoa.rpl index 903bb29bc99f..4914f7461f5f 100644 --- a/testdata/iter_lame_nosoa.rpl +++ b/testdata/iter_lame_nosoa.rpl @@ -1,6 +1,7 @@ ; config options server: target-fetch-policy: "0 0 0 0 0" + minimal-responses: no stub-zone: name: "." diff --git a/testdata/iter_mod.rpl b/testdata/iter_mod.rpl index c57e2328ab78..35b3a5af6a5c 100644 --- a/testdata/iter_mod.rpl +++ b/testdata/iter_mod.rpl @@ -3,6 +3,7 @@ server: target-fetch-policy: "0 0 0 0 0" qname-minimisation: "no" module-config: "iterator" + minimal-responses: no stub-zone: name: "." diff --git a/testdata/iter_ns_badip.rpl b/testdata/iter_ns_badip.rpl index 6ce2b14d47b5..ad266c64d117 100644 --- a/testdata/iter_ns_badip.rpl +++ b/testdata/iter_ns_badip.rpl @@ -2,6 +2,7 @@ server: target-fetch-policy: "3 2 1 0 0" qname-minimisation: "no" + minimal-responses: no stub-zone: name: "." diff --git a/testdata/iter_ns_spoof.rpl b/testdata/iter_ns_spoof.rpl index 1679ce724c7a..f6745763532f 100644 --- a/testdata/iter_ns_spoof.rpl +++ b/testdata/iter_ns_spoof.rpl @@ -3,6 +3,7 @@ server: harden-referral-path: yes target-fetch-policy: "0 0 0 0 0" qname-minimisation: "no" + minimal-responses: no stub-zone: name: "." stub-addr: 193.0.14.129 # K.ROOT-SERVERS.NET. diff --git a/testdata/iter_pc_a.rpl b/testdata/iter_pc_a.rpl index 985345c15360..d9add0056fea 100644 --- a/testdata/iter_pc_a.rpl +++ b/testdata/iter_pc_a.rpl @@ -1,6 +1,7 @@ ; config options server: target-fetch-policy: "0 0 0 0 0" + minimal-responses: no stub-zone: name: "." diff --git a/testdata/iter_pc_aaaa.rpl b/testdata/iter_pc_aaaa.rpl index 20e1a787f402..a28354306aca 100644 --- a/testdata/iter_pc_aaaa.rpl +++ b/testdata/iter_pc_aaaa.rpl @@ -1,6 +1,7 @@ ; config options server: target-fetch-policy: "0 0 0 0 0" + minimal-responses: no stub-zone: name: "." diff --git a/testdata/iter_pcdiff.rpl b/testdata/iter_pcdiff.rpl index 18b984c16797..57fb109afa5e 100644 --- a/testdata/iter_pcdiff.rpl +++ b/testdata/iter_pcdiff.rpl @@ -1,6 +1,7 @@ ; config options server: target-fetch-policy: "0 0 0 0 0" + minimal-responses: no stub-zone: name: "." diff --git a/testdata/iter_pcdirect.rpl b/testdata/iter_pcdirect.rpl index 0a4487fd86c7..0bd5dfe78355 100644 --- a/testdata/iter_pcdirect.rpl +++ b/testdata/iter_pcdirect.rpl @@ -2,6 +2,7 @@ server: target-fetch-policy: "0 0 0 0 0" qname-minimisation: "no" + minimal-responses: no stub-zone: name: "." diff --git a/testdata/iter_pcname.rpl b/testdata/iter_pcname.rpl index 037b6426f4d2..e17c9102c86a 100644 --- a/testdata/iter_pcname.rpl +++ b/testdata/iter_pcname.rpl @@ -1,6 +1,7 @@ ; config options server: target-fetch-policy: "0 0 0 0 0" + minimal-responses: no stub-zone: name: "." diff --git a/testdata/iter_pcnamech.rpl b/testdata/iter_pcnamech.rpl index a979101d9547..1aba95b07aa7 100644 --- a/testdata/iter_pcnamech.rpl +++ b/testdata/iter_pcnamech.rpl @@ -1,6 +1,7 @@ ; config options server: target-fetch-policy: "0 0 0 0 0" + minimal-responses: no stub-zone: name: "." diff --git a/testdata/iter_pcnamechrec.rpl b/testdata/iter_pcnamechrec.rpl index f4c0197ba908..90745fcf3eb2 100644 --- a/testdata/iter_pcnamechrec.rpl +++ b/testdata/iter_pcnamechrec.rpl @@ -1,6 +1,7 @@ ; config options server: target-fetch-policy: "0 0 0 0 0" + minimal-responses: no stub-zone: name: "." diff --git a/testdata/iter_pcnamerec.rpl b/testdata/iter_pcnamerec.rpl index ecc03d353501..faee6d029acd 100644 --- a/testdata/iter_pcnamerec.rpl +++ b/testdata/iter_pcnamerec.rpl @@ -1,6 +1,7 @@ ; config options server: target-fetch-policy: "0 0 0 0 0" + minimal-responses: no stub-zone: name: "." diff --git a/testdata/iter_pcttl.rpl b/testdata/iter_pcttl.rpl index 41d94bc4234d..413f8cb88b09 100644 --- a/testdata/iter_pcttl.rpl +++ b/testdata/iter_pcttl.rpl @@ -2,6 +2,7 @@ server: target-fetch-policy: "0 0 0 0 0" do-ip6: no + minimal-responses: no stub-zone: name: "." diff --git a/testdata/iter_prefetch.rpl b/testdata/iter_prefetch.rpl index feb6b81e8673..bad92dc575dd 100644 --- a/testdata/iter_prefetch.rpl +++ b/testdata/iter_prefetch.rpl @@ -3,6 +3,7 @@ server: target-fetch-policy: "0 0 0 0 0" qname-minimisation: "no" prefetch: "yes" + minimal-responses: no stub-zone: name: "." diff --git a/testdata/iter_prefetch_change.rpl b/testdata/iter_prefetch_change.rpl index 2ed70cdadf8f..007025ad010c 100644 --- a/testdata/iter_prefetch_change.rpl +++ b/testdata/iter_prefetch_change.rpl @@ -2,6 +2,7 @@ server: target-fetch-policy: "0 0 0 0 0" prefetch: "yes" + minimal-responses: no stub-zone: name: "." diff --git a/testdata/iter_prefetch_change2.rpl b/testdata/iter_prefetch_change2.rpl index 93196d555f72..7a8370ff61bb 100644 --- a/testdata/iter_prefetch_change2.rpl +++ b/testdata/iter_prefetch_change2.rpl @@ -2,6 +2,7 @@ server: target-fetch-policy: "0 0 0 0 0" prefetch: "yes" + minimal-responses: no stub-zone: name: "." diff --git a/testdata/iter_prefetch_childns.rpl b/testdata/iter_prefetch_childns.rpl index 869aaa40c95c..00a91fcde1a5 100644 --- a/testdata/iter_prefetch_childns.rpl +++ b/testdata/iter_prefetch_childns.rpl @@ -3,6 +3,7 @@ server: target-fetch-policy: "0 0 0 0 0" qname-minimisation: "no" prefetch: "yes" + minimal-responses: no stub-zone: name: "." diff --git a/testdata/iter_prefetch_fail.rpl b/testdata/iter_prefetch_fail.rpl index 2f7f9942510d..1d92a4c1c462 100644 --- a/testdata/iter_prefetch_fail.rpl +++ b/testdata/iter_prefetch_fail.rpl @@ -2,6 +2,7 @@ server: target-fetch-policy: "0 0 0 0 0" prefetch: "yes" + minimal-responses: no stub-zone: name: "." diff --git a/testdata/iter_prefetch_ns.rpl b/testdata/iter_prefetch_ns.rpl index f99fb80dcf5a..93af216387ae 100644 --- a/testdata/iter_prefetch_ns.rpl +++ b/testdata/iter_prefetch_ns.rpl @@ -3,6 +3,7 @@ server: target-fetch-policy: "0 0 0 0 0" qname-minimisation: "no" prefetch: "yes" + minimal-responses: no stub-zone: name: "." diff --git a/testdata/iter_primenoglue.rpl b/testdata/iter_primenoglue.rpl index 0d6adefc591e..a75ed82ddce2 100644 --- a/testdata/iter_primenoglue.rpl +++ b/testdata/iter_primenoglue.rpl @@ -7,6 +7,7 @@ server: qname-minimisation: "no" fake-sha1: yes trust-anchor-signaling: no + minimal-responses: no stub-zone: name: "." diff --git a/testdata/iter_privaddr.rpl b/testdata/iter_privaddr.rpl index 2361af6536c8..93a2a147d1eb 100644 --- a/testdata/iter_privaddr.rpl +++ b/testdata/iter_privaddr.rpl @@ -2,6 +2,7 @@ server: target-fetch-policy: "0 0 0 0 0" qname-minimisation: "no" + minimal-responses: no private-address: 10.0.0.0/8 private-address: 172.16.0.0/12 diff --git a/testdata/iter_ranoaa_lame.rpl b/testdata/iter_ranoaa_lame.rpl index d2db84a8e097..efb38a5907ec 100644 --- a/testdata/iter_ranoaa_lame.rpl +++ b/testdata/iter_ranoaa_lame.rpl @@ -1,6 +1,7 @@ ; config options server: target-fetch-policy: "0 0 0 0 0" + minimal-responses: no stub-zone: name: "." diff --git a/testdata/iter_reclame_one.rpl b/testdata/iter_reclame_one.rpl index fe15b256ce39..4df9b6594fe4 100644 --- a/testdata/iter_reclame_one.rpl +++ b/testdata/iter_reclame_one.rpl @@ -2,6 +2,7 @@ server: target-fetch-policy: "0 0 0 0 0" qname-minimisation: "no" + minimal-responses: no stub-zone: name: "." diff --git a/testdata/iter_reclame_two.rpl b/testdata/iter_reclame_two.rpl index 3b7dfd65cbe0..f30edd941472 100644 --- a/testdata/iter_reclame_two.rpl +++ b/testdata/iter_reclame_two.rpl @@ -1,6 +1,7 @@ ; config options server: target-fetch-policy: "0 0 0 0 0" + minimal-responses: no stub-zone: name: "." diff --git a/testdata/iter_recurse.rpl b/testdata/iter_recurse.rpl index ab62e1ae5d5f..181af11079f5 100644 --- a/testdata/iter_recurse.rpl +++ b/testdata/iter_recurse.rpl @@ -2,6 +2,7 @@ server: target-fetch-policy: "0 0 0 0 0" qname-minimisation: "no" + minimal-responses: no stub-zone: name: "." diff --git a/testdata/iter_resolve.rpl b/testdata/iter_resolve.rpl index cab3887f77b9..ed051ff24eff 100644 --- a/testdata/iter_resolve.rpl +++ b/testdata/iter_resolve.rpl @@ -2,6 +2,7 @@ server: target-fetch-policy: "0 0 0 0 0" qname-minimisation: "no" + minimal-responses: no stub-zone: name: "." diff --git a/testdata/iter_resolve_minimised.rpl b/testdata/iter_resolve_minimised.rpl index ab3c6e9e7121..2c6f9ccf5f93 100644 --- a/testdata/iter_resolve_minimised.rpl +++ b/testdata/iter_resolve_minimised.rpl @@ -1,6 +1,7 @@ ; config options server: target-fetch-policy: "0 0 0 0 0" + minimal-responses: no stub-zone: name: "." diff --git a/testdata/iter_resolve_minimised_nx.rpl b/testdata/iter_resolve_minimised_nx.rpl index cb877bc250b4..74e612ccb951 100644 --- a/testdata/iter_resolve_minimised_nx.rpl +++ b/testdata/iter_resolve_minimised_nx.rpl @@ -2,6 +2,7 @@ server: target-fetch-policy: "0 0 0 0 0" qname-minimisation: yes + minimal-responses: no stub-zone: name: "." diff --git a/testdata/iter_resolve_minimised_refused.rpl b/testdata/iter_resolve_minimised_refused.rpl index 82852a4380cd..66e8e631e200 100644 --- a/testdata/iter_resolve_minimised_refused.rpl +++ b/testdata/iter_resolve_minimised_refused.rpl @@ -2,6 +2,7 @@ server: target-fetch-policy: "0 0 0 0 0" qname-minimisation: yes + minimal-responses: no stub-zone: name: "." diff --git a/testdata/iter_resolve_minimised_timeout.rpl b/testdata/iter_resolve_minimised_timeout.rpl index 2a166aff0e71..86b93216075b 100644 --- a/testdata/iter_resolve_minimised_timeout.rpl +++ b/testdata/iter_resolve_minimised_timeout.rpl @@ -2,6 +2,7 @@ server: target-fetch-policy: "0 0 0 0 0" qname-minimisation: yes + minimal-responses: no stub-zone: name: "." diff --git a/testdata/iter_scrub_cname_an.rpl b/testdata/iter_scrub_cname_an.rpl index 54a98c63bf34..9c5060af7913 100644 --- a/testdata/iter_scrub_cname_an.rpl +++ b/testdata/iter_scrub_cname_an.rpl @@ -3,6 +3,7 @@ server: harden-referral-path: no target-fetch-policy: "0 0 0 0 0" qname-minimisation: "no" + minimal-responses: no stub-zone: name: "." diff --git a/testdata/iter_scrub_dname_insec.rpl b/testdata/iter_scrub_dname_insec.rpl index a2972202c626..921abe628f7f 100644 --- a/testdata/iter_scrub_dname_insec.rpl +++ b/testdata/iter_scrub_dname_insec.rpl @@ -3,6 +3,7 @@ server: harden-referral-path: no target-fetch-policy: "0 0 0 0 0" qname-minimisation: "no" + minimal-responses: no stub-zone: name: "." diff --git a/testdata/iter_scrub_dname_rev.rpl b/testdata/iter_scrub_dname_rev.rpl index b7e3ee2d0fb1..3e649f936186 100644 --- a/testdata/iter_scrub_dname_rev.rpl +++ b/testdata/iter_scrub_dname_rev.rpl @@ -7,6 +7,7 @@ server: qname-minimisation: "no" fake-sha1: yes trust-anchor-signaling: no + minimal-responses: no stub-zone: name: "." diff --git a/testdata/iter_scrub_dname_sec.rpl b/testdata/iter_scrub_dname_sec.rpl index 1b9153ba74a5..4597cdf982cd 100644 --- a/testdata/iter_scrub_dname_sec.rpl +++ b/testdata/iter_scrub_dname_sec.rpl @@ -7,6 +7,7 @@ server: qname-minimisation: "no" fake-sha1: yes trust-anchor-signaling: no + minimal-responses: no stub-zone: name: "." diff --git a/testdata/iter_soamin.rpl b/testdata/iter_soamin.rpl index 42eb80827d61..7e902601b006 100644 --- a/testdata/iter_soamin.rpl +++ b/testdata/iter_soamin.rpl @@ -1,6 +1,7 @@ ; config options server: target-fetch-policy: "0 0 0 0 0" + minimal-responses: no stub-zone: name: "." diff --git a/testdata/iter_stub_leak.rpl b/testdata/iter_stub_leak.rpl index e5c6200060a0..388344ce5ef0 100644 --- a/testdata/iter_stub_leak.rpl +++ b/testdata/iter_stub_leak.rpl @@ -1,6 +1,7 @@ ; config options server: target-fetch-policy: "0 0 0 0 0" + minimal-responses: no stub-zone: name: "." diff --git a/testdata/iter_stub_noroot.rpl b/testdata/iter_stub_noroot.rpl index 0bc1ff5d2031..ef306bd428c4 100644 --- a/testdata/iter_stub_noroot.rpl +++ b/testdata/iter_stub_noroot.rpl @@ -1,6 +1,7 @@ ; config options server: target-fetch-policy: "0 0 0 0 0" + minimal-responses: no stub-zone: name: "." diff --git a/testdata/iter_stubfirst.rpl b/testdata/iter_stubfirst.rpl index 6245a4f09a1e..1a7112de4517 100644 --- a/testdata/iter_stubfirst.rpl +++ b/testdata/iter_stubfirst.rpl @@ -1,6 +1,7 @@ ; config options server: target-fetch-policy: "0 0 0 0 0" + minimal-responses: no stub-zone: name: "." diff --git a/testdata/iter_timeout_ra_aaaa.rpl b/testdata/iter_timeout_ra_aaaa.rpl index 9b06aea90992..126867ba4a4a 100644 --- a/testdata/iter_timeout_ra_aaaa.rpl +++ b/testdata/iter_timeout_ra_aaaa.rpl @@ -2,6 +2,7 @@ server: target-fetch-policy: "0 0 0 0 0" qname-minimisation: "no" + minimal-responses: no stub-zone: name: "." diff --git a/testdata/pylib.tdir/pylib.lookup.conf b/testdata/pylib.tdir/pylib.lookup.conf new file mode 100644 index 000000000000..3f4a8d26dfb1 --- /dev/null +++ b/testdata/pylib.tdir/pylib.lookup.conf @@ -0,0 +1,14 @@ +server: + verbosity: 2 + use-syslog: no + directory: "" + pidfile: "unbound.pid" + chroot: "" + username: "" + do-not-query-localhost: no + module-config: "validator iterator" + +stub-zone: + name: "example.com." + stub-addr: "127.0.0.1@@TOPORT@" + diff --git a/testdata/pylib.tdir/pylib.lookup.py b/testdata/pylib.tdir/pylib.lookup.py index 1c829bc7054d..5f69c58abd18 100755 --- a/testdata/pylib.tdir/pylib.lookup.py +++ b/testdata/pylib.tdir/pylib.lookup.py @@ -1,24 +1,141 @@ #!/usr/bin/env python -''' -Test for unbound lookup. -BSD licensed. -''' +# +# Test for pyunbound lookup. +# BSD licensed. +# +import sys +import time + import unbound -ctx = unbound.ub_ctx() -status = ctx.config("ub.conf") -if status != 0: - print "read config failed ", status - exit(1) +qname = "www.example.com" +qtype = unbound.RR_TYPE_A +qclass = unbound.RR_CLASS_IN + +def create_context(config_file="ub.lookup.conf", async=False): + """ + Create an unbound context to use for testing. + + """ + ctx = unbound.ub_ctx() + status = ctx.config(config_file) + if status != 0: + print("read config failed with status: {}".format(status)) + sys.exit(1) + ctx.set_async(async) + return ctx + + +def callback(data, status, result): + """ + Callback for background workers. + + """ + if status == 0: + data['rcode'] = result.rcode + data['secure'] = result.secure + if result.havedata: + data['data'] = result.data + data['was_ratelimited'] = result.was_ratelimited + data['done'] = True + + +def test_resolve(ctx): + """ + Test resolving a domain with a foreground worker. + + """ + status, result = ctx.resolve(qname, qtype, qclass) + if status == 0 and result.havedata: + print("Resolve: {}".format(result.data.address_list)) + else: + print("Failed resolve with: {}".format(status)) + + +def test_async_resolve(ctx): + """ + Test resolving a domain with a background worker. + + """ + cb_data = dict(done=False) + retval, async_id = ctx.resolve_async(qname, cb_data, callback, qtype, qclass) + while retval == 0 and not cb_data['done']: + time.sleep(0.1) + retval = ctx.process() + + if cb_data.get('data'): + print("Async resolve: {}".format(cb_data['data'].address_list)) + else: + print("Failed async resolve with: {}".format(retval)) + + +def test_ratelimit_fg_on(ctx): + """ + Test resolving a ratelimited domain with a foreground worker. + + """ + ctx.set_option("ratelimit:", "1") + ctx.set_option("ratelimit-factor:", "0") + status, result = ctx.resolve(qname, qtype, qclass) + if status == 0 and result.was_ratelimited: + print("Ratelimit-fg-on: pass") + else: + print("Failed ratelimit-fg-on with: {}".format(status)) + + +def test_ratelimit_fg_off(ctx): + """ + Test resolving a non-ratelimited domain with a foreground worker. + + """ + status, result = ctx.resolve(qname, qtype, qclass) + if status == 0 and result.havedata: + print("Ratelimit-fg-off: {}".format(result.data.address_list)) + else: + print("Failed ratelimit-fg-off with: {}".format(status)) + + +def test_ratelimit_bg_on(ctx): + """ + Test resolving a ratelimited domain with a background worker. + + """ + ctx.set_option("ratelimit:", "1") + ctx.set_option("ratelimit-factor:", "0") + cb_data = dict(done=False) + retval, async_id = ctx.resolve_async(qname, cb_data, callback, qtype, qclass) + while retval == 0 and not cb_data['done']: + time.sleep(0.1) + retval = ctx.process() + + if cb_data.get('was_ratelimited'): + print("Ratelimit-bg-on: pass") + else: + print("Failed ratelimit-bg-on with: {}".format(status)) + + +def test_ratelimit_bg_off(ctx): + """ + Test resolving a non-ratelimited domain with a background worker. + + """ + cb_data = dict(done=False) + retval, async_id = ctx.resolve_async(qname, cb_data, callback, qtype, qclass) + while retval == 0 and not cb_data['done']: + time.sleep(0.1) + retval = ctx.process() -print "config created" + if cb_data.get('data'): + print("Ratelimit-bg-off: {}".format(cb_data['data'].address_list)) + else: + print("Failed ratelimit-bg-off with: {}".format(status)) -status, result = ctx.resolve("www.example.com", unbound.RR_TYPE_A, unbound.RR_CLASS_IN); -if status == 0 and result.havedata: - print "Result: ", result.data.address_list -else: - print "Failed ", status, " and data ", result -ctx = None +test_resolve(create_context()) +test_async_resolve(create_context(async=True)) +test_ratelimit_fg_on(create_context()) +test_ratelimit_fg_off(create_context()) +test_ratelimit_bg_on(create_context(async=True)) +test_ratelimit_bg_off(create_context(async=True)) -exit(0) +sys.exit(0) diff --git a/testdata/pylib.tdir/pylib.post b/testdata/pylib.tdir/pylib.post index 26db7e80eee9..875e06d0ae34 100644 --- a/testdata/pylib.tdir/pylib.post +++ b/testdata/pylib.tdir/pylib.post @@ -10,9 +10,9 @@ PRE="../.." . ../common.sh # if no python; exit if grep "define WITH_PYUNBOUND 1" $PRE/config.h; then - echo "have python module" + echo "have pyunbound" else - echo "no python module" + echo "no pyunbound" exit 0 fi diff --git a/testdata/pylib.tdir/pylib.pre b/testdata/pylib.tdir/pylib.pre index 01ca2b896280..30e0059064ab 100644 --- a/testdata/pylib.tdir/pylib.pre +++ b/testdata/pylib.tdir/pylib.pre @@ -8,13 +8,16 @@ PRE="../.." . ../common.sh # if no python; exit if grep "define WITH_PYUNBOUND 1" $PRE/config.h; then - echo "have python module" + echo "have pyunbound" else - echo "no python module" + echo "no pyunbound" exit 0 fi -# get module python local -cp $PRE/pythonmod/unboundmodule.py . + +# Copy the required libraries +cp $PRE/libunbound/python/unbound.py . +cp $PRE/.libs/_unbound* . +cp $PRE/.libs/libunbound* . get_random_port 2 UNBOUND_PORT=$RND_PORT @@ -29,7 +32,7 @@ FWD_PID=$! echo "FWD_PID=$FWD_PID" >> .tpkg.var.test # modify config file -sed -e 's/@PORT\@/'$UNBOUND_PORT'/' -e 's/@TOPORT\@/'$FWD_PORT'/' < pylib.conf > ub.conf +sed -e 's/@PORT\@/'$UNBOUND_PORT'/' -e 's/@TOPORT\@/'$FWD_PORT'/' < pylib.lookup.conf > ub.lookup.conf cat .tpkg.var.test wait_ldns_testns_up fwd.log diff --git a/testdata/pylib.tdir/pylib.py b/testdata/pylib.tdir/pylib.py deleted file mode 100644 index 3f6fed1c696b..000000000000 --- a/testdata/pylib.tdir/pylib.py +++ /dev/null @@ -1,159 +0,0 @@ -# -*- coding: utf-8 -*- -''' - ubmodule-msg.py: simple response packet logger - - Authors: Zdenek Vasicek (vasicek AT fit.vutbr.cz) - Marek Vavrusa (xvavru00 AT stud.fit.vutbr.cz) - - Copyright (c) 2008. All rights reserved. - - This software is open source. - - Redistribution and use in source and binary forms, with or without - modification, are permitted provided that the following conditions - are met: - - Redistributions of source code must retain the above copyright notice, - this list of conditions and the following disclaimer. - - Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimer in the documentation - and/or other materials provided with the distribution. - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED - TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR - PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE - LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR - CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF - SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - POSSIBILITY OF SUCH DAMAGE. - - Modified for unit test by Wouter Wijngaards, NLnet Labs, 2009. -''' -import os - -def init(id, cfg): - log_info("pythonmod: init called, module id is %d port: %d script: %s" % (id, cfg.port, cfg.python_script)) - return True - -def deinit(id): - log_info("pythonmod: deinit called, module id is %d" % id) - return True - -def inform_super(id, qstate, superqstate, qdata): - return True - -def setTTL(qstate, ttl): - """Sets return_msg TTL and all the RRs TTL""" - if qstate.return_msg: - qstate.return_msg.rep.ttl = ttl - if (qstate.return_msg.rep): - for i in range(0,qstate.return_msg.rep.rrset_count): - d = qstate.return_msg.rep.rrsets[i].entry.data - for j in range(0,d.count+d.rrsig_count): - d.rr_ttl[j] = ttl - -def dataHex(data, prefix=""): - res = "" - for i in range(0, (len(data)+15)/16): - res += "%s0x%02X | " % (prefix, i*16) - d = map(lambda x:ord(x), data[i*16:i*16+17]) - for ch in d: - res += "%02X " % ch - for i in range(0,17-len(d)): - res += " " - res += "| " - for ch in d: - if (ch < 32) or (ch > 127): - res += ". " - else: - res += "%c " % ch - res += "\n" - return res - -def printReturnMsg(qstate): - print "Return MSG rep :: flags: %04X, QDcount: %d, Security:%d, TTL=%d" % (qstate.return_msg.rep.flags, qstate.return_msg.rep.qdcount,qstate.return_msg.rep.security, qstate.return_msg.rep.ttl) - print " qinfo :: qname:",qstate.return_msg.qinfo.qname_list, qstate.return_msg.qinfo.qname_str, "type:",qstate.return_msg.qinfo.qtype_str, "class:",qstate.return_msg.qinfo.qclass_str - if (qstate.return_msg.rep): - print "RRSets:",qstate.return_msg.rep.rrset_count - prevkey = None - for i in range(0,qstate.return_msg.rep.rrset_count): - r = qstate.return_msg.rep.rrsets[i] - rk = r.rk - print i,":",rk.dname_list, rk.dname_str, "flags: %04X" % rk.flags, - print "type:",rk.type_str,"(%d)" % ntohs(rk.type), "class:",rk.rrset_class_str,"(%d)" % ntohs(rk.rrset_class) - - d = r.entry.data - print " RRDatas:",d.count+d.rrsig_count - for j in range(0,d.count+d.rrsig_count): - print " ",j,":","TTL=",d.rr_ttl[j],"RR data:" - print dataHex(d.rr_data[j]," ") - - -def operate(id, event, qstate, qdata): - log_info("pythonmod: operate called, id: %d, event:%s" % (id, strmodulevent(event))) - #print "pythonmod: per query data", qdata - - print "Query:", ''.join(map(lambda x:chr(max(32,ord(x))),qstate.qinfo.qname)), qstate.qinfo.qname_list, qstate.qinfo.qname_str, - print "Type:",qstate.qinfo.qtype_str,"(%d)" % qstate.qinfo.qtype, - print "Class:",qstate.qinfo.qclass_str,"(%d)" % qstate.qinfo.qclass - print - - if (event == MODULE_EVENT_NEW or event == MODULE_EVENT_PASS) and (qstate.qinfo.qname_str.endswith("www2.example.com.")): - print qstate.qinfo.qname_str - - qstate.ext_state[id] = MODULE_FINISHED - - msg = DNSMessage(qstate.qinfo.qname_str, RR_TYPE_A, RR_CLASS_IN, PKT_QR | PKT_RA | PKT_AA) #, 300) - #msg.authority.append("xxx.seznam.cz. 10 IN A 192.168.1.1") - #msg.additional.append("yyy.seznam.cz. 10 IN A 1.1.1.2.") - - # answer can be returned to the client without further checking. - - if qstate.qinfo.qtype == RR_TYPE_A: - msg.answer.append("%s 10 IN A 192.168.1.1" % qstate.qinfo.qname_str) - if (qstate.qinfo.qtype == RR_TYPE_SRV) or (qstate.qinfo.qtype == RR_TYPE_ANY): - msg.answer.append("%s 10 IN SRV 0 0 80 neinfo.example.com." % qstate.qinfo.qname_str) - if (qstate.qinfo.qtype == RR_TYPE_TXT) or (qstate.qinfo.qtype == RR_TYPE_ANY): - msg.answer.append("%s 10 IN TXT path=/" % qstate.qinfo.qname_str) - - if not msg.set_return_msg(qstate): - qstate.ext_state[id] = MODULE_ERROR - return True - - #qstate.return_msg.rep.security = 2 #pokud nebude nasledovat validator, je zapotrebi nastavit security, aby nebyl paket zahozen v mesh_send_reply - printReturnMsg(qstate) - - #Authoritative result can't be stored in cache - #if (not storeQueryInCache(qstate, qstate.return_msg.qinfo, qstate.return_msg.rep, 0)): - # print "Can't store in cache" - # qstate.ext_state[id] = MODULE_ERROR - # return False - #print "Store OK" - - qstate.return_rcode = RCODE_NOERROR - return True - - if event == MODULE_EVENT_NEW: - qstate.ext_state[id] = MODULE_WAIT_MODULE - return True - - if event == MODULE_EVENT_MODDONE: - log_info("pythonmod: previous module done") - qstate.ext_state[id] = MODULE_FINISHED - return True - - if event == MODULE_EVENT_PASS: - log_info("pythonmod: event_pass") - qstate.ext_state[id] = MODULE_WAIT_MODULE - return True - - log_err("pythonmod: BAD event") - qstate.ext_state[id] = MODULE_ERROR - return True - -log_info("pythonmod: script loaded.") diff --git a/testdata/pylib.tdir/pylib.test b/testdata/pylib.tdir/pylib.test index 96a846403c15..9456691aa6e1 100644 --- a/testdata/pylib.tdir/pylib.test +++ b/testdata/pylib.tdir/pylib.test @@ -6,9 +6,9 @@ PRE="../.." if grep "define WITH_PYUNBOUND 1" $PRE/config.h; then - echo "have python module" + echo "have pyunbound" else - echo "no python module" + echo "no pyunbound" exit 0 fi @@ -19,22 +19,50 @@ fi #echo export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:../../.libs:." #export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:../../.libs:." -cp $PRE/libunbound/python/unbound.py . -cp $PRE/.libs/_unbound* . -cp $PRE/.libs/libunbound* . - # do the test echo "> pylib.lookup.py www.example.com." ./pylib.lookup.py www.example.com. | tee outfile echo "> cat logfiles" -cat fwd.log +cat fwd.log echo "> check answer" -if grep "10.20.30.40" outfile; then - echo "OK" +if grep "Resolve: \[.\?10.20.30.40.\?\]" outfile; then + : else - echo "Not OK" + echo "Not OK (resolve)" exit 1 fi +if grep "Async resolve: \[.\?10.20.30.40.\?\]" outfile; then + : +else + echo "Not OK (async resolve)" + exit 1 +fi +if grep "Ratelimit-fg-on: pass" outfile; then + : +else + echo "Not OK (ratelimit-fg-on)" + exit 1 +fi +if grep "Ratelimit-fg-off: \[.\?10.20.30.40.\?\]" outfile; then + : +else + echo "Not OK (ratelimit-fg-off)" + exit 1 +fi +if grep "Ratelimit-bg-on: pass" outfile; then + : +else + echo "Not OK (ratelimit-bg-on)" + exit 1 +fi +if grep "Ratelimit-bg-off: \[.\?10.20.30.40.\?\]" outfile; then + : +else + echo "Not OK (ratelimit-bg-off)" + exit 1 +fi + +echo "OK" exit 0 diff --git a/testdata/rrset_rettl.rpl b/testdata/rrset_rettl.rpl index 2ae64e9476bb..55dd62386e28 100644 --- a/testdata/rrset_rettl.rpl +++ b/testdata/rrset_rettl.rpl @@ -1,5 +1,7 @@ ; This is a comment. ; config options go here. +server: + minimal-responses: no forward-zone: name: "." forward-addr: 216.0.0.1 CONFIG_END diff --git a/testdata/rrset_untrusted.rpl b/testdata/rrset_untrusted.rpl index 232554872b4a..6370ebf49bf9 100644 --- a/testdata/rrset_untrusted.rpl +++ b/testdata/rrset_untrusted.rpl @@ -1,5 +1,7 @@ ; This is a comment. ; config options go here. +server: + minimal-responses: no forward-zone: name: "." forward-addr: 216.0.0.1 CONFIG_END diff --git a/testdata/rrset_updated.rpl b/testdata/rrset_updated.rpl index 4e877df11472..d36ab8cc88a7 100644 --- a/testdata/rrset_updated.rpl +++ b/testdata/rrset_updated.rpl @@ -1,5 +1,7 @@ ; This is a comment. ; config options go here. +server: + minimal-responses: no forward-zone: name: "." forward-addr: 216.0.0.1 CONFIG_END diff --git a/testdata/subnet_cached.crpl b/testdata/subnet_cached.crpl index 3d4fd9a961b8..a0d89af51c1e 100644 --- a/testdata/subnet_cached.crpl +++ b/testdata/subnet_cached.crpl @@ -12,6 +12,7 @@ server: verbosity: 3 access-control: 127.0.0.1 allow_snoop qname-minimisation: "no" + minimal-responses: no stub-zone: name: "." diff --git a/testdata/subnet_max_source.crpl b/testdata/subnet_max_source.crpl index aae1f1af2e5d..e1c6cf5f99f7 100644 --- a/testdata/subnet_max_source.crpl +++ b/testdata/subnet_max_source.crpl @@ -10,6 +10,7 @@ server: module-config: "subnetcache validator iterator" verbosity: 3 qname-minimisation: "no" + minimal-responses: no stub-zone: name: "." diff --git a/testdata/subnet_val_positive.crpl b/testdata/subnet_val_positive.crpl index ef33531d2a32..afec59933d91 100644 --- a/testdata/subnet_val_positive.crpl +++ b/testdata/subnet_val_positive.crpl @@ -10,6 +10,7 @@ server: module-config: "subnetcache validator iterator" verbosity: 3 qname-minimisation: "no" + minimal-responses: no stub-zone: name: "." diff --git a/testdata/subnet_val_positive_client.crpl b/testdata/subnet_val_positive_client.crpl index dcd3a87199b2..e631a64e6a29 100644 --- a/testdata/subnet_val_positive_client.crpl +++ b/testdata/subnet_val_positive_client.crpl @@ -11,6 +11,7 @@ server: module-config: "subnetcache validator iterator" verbosity: 3 qname-minimisation: "no" + minimal-responses: no stub-zone: name: "." diff --git a/testdata/pylib.tdir/pylib.conf b/testdata/tcp_conn_limit.tdir/tcp_conn_limit.conf index 82fa27a68196..4d4f71dc5297 100644 --- a/testdata/pylib.tdir/pylib.conf +++ b/testdata/tcp_conn_limit.tdir/tcp_conn_limit.conf @@ -1,19 +1,16 @@ server: verbosity: 2 # num-threads: 1 - #port: @PORT@ + interface: 127.0.0.1 + port: @PORT@ use-syslog: no - directory: "" + directory: . pidfile: "unbound.pid" chroot: "" username: "" do-not-query-localhost: no - module-config: "validator iterator" - -#python: - #python-script: "pylib.py" + tcp-connection-limit: 0.0.0.0/0 0 forward-zone: name: "." forward-addr: "127.0.0.1@@TOPORT@" - diff --git a/testdata/tcp_conn_limit.tdir/tcp_conn_limit.dsc b/testdata/tcp_conn_limit.tdir/tcp_conn_limit.dsc new file mode 100644 index 000000000000..2bc5196db2d8 --- /dev/null +++ b/testdata/tcp_conn_limit.tdir/tcp_conn_limit.dsc @@ -0,0 +1,16 @@ +BaseName: tcp_conn_limit +Version: 1.0 +Description: Test tcp-connection-limit setting. +CreationDate: Fri Aug 3 17:18:00 BST 2018 +Maintainer: dr. J. Hague +Category: +Component: +CmdDepends: +Depends: +Help: +Pre: tcp_conn_limit.pre +Post: tcp_conn_limit.post +Test: tcp_conn_limit.test +AuxFiles: +Passed: +Failure: diff --git a/testdata/tcp_conn_limit.tdir/tcp_conn_limit.post b/testdata/tcp_conn_limit.tdir/tcp_conn_limit.post new file mode 100644 index 000000000000..1cd215e2df00 --- /dev/null +++ b/testdata/tcp_conn_limit.tdir/tcp_conn_limit.post @@ -0,0 +1,10 @@ +# #-- tcp_conn_limit.post --# +# source the master var file when it's there +[ -f ../.tpkg.var.master ] && source ../.tpkg.var.master +# source the test var file when it's there +[ -f .tpkg.var.test ] && source .tpkg.var.test +# +# do your teardown here +. ../common.sh +kill_pid $FWD_PID +kill_pid $UNBOUND_PID diff --git a/testdata/tcp_conn_limit.tdir/tcp_conn_limit.pre b/testdata/tcp_conn_limit.tdir/tcp_conn_limit.pre new file mode 100644 index 000000000000..f4382f000e3b --- /dev/null +++ b/testdata/tcp_conn_limit.tdir/tcp_conn_limit.pre @@ -0,0 +1,31 @@ +# #-- tcp_conn_limit.pre--# +# source the master var file when it's there +[ -f ../.tpkg.var.master ] && source ../.tpkg.var.master +# use .tpkg.var.test for in test variable passing +[ -f .tpkg.var.test ] && source .tpkg.var.test + +. ../common.sh +get_random_port 2 +UNBOUND_PORT=$RND_PORT +FWD_PORT=$(($RND_PORT + 1)) +echo "UNBOUND_PORT=$UNBOUND_PORT" >> .tpkg.var.test +echo "FWD_PORT=$FWD_PORT" >> .tpkg.var.test + +# start forwarder +get_ldns_testns +$LDNS_TESTNS -p $FWD_PORT tcp_conn_limit.testns >fwd.log 2>&1 & +FWD_PID=$! +echo "FWD_PID=$FWD_PID" >> .tpkg.var.test + +# make config file +sed -e 's/@PORT\@/'$UNBOUND_PORT'/' -e 's/@TOPORT\@/'$FWD_PORT'/' < tcp_conn_limit.conf > ub.conf +# start unbound in the background +PRE="../.." +$PRE/unbound -d -c ub.conf >unbound.log 2>&1 & +UNBOUND_PID=$! +echo "UNBOUND_PID=$UNBOUND_PID" >> .tpkg.var.test + +cat .tpkg.var.test +wait_ldns_testns_up fwd.log +wait_unbound_up unbound.log + diff --git a/testdata/tcp_conn_limit.tdir/tcp_conn_limit.test b/testdata/tcp_conn_limit.tdir/tcp_conn_limit.test new file mode 100644 index 000000000000..a2e1dac889e3 --- /dev/null +++ b/testdata/tcp_conn_limit.tdir/tcp_conn_limit.test @@ -0,0 +1,42 @@ +# #-- tcp_conn_limit.test --# +# source the master var file when it's there +[ -f ../.tpkg.var.master ] && source ../.tpkg.var.master +# use .tpkg.var.test for in test variable passing +[ -f .tpkg.var.test ] && source .tpkg.var.test + + +# Set unbound to limit all IPv4 addresses to 0 connections. +# Make sure TCP connection fails. + + +if uname | grep MINGW >/dev/null; then + echo "no job control in shell on windows. end test" + exit 0 +fi + +PRE="../.." +. ../common.sh +get_make +(cd $PRE; $MAKE streamtcp) + +# test query should fail. +echo "> query www.example.com." +$PRE/streamtcp -f 127.0.0.1@$UNBOUND_PORT www.example.com. A IN >outfile 2>&1 +if test "$?" -eq 0; then + echo "exit status OK" + echo "> cat logfiles" + cat outfile + cat fwd.log + cat unbound.log + echo "Not OK" + exit 1 +else + echo "exit status not OK" +fi +echo "> cat logfiles" +cat outfile +cat fwd.log +cat unbound.log +echo "OK" + +exit 0 diff --git a/testdata/tcp_conn_limit.tdir/tcp_conn_limit.testns b/testdata/tcp_conn_limit.tdir/tcp_conn_limit.testns new file mode 100644 index 000000000000..14647723fca5 --- /dev/null +++ b/testdata/tcp_conn_limit.tdir/tcp_conn_limit.testns @@ -0,0 +1,42 @@ +; nameserver test file +$ORIGIN example.com. +$TTL 3600 + +ENTRY_BEGIN +MATCH UDP opcode qtype qname +REPLY QR AA NOERROR TC +ADJUST copy_id +SECTION QUESTION +www IN A +ENTRY_END + +ENTRY_BEGIN +MATCH TCP opcode qtype qname +REPLY QR AA NOERROR +ADJUST copy_id sleep=2 +SECTION QUESTION +www IN A +SECTION ANSWER +www IN A 10.20.30.40 +ENTRY_END + +ENTRY_BEGIN +MATCH opcode qtype qname +REPLY QR AA NOERROR +ADJUST copy_id +SECTION QUESTION +www2 IN A +SECTION ANSWER +www2 IN A 10.20.30.42 +ENTRY_END + +ENTRY_BEGIN +MATCH opcode qtype qname +REPLY QR AA NOERROR +ADJUST copy_id +SECTION QUESTION +www3 IN A +SECTION ANSWER +www3 IN A 10.20.30.43 +ENTRY_END + diff --git a/testdata/tcp_idle_timeout.tdir/tcp_idle_timeout.conf b/testdata/tcp_idle_timeout.tdir/tcp_idle_timeout.conf new file mode 100644 index 000000000000..df769aa1d857 --- /dev/null +++ b/testdata/tcp_idle_timeout.tdir/tcp_idle_timeout.conf @@ -0,0 +1,16 @@ +server: + verbosity: 2 + # num-threads: 1 + interface: 127.0.0.1 + port: @PORT@ + use-syslog: no + directory: . + pidfile: "unbound.pid" + chroot: "" + username: "" + do-not-query-localhost: no + tcp-idle-timeout: 2000 + +forward-zone: + name: "." + forward-addr: "127.0.0.1@@TOPORT@" diff --git a/testdata/tcp_idle_timeout.tdir/tcp_idle_timeout.dsc b/testdata/tcp_idle_timeout.tdir/tcp_idle_timeout.dsc new file mode 100644 index 000000000000..44edd5245d18 --- /dev/null +++ b/testdata/tcp_idle_timeout.tdir/tcp_idle_timeout.dsc @@ -0,0 +1,16 @@ +BaseName: tcp_idle_timeout +Version: 1.0 +Description: Test tcp-idle-timeout setting. +CreationDate: Thu Jul 12 13:55:00 BST 2018 +Maintainer: dr. J. Hague +Category: +Component: +CmdDepends: +Depends: +Help: +Pre: tcp_idle_timeout.pre +Post: tcp_idle_timeout.post +Test: tcp_idle_timeout.test +AuxFiles: +Passed: +Failure: diff --git a/testdata/tcp_idle_timeout.tdir/tcp_idle_timeout.post b/testdata/tcp_idle_timeout.tdir/tcp_idle_timeout.post new file mode 100644 index 000000000000..e8513460c537 --- /dev/null +++ b/testdata/tcp_idle_timeout.tdir/tcp_idle_timeout.post @@ -0,0 +1,10 @@ +# #-- tcp_idle_timeout.post --# +# source the master var file when it's there +[ -f ../.tpkg.var.master ] && source ../.tpkg.var.master +# source the test var file when it's there +[ -f .tpkg.var.test ] && source .tpkg.var.test +# +# do your teardown here +. ../common.sh +kill_pid $FWD_PID +kill_pid $UNBOUND_PID diff --git a/testdata/tcp_idle_timeout.tdir/tcp_idle_timeout.pre b/testdata/tcp_idle_timeout.tdir/tcp_idle_timeout.pre new file mode 100644 index 000000000000..d36319de58ee --- /dev/null +++ b/testdata/tcp_idle_timeout.tdir/tcp_idle_timeout.pre @@ -0,0 +1,31 @@ +# #-- tcp_idle_timeout.pre--# +# source the master var file when it's there +[ -f ../.tpkg.var.master ] && source ../.tpkg.var.master +# use .tpkg.var.test for in test variable passing +[ -f .tpkg.var.test ] && source .tpkg.var.test + +. ../common.sh +get_random_port 2 +UNBOUND_PORT=$RND_PORT +FWD_PORT=$(($RND_PORT + 1)) +echo "UNBOUND_PORT=$UNBOUND_PORT" >> .tpkg.var.test +echo "FWD_PORT=$FWD_PORT" >> .tpkg.var.test + +# start forwarder +get_ldns_testns +$LDNS_TESTNS -p $FWD_PORT tcp_idle_timeout.testns >fwd.log 2>&1 & +FWD_PID=$! +echo "FWD_PID=$FWD_PID" >> .tpkg.var.test + +# make config file +sed -e 's/@PORT\@/'$UNBOUND_PORT'/' -e 's/@TOPORT\@/'$FWD_PORT'/' < tcp_idle_timeout.conf > ub.conf +# start unbound in the background +PRE="../.." +$PRE/unbound -d -c ub.conf >unbound.log 2>&1 & +UNBOUND_PID=$! +echo "UNBOUND_PID=$UNBOUND_PID" >> .tpkg.var.test + +cat .tpkg.var.test +wait_ldns_testns_up fwd.log +wait_unbound_up unbound.log + diff --git a/testdata/tcp_idle_timeout.tdir/tcp_idle_timeout.test b/testdata/tcp_idle_timeout.tdir/tcp_idle_timeout.test new file mode 100644 index 000000000000..2ae8c4fa8d2e --- /dev/null +++ b/testdata/tcp_idle_timeout.tdir/tcp_idle_timeout.test @@ -0,0 +1,67 @@ +# #-- tcp_idle_timeout.test --# +# source the master var file when it's there +[ -f ../.tpkg.var.master ] && source ../.tpkg.var.master +# use .tpkg.var.test for in test variable passing +[ -f .tpkg.var.test ] && source .tpkg.var.test + + +# Run up unbound with a 2s idle timeout. Try a normal TCP query, check it works, and then check that a connection with a 4s send delay fails. + + +if uname | grep MINGW >/dev/null; then + echo "no job control in shell on windows. end test" + exit 0 +fi + +PRE="../.." +. ../common.sh +get_make +(cd $PRE; $MAKE streamtcp) + +# first test a single TCP query with no delay. +echo "> query www.example.com." +$PRE/streamtcp -f 127.0.0.1@$UNBOUND_PORT www.example.com. A IN >outfile 2>&1 +if test "$?" -ne 0; then + echo "exit status not OK" + echo "> cat logfiles" + cat outfile + cat fwd.log + cat unbound.log + echo "Not OK" + exit 1 +else + echo "exit status OK" +fi +echo "> cat logfiles" +cat outfile +cat fwd.log +cat unbound.log +echo "> check answer" +if grep "10.20.30.40" outfile; then + echo "OK" +else + echo "Not OK" + exit 1 +fi + +# now test query with delay should fail. +echo "> query www.example.com." +$PRE/streamtcp -d 4 -f 127.0.0.1@$UNBOUND_PORT www.example.com. A IN >outfile 2>&1 +if test "$?" -eq 0; then + echo "exit status OK" + echo "> cat logfiles" + cat outfile + cat fwd.log + cat unbound.log + echo "Not OK" + exit 1 +else + echo "exit status not OK" +fi +echo "> cat logfiles" +cat outfile +cat fwd.log +cat unbound.log +echo "OK" + +exit 0 diff --git a/testdata/tcp_idle_timeout.tdir/tcp_idle_timeout.testns b/testdata/tcp_idle_timeout.tdir/tcp_idle_timeout.testns new file mode 100644 index 000000000000..14647723fca5 --- /dev/null +++ b/testdata/tcp_idle_timeout.tdir/tcp_idle_timeout.testns @@ -0,0 +1,42 @@ +; nameserver test file +$ORIGIN example.com. +$TTL 3600 + +ENTRY_BEGIN +MATCH UDP opcode qtype qname +REPLY QR AA NOERROR TC +ADJUST copy_id +SECTION QUESTION +www IN A +ENTRY_END + +ENTRY_BEGIN +MATCH TCP opcode qtype qname +REPLY QR AA NOERROR +ADJUST copy_id sleep=2 +SECTION QUESTION +www IN A +SECTION ANSWER +www IN A 10.20.30.40 +ENTRY_END + +ENTRY_BEGIN +MATCH opcode qtype qname +REPLY QR AA NOERROR +ADJUST copy_id +SECTION QUESTION +www2 IN A +SECTION ANSWER +www2 IN A 10.20.30.42 +ENTRY_END + +ENTRY_BEGIN +MATCH opcode qtype qname +REPLY QR AA NOERROR +ADJUST copy_id +SECTION QUESTION +www3 IN A +SECTION ANSWER +www3 IN A 10.20.30.43 +ENTRY_END + diff --git a/testdata/trust_cname_chain.rpl b/testdata/trust_cname_chain.rpl index e4d2d2a99b7b..f8415ba23ce6 100644 --- a/testdata/trust_cname_chain.rpl +++ b/testdata/trust_cname_chain.rpl @@ -1,6 +1,7 @@ ; config options server: target-fetch-policy: "0 0 0 0 0" + minimal-responses: no stub-zone: name: "." stub-addr: 193.0.14.129 # K.ROOT-SERVERS.NET. diff --git a/testdata/ttl_max.rpl b/testdata/ttl_max.rpl index 1faa05453d36..17eaca26c548 100644 --- a/testdata/ttl_max.rpl +++ b/testdata/ttl_max.rpl @@ -3,6 +3,7 @@ server: access-control: 127.0.0.1 allow_snoop cache-max-ttl: 10 qname-minimisation: "no" + minimal-responses: no stub-zone: name: "." diff --git a/testdata/ttl_min.rpl b/testdata/ttl_min.rpl index b965fdbeab64..3c79ff5ed666 100644 --- a/testdata/ttl_min.rpl +++ b/testdata/ttl_min.rpl @@ -3,6 +3,7 @@ server: access-control: 127.0.0.1 allow_snoop cache-min-ttl: 10 qname-minimisation: "no" + minimal-responses: no stub-zone: name: "." diff --git a/testdata/val_adbit.rpl b/testdata/val_adbit.rpl index f8f44fcff679..7ce62de77e31 100644 --- a/testdata/val_adbit.rpl +++ b/testdata/val_adbit.rpl @@ -7,6 +7,7 @@ server: qname-minimisation: "no" fake-sha1: yes trust-anchor-signaling: no + minimal-responses: no stub-zone: name: "." diff --git a/testdata/val_adcopy.rpl b/testdata/val_adcopy.rpl index beb952356fb7..604fd57f2043 100644 --- a/testdata/val_adcopy.rpl +++ b/testdata/val_adcopy.rpl @@ -6,6 +6,7 @@ server: target-fetch-policy: "0 0 0 0 0" qname-minimisation: "no" fake-sha1: yes + minimal-responses: no stub-zone: name: "." diff --git a/testdata/val_ds_afterprime.rpl b/testdata/val_ds_afterprime.rpl index 50c28aae6f0b..3b1c0d614ba3 100644 --- a/testdata/val_ds_afterprime.rpl +++ b/testdata/val_ds_afterprime.rpl @@ -7,6 +7,7 @@ server: qname-minimisation: "no" fake-sha1: yes trust-anchor-signaling: no + minimal-responses: no stub-zone: name: "." diff --git a/testdata/val_faildnskey_ok.rpl b/testdata/val_faildnskey_ok.rpl index c191859b2079..d3ac00c47d15 100644 --- a/testdata/val_faildnskey_ok.rpl +++ b/testdata/val_faildnskey_ok.rpl @@ -7,6 +7,7 @@ server: target-fetch-policy: "0 0 0 0 0" fake-sha1: yes trust-anchor-signaling: no + minimal-responses: no stub-zone: name: "." diff --git a/testdata/val_keyprefetch_verify.rpl b/testdata/val_keyprefetch_verify.rpl index f55bd7945fe5..f2050fb7fe13 100644 --- a/testdata/val_keyprefetch_verify.rpl +++ b/testdata/val_keyprefetch_verify.rpl @@ -9,6 +9,7 @@ server: prefetch: yes fake-sha1: yes trust-anchor-signaling: no + minimal-responses: no stub-zone: name: "." diff --git a/testdata/val_noadwhennodo.rpl b/testdata/val_noadwhennodo.rpl index c4b9afd75053..46e1bad5a60d 100644 --- a/testdata/val_noadwhennodo.rpl +++ b/testdata/val_noadwhennodo.rpl @@ -7,6 +7,7 @@ server: qname-minimisation: "no" fake-sha1: yes trust-anchor-signaling: no + minimal-responses: no stub-zone: name: "." diff --git a/testdata/val_nsec3_b3_optout.rpl b/testdata/val_nsec3_b3_optout.rpl index 41e2e38933f7..0b0569201e5f 100644 --- a/testdata/val_nsec3_b3_optout.rpl +++ b/testdata/val_nsec3_b3_optout.rpl @@ -6,6 +6,7 @@ server: qname-minimisation: "no" fake-sha1: yes trust-anchor-signaling: no + minimal-responses: no stub-zone: name: "." diff --git a/testdata/val_nsec3_b3_optout_negcache.rpl b/testdata/val_nsec3_b3_optout_negcache.rpl index e2897e53ffa4..f8ef6f87df90 100644 --- a/testdata/val_nsec3_b3_optout_negcache.rpl +++ b/testdata/val_nsec3_b3_optout_negcache.rpl @@ -6,6 +6,7 @@ server: qname-minimisation: "no" fake-sha1: yes trust-anchor-signaling: no + minimal-responses: no stub-zone: name: "." diff --git a/testdata/val_positive.rpl b/testdata/val_positive.rpl index bef91f6df650..daaf36089c09 100644 --- a/testdata/val_positive.rpl +++ b/testdata/val_positive.rpl @@ -7,6 +7,7 @@ server: qname-minimisation: "no" fake-sha1: yes trust-anchor-signaling: no + minimal-responses: no stub-zone: name: "." diff --git a/testdata/val_qds_badanc.rpl b/testdata/val_qds_badanc.rpl index 5c9f75660d7b..dc686153f406 100644 --- a/testdata/val_qds_badanc.rpl +++ b/testdata/val_qds_badanc.rpl @@ -6,6 +6,7 @@ server: target-fetch-policy: "0 0 0 0 0" qname-minimisation: "no" fake-sha1: yes + minimal-responses: no stub-zone: name: "." diff --git a/testdata/val_qds_oneanc.rpl b/testdata/val_qds_oneanc.rpl index c742cfad3d8b..f21ab422b47a 100644 --- a/testdata/val_qds_oneanc.rpl +++ b/testdata/val_qds_oneanc.rpl @@ -7,6 +7,7 @@ server: qname-minimisation: "no" fake-sha1: yes trust-anchor-signaling: no + minimal-responses: no stub-zone: name: "." diff --git a/testdata/val_qds_twoanc.rpl b/testdata/val_qds_twoanc.rpl index dc66388f82d6..4e4f2e732b64 100644 --- a/testdata/val_qds_twoanc.rpl +++ b/testdata/val_qds_twoanc.rpl @@ -8,6 +8,7 @@ server: qname-minimisation: "no" fake-sha1: yes trust-anchor-signaling: no + minimal-responses: no stub-zone: name: "." diff --git a/testdata/val_referd.rpl b/testdata/val_referd.rpl index dfc82e1cfd22..d475f835eb20 100644 --- a/testdata/val_referd.rpl +++ b/testdata/val_referd.rpl @@ -9,6 +9,7 @@ server: qname-minimisation: "no" fake-sha1: yes trust-anchor-signaling: no + minimal-responses: no stub-zone: name: "." diff --git a/testdata/val_referglue.rpl b/testdata/val_referglue.rpl index a9714d1c8040..dd7e7de91b25 100644 --- a/testdata/val_referglue.rpl +++ b/testdata/val_referglue.rpl @@ -9,6 +9,7 @@ server: qname-minimisation: "no" fake-sha1: yes trust-anchor-signaling: no + minimal-responses: no stub-zone: name: "." diff --git a/testdata/val_rrsig.rpl b/testdata/val_rrsig.rpl index d9684e497e45..0b672e0f2cba 100644 --- a/testdata/val_rrsig.rpl +++ b/testdata/val_rrsig.rpl @@ -6,6 +6,7 @@ server: target-fetch-policy: "0 0 0 0 0" qname-minimisation: "no" fake-sha1: yes + minimal-responses: no stub-zone: name: "." diff --git a/testdata/val_spurious_ns.rpl b/testdata/val_spurious_ns.rpl index 0f9d8431007a..cb0a6e529987 100644 --- a/testdata/val_spurious_ns.rpl +++ b/testdata/val_spurious_ns.rpl @@ -7,6 +7,7 @@ server: qname-minimisation: "no" fake-sha1: yes trust-anchor-signaling: no + minimal-responses: no stub-zone: name: "." diff --git a/testdata/val_stub_noroot.rpl b/testdata/val_stub_noroot.rpl index 07fb0e376e05..4235bcc5213b 100644 --- a/testdata/val_stub_noroot.rpl +++ b/testdata/val_stub_noroot.rpl @@ -7,6 +7,7 @@ server: dlv-anchor: "dlv.isc.org. IN DNSKEY 257 3 5 AQPQ41chR9DEHt/aIzIFAqanbDlRflJoRs5yz1jFsoRIT7dWf0r+PeDuewdxkszNH6wnU4QL8pfKFRh5PIYVBLK3" fake-sha1: yes trust-anchor-signaling: no + minimal-responses: no stub-zone: name: "." diff --git a/testdata/val_ta_algo_dnskey.rpl b/testdata/val_ta_algo_dnskey.rpl index a1f1ed5d0a22..03bac83aaa43 100644 --- a/testdata/val_ta_algo_dnskey.rpl +++ b/testdata/val_ta_algo_dnskey.rpl @@ -8,6 +8,7 @@ server: qname-minimisation: "no" fake-sha1: yes trust-anchor-signaling: no + minimal-responses: no stub-zone: name: "." diff --git a/testdata/val_ta_algo_dnskey_dp.rpl b/testdata/val_ta_algo_dnskey_dp.rpl index 1dd48bfb27e0..2b3609be8e19 100644 --- a/testdata/val_ta_algo_dnskey_dp.rpl +++ b/testdata/val_ta_algo_dnskey_dp.rpl @@ -9,6 +9,7 @@ server: harden-algo-downgrade: no fake-sha1: yes trust-anchor-signaling: no + minimal-responses: no stub-zone: name: "." diff --git a/testdata/val_ta_algo_missing_dp.rpl b/testdata/val_ta_algo_missing_dp.rpl index 4709407ed050..dc55a09da44a 100644 --- a/testdata/val_ta_algo_missing_dp.rpl +++ b/testdata/val_ta_algo_missing_dp.rpl @@ -10,6 +10,7 @@ server: harden-algo-downgrade: no fake-sha1: yes trust-anchor-signaling: no + minimal-responses: no stub-zone: name: "." diff --git a/testdata/val_twocname.rpl b/testdata/val_twocname.rpl index 6756787b9bfc..d8e8cf3165da 100644 --- a/testdata/val_twocname.rpl +++ b/testdata/val_twocname.rpl @@ -4,6 +4,7 @@ server: val-override-date: "20091116100204" fake-sha1: yes trust-anchor-signaling: no + minimal-responses: no forward-zone: name: "." diff --git a/testdata/val_unalgo_anchor.rpl b/testdata/val_unalgo_anchor.rpl index 24dcbaf92a75..fbbf288a5ff1 100644 --- a/testdata/val_unalgo_anchor.rpl +++ b/testdata/val_unalgo_anchor.rpl @@ -6,6 +6,7 @@ server: target-fetch-policy: "0 0 0 0 0" qname-minimisation: "no" fake-sha1: yes + minimal-responses: no stub-zone: name: "." diff --git a/testdata/val_unalgo_dlv.rpl b/testdata/val_unalgo_dlv.rpl index e78226fc8094..142beae8d10b 100644 --- a/testdata/val_unalgo_dlv.rpl +++ b/testdata/val_unalgo_dlv.rpl @@ -7,6 +7,7 @@ server: qname-minimisation: "no" fake-sha1: yes trust-anchor-signaling: no + minimal-responses: no stub-zone: name: "." diff --git a/testdata/val_wild_pos.rpl b/testdata/val_wild_pos.rpl index 2fc3847e8065..624d8e07bf92 100644 --- a/testdata/val_wild_pos.rpl +++ b/testdata/val_wild_pos.rpl @@ -7,6 +7,7 @@ server: qname-minimisation: "no" fake-sha1: yes trust-anchor-signaling: no + minimal-responses: no stub-zone: name: "." diff --git a/testdata/views.rpl b/testdata/views.rpl index 5573cd83cfaf..6a9052fbe2cd 100644 --- a/testdata/views.rpl +++ b/testdata/views.rpl @@ -2,6 +2,7 @@ server: target-fetch-policy: "0 0 0 0 0" qname-minimisation: "no" + minimal-responses: no access-control: 10.10.10.0/24 allow access-control-view: 10.10.10.10/32 "view1" |