- For #1175, update serve-expired tests.

diff --git a/doc/Changelog b/doc/Changelog
index 65533799bb33cca99c739b0827900ef102bacaf0..0403e0c109d091f819bdd386a80ee5bf2f70c199 100644 (file)
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -2,6 +2,7 @@
        - Fix #1175: serve-expired does not adhere to secure-by-default
          principle. The default value of serve-expired-client-timeout
          is set to 1800 as suggested by RFC8767.
+       - For #1175, update serve-expired tests.
 
 20 November 2024: Yorgos
        - Fix comparison to help static analyzer.

diff --git a/testdata/cachedb_expired.crpl b/testdata/cachedb_expired.crpl
index 9f9ff677c6d19e5b137148c1d0ce96910f73168e..d3bf06fe1a1b2fce38b3c0cb0b0f7b3e9d5ca7d8 100644 (file)
--- a/testdata/cachedb_expired.crpl
+++ b/testdata/cachedb_expired.crpl
@@ -4,6 +4,7 @@ server:
        qname-minimisation: no
        minimal-responses: no
        serve-expired: yes
+       serve-expired-client-timeout: 0
        module-config: "cachedb iterator"
 
 cachedb:

diff --git a/testdata/cachedb_expired_reply_ttl.crpl b/testdata/cachedb_expired_reply_ttl.crpl
index b5f34050594efc7688a8f1627430cd266165a801..03fd01add476f7fe302a3203672e754e10f1b0bf 100644 (file)
--- a/testdata/cachedb_expired_reply_ttl.crpl
+++ b/testdata/cachedb_expired_reply_ttl.crpl
@@ -4,6 +4,7 @@ server:
        qname-minimisation: no
        minimal-responses: no
        serve-expired: yes
+       serve-expired-client-timeout: 0
        serve-expired-reply-ttl: 30
        module-config: "cachedb iterator"
 

diff --git a/testdata/cachedb_servfail_cname.crpl b/testdata/cachedb_servfail_cname.crpl
index 221f00d4df54ee877ad66ba9df81b5b07255636d..99b3d51f91357647a7be365466107ebb5821e40f 100644 (file)
--- a/testdata/cachedb_servfail_cname.crpl
+++ b/testdata/cachedb_servfail_cname.crpl
@@ -3,7 +3,7 @@ server:
        target-fetch-policy: "0 0 0 0 0"
        qname-minimisation: no
        minimal-responses: no
-       ;serve-expired: yes
+       serve-expired: no
        module-config: "cachedb iterator"
 
 cachedb:

diff --git a/testdata/cachedb_val_expired.crpl b/testdata/cachedb_val_expired.crpl
index 4a51e82723794b8d26266ff899cdd479e5ca2ed5..741445ce851541d4969927217694a867ec05a47a 100644 (file)
--- a/testdata/cachedb_val_expired.crpl
+++ b/testdata/cachedb_val_expired.crpl
@@ -4,6 +4,7 @@ server:
        qname-minimisation: no
        minimal-responses: yes
        serve-expired: yes
+       serve-expired-client-timeout: 0
        ;module-config: "subnetcache validator cachedb iterator"
        module-config: "validator cachedb iterator"
 

diff --git a/testdata/dnstap.tdir/dnstap.conf b/testdata/dnstap.tdir/dnstap.conf
index fc382ccfd4e0a7d41a3096ad28757861f4ec0db7..b5497bfebe86af5789247095c869d3ed52d9ae34 100644 (file)
--- a/testdata/dnstap.tdir/dnstap.conf
+++ b/testdata/dnstap.tdir/dnstap.conf
@@ -12,8 +12,9 @@ server:
        do-not-query-localhost: no
        local-zone: "example.net." redirect
        local-data: "example.net. IN A 10.20.30.41"
-        serve-expired: yes
-        serve-expired-reply-ttl: 30
+       serve-expired: yes
+       serve-expired-client-timeout: 0
+       serve-expired-reply-ttl: 30
 remote-control:
        control-enable: yes
        control-interface: 127.0.0.1

diff --git a/testdata/fwd_0ttlservfail.rpl b/testdata/fwd_0ttlservfail.rpl
index ed912c73bf2ffc004f056212839e713c1c9b0630..d50d386d4137d2e4021edb626b877edfa7d0e257 100644 (file)
--- a/testdata/fwd_0ttlservfail.rpl
+++ b/testdata/fwd_0ttlservfail.rpl
@@ -2,6 +2,7 @@
 ; config options go here.
 server:
        serve-expired: yes
+       serve-expired-client-timeout: 0
        prefetch: yes
 forward-zone: name: "." forward-addr: 216.0.0.1
 CONFIG_END

diff --git a/testdata/serve_expired.rpl b/testdata/serve_expired.rpl
index 3f61019fa89f8db8e0049730b472e99ff4d4fa36..990a562c7191ac657dbeeb8e1c49c525ad1a110a 100644 (file)
--- a/testdata/serve_expired.rpl
+++ b/testdata/serve_expired.rpl
@@ -4,6 +4,7 @@ server:
        qname-minimisation: "no"
        minimal-responses: no
        serve-expired: yes
