- For #1193, introduce log-servfail.tdir and cleanup the log-servfail

  setting from other tests.

diff --git a/testdata/iter_failreply.rpl b/testdata/iter_failreply.rpl
index 393714196d89cf9ffabb570e9b312b75f2eff83e..e8ad4dd26e31090aa66f31c495e1751b36ce04c6 100644 (file)
--- a/testdata/iter_failreply.rpl
+++ b/testdata/iter_failreply.rpl
@@ -3,7 +3,6 @@ server:
        target-fetch-policy: "0 0 0 0 0"
        qname-minimisation: "no"
        minimal-responses: no
-       log-servfail: yes
 
 stub-zone:
        name: "."

diff --git a/testdata/iter_scrub_rr_length.rpl b/testdata/iter_scrub_rr_length.rpl
index 2ef73c2fe152c720a318c5f06c5bdeed8366564d..ee7579f9c246f2a6993c44c7bdf72dca4fc84422 100644 (file)
--- a/testdata/iter_scrub_rr_length.rpl
+++ b/testdata/iter_scrub_rr_length.rpl
@@ -5,7 +5,6 @@ server:
        minimal-responses: no
        rrset-roundrobin: no
        ede: yes
-       log-servfail: yes
 
 stub-zone:
        name: "."

diff --git a/testdata/log_servfail.tdir/log_servfail.conf b/testdata/log_servfail.tdir/log_servfail.conf
new file mode 100644 (file)
index 0000000..2d7c34e
--- /dev/null
+++ b/testdata/log_servfail.tdir/log_servfail.conf
@@ -0,0 +1,27 @@
+server:
+       verbosity: 0
+       use-syslog: no
+       directory: ""
+       pidfile: "unbound.pid"
+       chroot: ""
+       username: ""
+       do-not-query-localhost: no
+       use-caps-for-id: no
+       port: @SERVER_PORT@
+       interface: 127.0.0.1
+       outbound-msg-retry: 0
+
+        log-servfail: yes
+
+forward-zone:
+       name: "a.servfail"
+       forward-addr: 127.0.0.1@@SERVER_PORT@
+
+forward-zone:
+       name: "b.servfail"
+       forward-addr: 127.0.0.1@@SERVER_PORT@
+
+remote-control:
+       control-enable: yes
+       control-port: @CONTROL_PORT@
+       control-use-cert: no

diff --git a/testdata/log_servfail.tdir/log_servfail.dsc b/testdata/log_servfail.tdir/log_servfail.dsc
new file mode 100644 (file)
index 0000000..cf4f455
--- /dev/null
+++ b/testdata/log_servfail.tdir/log_servfail.dsc
@@ -0,0 +1,16 @@
+BaseName: log_servfail
+Version: 1.0
+Description: Check the log_servfail option
+CreationDate: Fri 29 Nov 11:00:00 CEST 2024
+Maintainer:
+Category:
+Component:
+CmdDepends:
+Depends:
+Help:
+Pre: log_servfail.pre
+Post: log_servfail.post
+Test: log_servfail.test
+AuxFiles:
+Passed:
+Failure:

diff --git a/testdata/log_servfail.tdir/log_servfail.post b/testdata/log_servfail.tdir/log_servfail.post
new file mode 100644 (file)
index 0000000..a7bd0e8
--- /dev/null
+++ b/testdata/log_servfail.tdir/log_servfail.post
@@ -0,0 +1,10 @@
+# #-- log_servfail.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_from_pidfile "unbound.pid"
+cat unbound.log

diff --git a/testdata/log_servfail.tdir/log_servfail.pre b/testdata/log_servfail.tdir/log_servfail.pre
new file mode 100644 (file)
index 0000000..5405948
--- /dev/null
+++ b/testdata/log_servfail.tdir/log_servfail.pre
@@ -0,0 +1,21 @@
+# #-- log_servfail.pre--#
+PRE="../.."
+. ../common.sh
+
+get_random_port 2
+SERVER_PORT=$RND_PORT
+CONTROL_PORT=$(($RND_PORT + 1))
+echo "SERVER_PORT=$SERVER_PORT" >> .tpkg.var.test
+echo "CONTROL_PORT=$CONTROL_PORT" >> .tpkg.var.test
+
+# make config file
+sed \
+       -e 's/@SERVER_PORT\@/'$SERVER_PORT'/' \
+       -e 's/@CONTROL_PORT\@/'$CONTROL_PORT'/' \
+       < log_servfail.conf > ub.conf
+
+# start unbound in the background
+$PRE/unbound -d -c ub.conf > unbound.log 2>&1 &
+
+cat .tpkg.var.test
+wait_unbound_up unbound.log

diff --git a/testdata/log_servfail.tdir/log_servfail.test b/testdata/log_servfail.tdir/log_servfail.test
new file mode 100644 (file)
index 0000000..a6156ba
--- /dev/null
+++ b/testdata/log_servfail.tdir/log_servfail.test
@@ -0,0 +1,47 @@
+# #-- cookie_file.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
+PRE="../.."
+. ../common.sh
+
+outfile=dig.out
+
+teststep "Check if log-servfail logs to output for iterator error"
+dig a.servfail @127.0.0.1 -p $SERVER_PORT > $outfile
+if ! grep "SERVFAIL" $outfile
+then
+       cat $outfile
+       echo "Did not get a SERVFAIL response"
+       exit 1
+fi
+if ! grep "SERVFAIL <a\.servfail\. "  unbound.log
+then
+        echo "No log-servfail in output"
+        exit 1
+fi
+
+teststep "Enable serve expired"
+$PRE/unbound-control -c ub.conf set_option serve-expired: yes
+if test $? -ne 0
+then
+       echo "unbound-control command exited with non-zero error code"
+       exit 1
+fi
+
+teststep "Check if log-servfail logs to output for iterator error (with serve-expired)"
+dig b.servfail @127.0.0.1 -p $SERVER_PORT > $outfile
+if ! grep "SERVFAIL" $outfile
+then
+       cat $outfile
+       echo "Did not get a SERVFAIL response"
+       exit 1
+fi
+if ! grep "SERVFAIL <b\.servfail\. "  unbound.log
+then
+        echo "No log-servfail in output"
+        exit 1
+fi
+
+exit 0

diff --git a/testdata/rpz_val_block.rpl b/testdata/rpz_val_block.rpl
index acde15294adb07f2d961d5b0e8c1adb601a7607e..d2cd897e09e7b85b3da5a205488697ea902c201f 100644 (file)
--- a/testdata/rpz_val_block.rpl
+++ b/testdata/rpz_val_block.rpl
@@ -6,7 +6,6 @@ server:
        trust-anchor: "org. DS 1444 8 2 5224fb17d630a2e3efdc863a05a4032c5db415b5de3f32472ee9abed42e10146"
        val-override-date: "20070916134226"
        trust-anchor-signaling: no
-       log-servfail: yes
        val-log-level: 2
        ede: yes
 

diff --git a/testdata/serve_expired_0ttl_nodata.rpl b/testdata/serve_expired_0ttl_nodata.rpl
index 032706f2320403821c706f3e767fb2fae79201aa..8ca461be2c7b38b289a56f8cda6c6abebb05a8fb 100644 (file)
--- a/testdata/serve_expired_0ttl_nodata.rpl
+++ b/testdata/serve_expired_0ttl_nodata.rpl
@@ -5,7 +5,6 @@ server:
        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 1467526588cc95d86d982daf27b49753ad8ae6f4..7cf26aedda0a27458542448758ec2f244da5f81e 100644 (file)
--- a/testdata/serve_expired_0ttl_nxdomain.rpl
+++ b/testdata/serve_expired_0ttl_nxdomain.rpl
@@ -5,7 +5,6 @@ server:
        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 a3bf826fe5941dcfc4490e2448de30054a79cc96..e9d4c4884e9f15fe478fba66149d26f05bc1d1a8 100644 (file)
--- a/testdata/serve_expired_0ttl_servfail.rpl
+++ b/testdata/serve_expired_0ttl_servfail.rpl
@@ -5,7 +5,6 @@ server:
        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 3fd7dd274a26c7adcdfac7250362e9b7b7453305..eb115816ec1d908ef65ecc7e34cd466214693751 100644 (file)
--- a/testdata/serve_expired_cached_servfail.rpl
+++ b/testdata/serve_expired_cached_servfail.rpl
@@ -6,7 +6,6 @@ server:
        serve-expired: yes
        serve-expired-client-timeout: 0
        serve-expired-reply-ttl: 123
-       log-servfail: yes
        ede: yes
        ede-serve-expired: yes
 

diff --git a/testdata/serve_expired_cached_servfail_refresh.rpl b/testdata/serve_expired_cached_servfail_refresh.rpl
index 6ad73efa41a81f68dd4e341edbe42bf809a52231..63277f25f15e8d94964b8e4bded00bc8e6147b15 100644 (file)
--- a/testdata/serve_expired_cached_servfail_refresh.rpl
+++ b/testdata/serve_expired_cached_servfail_refresh.rpl
@@ -6,7 +6,6 @@ server:
        serve-expired: yes
        serve-expired-client-timeout: 0
        serve-expired-reply-ttl: 123
-       log-servfail: yes
        ede: yes
        ede-serve-expired: yes
 

diff --git a/testdata/serve_expired_client_timeout_servfail.rpl b/testdata/serve_expired_client_timeout_servfail.rpl
index cea216d4c60fb074cd54b623ca990f669f20fb6b..13d03da6c5d9dd4a3f21fa67bd99050dfb4fad50 100644 (file)
--- a/testdata/serve_expired_client_timeout_servfail.rpl
+++ b/testdata/serve_expired_client_timeout_servfail.rpl
@@ -6,7 +6,6 @@ server:
        serve-expired: yes
        serve-expired-client-timeout: 1
        serve-expired-reply-ttl: 123
-       log-servfail: yes
        ede: yes
        ede-serve-expired: yes
 

diff --git a/testdata/val_failure_dnskey.rpl b/testdata/val_failure_dnskey.rpl
index 3f25f15b20622a99defcdbd1cf12a8d31bcfa198..c5f1af2ff34926e901a01c61d4c1f93b86773578 100644 (file)
--- a/testdata/val_failure_dnskey.rpl
+++ b/testdata/val_failure_dnskey.rpl
@@ -9,7 +9,6 @@ server:
        fake-sha1: yes
        trust-anchor-signaling: no
        minimal-responses: no
-       log-servfail: yes
        val-log-level: 2
        ede: yes
 

diff --git a/testdata/val_scrub_rr_length.rpl b/testdata/val_scrub_rr_length.rpl
index 0219b918e4212a7908fa101939f78bb224450394..f83157ff04c3eda7dcabae5cf0c8424796d06cf5 100644 (file)
--- a/testdata/val_scrub_rr_length.rpl
+++ b/testdata/val_scrub_rr_length.rpl
@@ -9,7 +9,6 @@ server:
        minimal-responses: no
        rrset-roundrobin: no
        ede: yes
-       log-servfail: yes
 
 stub-zone:
        name: "."