+       serve-expired-client-timeout: 0
        access-control: 127.0.0.1/32 allow_snoop
        ede: yes
        ede-serve-expired: yes

diff --git a/testdata/serve_expired_0ttl_nodata.rpl b/testdata/serve_expired_0ttl_nodata.rpl
index 7f1b5a565853290617df9fe79bfd9fde84f37c8a..032706f2320403821c706f3e767fb2fae79201aa 100644 (file)
--- a/testdata/serve_expired_0ttl_nodata.rpl
+++ b/testdata/serve_expired_0ttl_nodata.rpl
@@ -4,6 +4,7 @@ server:
        qname-minimisation: "no"
        minimal-responses: no
        serve-expired: yes
+       serve-expired-client-timeout: 0
        log-servfail: yes
        ede: yes
        ede-serve-expired: yes

diff --git a/testdata/serve_expired_0ttl_nxdomain.rpl b/testdata/serve_expired_0ttl_nxdomain.rpl
index 4adb4b839a693d8ef130e1957358d4c63dce2dcb..1467526588cc95d86d982daf27b49753ad8ae6f4 100644 (file)
--- a/testdata/serve_expired_0ttl_nxdomain.rpl
+++ b/testdata/serve_expired_0ttl_nxdomain.rpl
@@ -4,6 +4,7 @@ server:
        qname-minimisation: "no"
        minimal-responses: no
        serve-expired: yes
+       serve-expired-client-timeout: 0
        log-servfail: yes
        ede: yes
        ede-serve-expired: yes

diff --git a/testdata/serve_expired_0ttl_servfail.rpl b/testdata/serve_expired_0ttl_servfail.rpl
index 6833af17b82784c61957a3be83a645fca395950f..a3bf826fe5941dcfc4490e2448de30054a79cc96 100644 (file)
--- a/testdata/serve_expired_0ttl_servfail.rpl
+++ b/testdata/serve_expired_0ttl_servfail.rpl
@@ -4,6 +4,7 @@ server:
        qname-minimisation: "no"
        minimal-responses: no
        serve-expired: yes
+       serve-expired-client-timeout: 0
        log-servfail: yes
        ede: yes
        ede-serve-expired: yes

diff --git a/testdata/serve_expired_cached_servfail.rpl b/testdata/serve_expired_cached_servfail.rpl
index edec7447940f48e67da61b38eae440eefd5ad3aa..3fd7dd274a26c7adcdfac7250362e9b7b7453305 100644 (file)
--- a/testdata/serve_expired_cached_servfail.rpl
+++ b/testdata/serve_expired_cached_servfail.rpl
@@ -4,6 +4,7 @@ server:
        qname-minimisation: "no"
        minimal-responses: no
        serve-expired: yes
+       serve-expired-client-timeout: 0
        serve-expired-reply-ttl: 123
        log-servfail: yes
        ede: yes

diff --git a/testdata/serve_expired_cached_servfail_refresh.rpl b/testdata/serve_expired_cached_servfail_refresh.rpl
index 4d14dd948ffb5f829a6f45215f05e61d993a5bcb..6ad73efa41a81f68dd4e341edbe42bf809a52231 100644 (file)
--- a/testdata/serve_expired_cached_servfail_refresh.rpl
+++ b/testdata/serve_expired_cached_servfail_refresh.rpl
@@ -4,6 +4,7 @@ server:
        qname-minimisation: "no"
        minimal-responses: no
        serve-expired: yes
+       serve-expired-client-timeout: 0
        serve-expired-reply-ttl: 123
        log-servfail: yes
        ede: yes

diff --git a/testdata/serve_expired_reply_ttl.rpl b/testdata/serve_expired_reply_ttl.rpl
index 124fb874df0ee7bcf3588b4ed2573c00a0ac1410..e76976bde07dd649ea2cf84519c26a151165a5c7 100644 (file)
--- a/testdata/serve_expired_reply_ttl.rpl
+++ b/testdata/serve_expired_reply_ttl.rpl
@@ -5,6 +5,7 @@ server:
        minimal-responses: no
        serve-expired: yes
        serve-expired-reply-ttl: 123
+       serve-expired-client-timeout: 0
        ede: yes
        ede-serve-expired: yes
 

diff --git a/testdata/serve_expired_ttl.rpl b/testdata/serve_expired_ttl.rpl
index df4ecb89d48a452414c08b86895cbf8d5b30f75c..66acbdcf1fe102fac3a5afac8c277a6d573ae899 100644 (file)
--- a/testdata/serve_expired_ttl.rpl
+++ b/testdata/serve_expired_ttl.rpl
@@ -4,6 +4,7 @@ server:
        qname-minimisation: "no"
        minimal-responses: no
        serve-expired: yes
+       serve-expired-client-timeout: 0
        serve-expired-ttl: 10
 
 stub-zone:

diff --git a/testdata/serve_expired_ttl_reset.rpl b/testdata/serve_expired_ttl_reset.rpl
index 521d5a0f04cab6cc273dff7a3360cc5a9c17e9fd..faedb1cfc0a3b51a1c0945ec5558a14ea7816825 100644 (file)
--- a/testdata/serve_expired_ttl_reset.rpl
+++ b/testdata/serve_expired_ttl_reset.rpl
@@ -4,6 +4,7 @@ server:
     serve-expired-ttl: 1
     serve-expired-ttl-reset: yes
     serve-expired-reply-ttl: 123
+    serve-expired-client-timeout: 0
     ede: yes
     ede-serve-expired: yes
 forward-zone: name: "." forward-addr: 216.0.0.1

diff --git a/testdata/serve_expired_val_bogus.rpl b/testdata/serve_expired_val_bogus.rpl
index 49afcc0eb56847d4002a2b206bbdeb8090768371..6c28aa9a66ab719790c4bdf431ee7a93088a38a5 100644 (file)
--- a/testdata/serve_expired_val_bogus.rpl
+++ b/testdata/serve_expired_val_bogus.rpl
@@ -10,6 +10,7 @@ server:
        minimal-responses: no
 
        serve-expired: yes
+       serve-expired-client-timeout: 0
        serve-expired-reply-ttl: 123
        ede: yes
        ede-serve-expired: yes

diff --git a/testdata/serve_expired_zerottl.rpl b/testdata/serve_expired_zerottl.rpl
index 0239b4a194406634ac5b9052277730e4d647e736..1411cb8e77a588161fb5ad3491399bd6d786cdec 100644 (file)
--- a/testdata/serve_expired_zerottl.rpl
+++ b/testdata/serve_expired_zerottl.rpl
@@ -4,6 +4,7 @@ server:
        qname-minimisation: "no"
        minimal-responses: no
        serve-expired: yes
+       serve-expired-client-timeout: 0
        serve-expired-reply-ttl: 123
        ede: yes
        ede-serve-expired: yes

diff --git a/testdata/serve_original_ttl.rpl b/testdata/serve_original_ttl.rpl
index 24d01b6fee1e12d6ac9974f6cec0401c460811f8..30503c285ccd677044ad5fcd8ca99adde4391de5 100644 (file)
--- a/testdata/serve_original_ttl.rpl
+++ b/testdata/serve_original_ttl.rpl
@@ -8,6 +8,7 @@ server:
        cache-max-ttl: 1000
        cache-min-ttl: 20
        serve-expired: yes
+       serve-expired-client-timeout: 0
        serve-expired-reply-ttl: 123
        ede: yes
        ede-serve-expired: yes

diff --git a/testdata/stat_values.tdir/stat_values.conf b/testdata/stat_values.tdir/stat_values.conf
index 7886f19bcd46db20bb29753010fabe5800f4ac6a..d1adff58c1ddccd12680c5941d9a7b44d91a27a1 100644 (file)
--- a/testdata/stat_values.tdir/stat_values.conf
+++ b/testdata/stat_values.tdir/stat_values.conf
@@ -14,6 +14,7 @@ server:
        outbound-msg-retry: 0
        root-key-sentinel: no
        trust-anchor-signaling: no
+       serve-expired-client-timeout: 0
 
        local-zone: local.zone static
        local-data: "www.local.zone A 192.0.2.1"

diff --git a/testdata/subnet_cached_servfail.crpl b/testdata/subnet_cached_servfail.crpl
index 9c746d579124e149019f736f40906e10bb65a4d4..f1a66159c4ee2adbc50989511e73af3fcb981683 100644 (file)
--- a/testdata/subnet_cached_servfail.crpl
+++ b/testdata/subnet_cached_servfail.crpl
@@ -12,6 +12,7 @@ server:
        qname-minimisation: no
        minimal-responses: no
        serve-expired: yes
+       serve-expired-client-timeout: 0
        prefetch: yes
 
 stub-zone:

diff --git a/testdata/subnet_global_prefetch_always_forward.crpl b/testdata/subnet_global_prefetch_always_forward.crpl
index ccfe5dfd6ea14efdcb7dcfb284d3de75dd7b33f2..775474cbcfeb27011d837caf46400b65e1f46417 100644 (file)
--- a/testdata/subnet_global_prefetch_always_forward.crpl
+++ b/testdata/subnet_global_prefetch_always_forward.crpl
@@ -6,6 +6,7 @@ server:
        trust-anchor-signaling: no
        target-fetch-policy: "0 0 0 0 0"
        serve-expired: yes
+       serve-expired-client-timeout: 0
        client-subnet-always-forward: yes
        module-config: "subnetcache iterator"
        verbosity: 3

diff --git a/testdata/subnet_global_prefetch_expired.crpl b/testdata/subnet_global_prefetch_expired.crpl
index de1b780553a941fb1f23ef30f607f124b596a16f..374bf3e693aa7d4c61d4e5e99f65e35c288d057b 100644 (file)
--- a/testdata/subnet_global_prefetch_expired.crpl
+++ b/testdata/subnet_global_prefetch_expired.crpl
@@ -14,6 +14,7 @@ server:
        qname-minimisation: no
        minimal-responses: no
        serve-expired: yes
+       serve-expired-client-timeout: 0
        serve-expired-ttl: 1
        prefetch: yes