upstream/unbound
1
0
Fork 0
mirror of https://github.com/NLnetLabs/unbound.git synced 2025-12-20 23:00:56 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

- Add test case for #1159.

Browse source 
- Some clean up for stat_values.test.
This commit is contained in:
Yorgos Thessalonikefs 2024-11-01 15:57:52 +01:00
parent d23523e528
commit 8a6a4bd7f3
7 changed files with 145 additions and 65 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
doc/Changelog
View file

@ -1,5 +1,7 @@
1 November 2024: Yorgos 1 November 2024: Yorgos
- Merge #1159: Stats for discard-timeout and wait-limit. - Merge #1159: Stats for discard-timeout and wait-limit.
- Add test case for #1159.
- Some clean up for stat_values.test.
25 October 2024: Yorgos 25 October 2024: Yorgos
- Fix #1163: Typos in unbound.conf documentation. - Fix #1163: Typos in unbound.conf documentation.

10
testdata/stat_values.tdir/stat_values.conf vendored
View file

@ -26,9 +26,9 @@ remote-control:
server-cert-file: "unbound_server.pem" server-cert-file: "unbound_server.pem"
control-key-file: "unbound_control.key" control-key-file: "unbound_control.key"
control-cert-file: "unbound_control.pem" control-cert-file: "unbound_control.pem"
forward-zone: stub-zone:
name: "." name: "example.com."
forward-addr: "127.0.0.1@@TOPORT@" stub-addr: "127.0.0.1@@TOPORT@"
forward-zone: stub-zone:
name: "expired." name: "expired."
forward-addr: "127.0.0.1@@EXPIREDPORT@" stub-addr: "127.0.0.1@@EXPIREDPORT@"

1
testdata/stat_values.tdir/stat_values.pre vendored
View file

@ -38,6 +38,7 @@ echo "FWD_EXPIRED_PID=$FWD_EXPIRED_PID" >> .tpkg.var.test
sed -e 's/@PORT\@/'$UNBOUND_PORT'/' -e 's/@TOPORT\@/'$FWD_PORT'/' -e 's/@EXPIREDPORT\@/'$FWD_EXPIRED_PORT'/' -e 's/@CONTROL_PORT\@/'$CONTROL_PORT'/' < stat_values.conf > ub.conf sed -e 's/@PORT\@/'$UNBOUND_PORT'/' -e 's/@TOPORT\@/'$FWD_PORT'/' -e 's/@EXPIREDPORT\@/'$FWD_EXPIRED_PORT'/' -e 's/@CONTROL_PORT\@/'$CONTROL_PORT'/' < stat_values.conf > ub.conf
sed -e 's/@PORT\@/'$UNBOUND_PORT'/' -e 's/@TOPORT\@/'$FWD_PORT'/' -e 's/@EXPIREDPORT\@/'$FWD_EXPIRED_PORT'/' -e 's/@CONTROL_PORT\@/'$CONTROL_PORT'/' < stat_values_cachedb.conf > ub_cachedb.conf sed -e 's/@PORT\@/'$UNBOUND_PORT'/' -e 's/@TOPORT\@/'$FWD_PORT'/' -e 's/@EXPIREDPORT\@/'$FWD_EXPIRED_PORT'/' -e 's/@CONTROL_PORT\@/'$CONTROL_PORT'/' < stat_values_cachedb.conf > ub_cachedb.conf
sed -e 's/@PORT\@/'$UNBOUND_PORT'/' -e 's/@CONTROL_PORT\@/'$CONTROL_PORT'/' < stat_values_downstream_cookies.conf > ub_downstream_cookies.conf sed -e 's/@PORT\@/'$UNBOUND_PORT'/' -e 's/@CONTROL_PORT\@/'$CONTROL_PORT'/' < stat_values_downstream_cookies.conf > ub_downstream_cookies.conf
sed -e 's/@PORT\@/'$UNBOUND_PORT'/' -e 's/@TOPORT\@/'$FWD_PORT'/' -e 's/@CONTROL_PORT\@/'$CONTROL_PORT'/' < stat_values_discard_wait_limit.conf > ub_discard_wait_limit.conf
# start unbound in the background # start unbound in the background
$PRE/unbound -d -c ub.conf >unbound.log 2>&1 & $PRE/unbound -d -c ub.conf >unbound.log 2>&1 &
UNBOUND_PID=$! UNBOUND_PID=$!

139
testdata/stat_values.tdir/stat_values.test vendored
View file

@ -3,7 +3,6 @@
[ -f ../.tpkg.var.master ] && source ../.tpkg.var.master [ -f ../.tpkg.var.master ] && source ../.tpkg.var.master
# use .tpkg.var.test for in test variable passing # use .tpkg.var.test for in test variable passing
[ -f .tpkg.var.test ] && source .tpkg.var.test [ -f .tpkg.var.test ] && source .tpkg.var.test
# We need kill_pid for the serve-expired-client-timeout test
. ../common.sh . ../common.sh
PRE="../.." PRE="../.."
@ -154,6 +153,19 @@ set_ub_option () {
fi fi
} }
# Convenient function to kill current Unbound and bring up one with an alternate configuration.
bring_up_alternate_configuration () {
conf_file=$1
kill_pid $UNBOUND_PID # kill current Unbound
echo ""
cat unbound.log
echo ""
$PRE/unbound -d -c $conf_file >unbound.log 2>&1 &
UNBOUND_PID=$!
echo "UNBOUND_PID=$UNBOUND_PID" >> .tpkg.var.test
wait_unbound_up unbound.log
}
# Convenient function to exit the test. # Convenient function to exit the test.
end () { end () {
echo "> cat logfiles" echo "> cat logfiles"
@ -180,8 +192,8 @@ else
end 1 end 1
fi fi
echo
echo "[ Check initial stats based on first query. ]" teststep "Check initial stats based on first query."
check_stats "\ check_stats "\
total.num.queries=1 total.num.queries=1
total.num.cachemiss=1 total.num.cachemiss=1
@ -198,16 +210,15 @@ rrset.cache.count=1
infra.cache.count=1 infra.cache.count=1
num.answer.rcode.NOERROR=1" num.answer.rcode.NOERROR=1"
echo
echo "[ Check stat reset. ]" teststep "Check stat reset."
check_stats "\ check_stats "\
msg.cache.count=1 msg.cache.count=1
rrset.cache.count=1 rrset.cache.count=1
infra.cache.count=1" infra.cache.count=1"
echo teststep "Enable serve-expired and check."
echo "[ Enable serve-expired and check. ]"
set_ub_option serve-expired yes set_ub_option serve-expired yes
sleep 2 # make sure the TTL has expired. sleep 2 # make sure the TTL has expired.
echo "> dig 1ttl.example.com." echo "> dig 1ttl.example.com."
@ -236,8 +247,7 @@ rrset.cache.count=1
infra.cache.count=1" infra.cache.count=1"
echo teststep "Enable serve-expired-client-timeout and check."
echo "[ Enable serve-expired-client-timeout and check. ]"
set_ub_option serve-expired-client-timeout 1 set_ub_option serve-expired-client-timeout 1
echo "> dig servfail.expired." echo "> dig servfail.expired."
dig @127.0.0.1 -p $UNBOUND_PORT servfail.expired. | tee outfile dig @127.0.0.1 -p $UNBOUND_PORT servfail.expired. | tee outfile
@ -295,8 +305,7 @@ infra.cache.count=2"
set_ub_option serve-expired no set_ub_option serve-expired no
echo teststep "Check REFUSED; try without RD flag."
echo "[ Check REFUSED; try without RD flag. ]"
echo "> dig somethingelse.example.com." echo "> dig somethingelse.example.com."
dig @127.0.0.1 -p $UNBOUND_PORT +nordflag somethingelse.example.com. | tee outfile dig @127.0.0.1 -p $UNBOUND_PORT +nordflag somethingelse.example.com. | tee outfile
echo "> check answer" echo "> check answer"
@ -319,8 +328,7 @@ rrset.cache.count=2
infra.cache.count=2" infra.cache.count=2"
echo teststep "Check the AD flag."
echo "[ Check the AD flag. ]"
echo "> dig www.example.com." echo "> dig www.example.com."
dig @127.0.0.1 -p $UNBOUND_PORT +noadflag www.example.com. | tee outfile dig @127.0.0.1 -p $UNBOUND_PORT +noadflag www.example.com. | tee outfile
echo "> check answer" echo "> check answer"
@ -345,8 +353,8 @@ msg.cache.count=3
rrset.cache.count=3 rrset.cache.count=3
infra.cache.count=2" infra.cache.count=2"
echo
echo "[ Check local zone. ]" teststep "Check local zone."
echo "> dig www.local.zone." echo "> dig www.local.zone."
dig @127.0.0.1 -p $UNBOUND_PORT www.local.zone. | tee outfile dig @127.0.0.1 -p $UNBOUND_PORT www.local.zone. | tee outfile
echo "> check answer" echo "> check answer"
@ -370,8 +378,7 @@ rrset.cache.count=3
infra.cache.count=2" infra.cache.count=2"
echo teststep "Check NXDOMAIN (with local data)."
echo "[ Check NXDOMAIN (with local data). ]"
echo "> dig mail.local.zone." echo "> dig mail.local.zone."
dig @127.0.0.1 -p $UNBOUND_PORT mail.local.zone. | tee outfile dig @127.0.0.1 -p $UNBOUND_PORT mail.local.zone. | tee outfile
echo "> check answer" echo "> check answer"
@ -395,8 +402,7 @@ rrset.cache.count=3
infra.cache.count=2" infra.cache.count=2"
echo teststep "Check CHAOS."
echo "[ Check CHAOS. ]"
echo "> dig id.server. ch txt" echo "> dig id.server. ch txt"
dig @127.0.0.1 -p $UNBOUND_PORT id.server. ch txt | tee outfile dig @127.0.0.1 -p $UNBOUND_PORT id.server. ch txt | tee outfile
echo "> check answer" echo "> check answer"
@ -420,18 +426,50 @@ rrset.cache.count=3
infra.cache.count=2" infra.cache.count=2"
# Bring the downstream DNS Cookies configured Unbound up ###
kill_pid $UNBOUND_PID # kill current Unbound #
echo "" # Bring the discard-timeout, wait-limit configured Unbound up
cat unbound.log #
echo "" bring_up_alternate_configuration ub_discard_wait_limit.conf
$PRE/unbound -d -c ub_downstream_cookies.conf >unbound.log 2>&1 & #
UNBOUND_PID=$! ###
echo "UNBOUND_PID=$UNBOUND_PID" >> .tpkg.var.test
wait_unbound_up unbound.log
echo
echo "[ Get a DNS Cookie. ]" teststep "Check discard-timeout and wait-limit"
echo "> dig www.slow"
dig @127.0.0.1 -p $UNBOUND_PORT +retry=2 +timeout=1 www.slow. | tee outfile
echo "> check answer"
if grep "no servers could be reached" outfile; then
echo "OK"
else
end 1
fi
check_stats "\
infra.cache.count=1
msg.cache.count=1
num.query.class.IN=3
num.query.edns.present=3
num.query.flags.AD=3
num.query.flags.RD=3
num.query.opcode.QUERY=3
num.query.type.A=3
num.query.udpout=1
total.num.cachemiss=3
total.num.queries=3
total.num.queries_discard_timeout=2
total.num.queries_wait_limit=1"
###
#
# Bring the downstream DNS Cookies configured Unbound up
#
bring_up_alternate_configuration ub_downstream_cookies.conf
#
###
teststep "Get a DNS Cookie."
echo "> dig www.local.zone +tcp $nocookie +ednsopt=10:0102030405060708" echo "> dig www.local.zone +tcp $nocookie +ednsopt=10:0102030405060708"
dig @127.0.0.1 -p $UNBOUND_PORT +tcp $nocookie +ednsopt=10:0102030405060708 +retry=0 +time=1 www.local.zone. | tee outfile dig @127.0.0.1 -p $UNBOUND_PORT +tcp $nocookie +ednsopt=10:0102030405060708 +retry=0 +time=1 www.local.zone. | tee outfile
echo "> check answer" echo "> check answer"
@ -456,8 +494,8 @@ num.query.edns.present=1
num.query.tcp=1 num.query.tcp=1
num.answer.rcode.NOERROR=1" num.answer.rcode.NOERROR=1"
echo
echo "[ Present the valid DNS Cookie. ]" teststep "Present the valid DNS Cookie."
echo "> dig www.local.zone $nocookie +ednsopt=10:valid_cookie" echo "> dig www.local.zone $nocookie +ednsopt=10:valid_cookie"
dig @127.0.0.1 -p $UNBOUND_PORT $nocookie +ednsopt=10:$valid_cookie +retry=0 +time=1 www.local.zone. | tee outfile dig @127.0.0.1 -p $UNBOUND_PORT $nocookie +ednsopt=10:$valid_cookie +retry=0 +time=1 www.local.zone. | tee outfile
echo "> check answer" echo "> check answer"
@ -478,8 +516,8 @@ num.query.flags.AD=1
num.query.edns.present=1 num.query.edns.present=1
num.answer.rcode.NOERROR=1" num.answer.rcode.NOERROR=1"
echo
echo "[ Present an invalid DNS Cookie. ]" teststep "Present an invalid DNS Cookie."
echo "> dig www.local.zone $nocookie +ednsopt=10:invalid_cookie" echo "> dig www.local.zone $nocookie +ednsopt=10:invalid_cookie"
dig @127.0.0.1 -p $UNBOUND_PORT $nocookie +ednsopt=10:$invalid_cookie +retry=0 +time=1 www.local.zone. | tee outfile dig @127.0.0.1 -p $UNBOUND_PORT $nocookie +ednsopt=10:$invalid_cookie +retry=0 +time=1 www.local.zone. | tee outfile
echo "> check answer" echo "> check answer"
@ -497,8 +535,8 @@ total.num.queries_cookie_invalid=1
total.num.cachehits=1 total.num.cachehits=1
num.answer.rcode.YXRRSET=1" num.answer.rcode.YXRRSET=1"
echo
echo "[ Present no DNS Cookie. ]" teststep "Present no DNS Cookie."
echo "> dig www.local.zone +ignore" echo "> dig www.local.zone +ignore"
dig @127.0.0.1 -p $UNBOUND_PORT +ignore $nocookie +retry=0 +time=1 www.local.zone. | tee outfile dig @127.0.0.1 -p $UNBOUND_PORT +ignore $nocookie +retry=0 +time=1 www.local.zone. | tee outfile
echo "> check answer" echo "> check answer"
@ -516,18 +554,17 @@ num.answer.rcode.REFUSED=1"
if test x$USE_CACHEDB = "x1"; then if test x$USE_CACHEDB = "x1"; then
# Bring the cachedb configured Unbound up
kill_pid $UNBOUND_PID # kill current Unbound
echo ""
cat unbound.log
echo ""
$PRE/unbound -d -c ub_cachedb.conf >unbound.log 2>&1 &
UNBOUND_PID=$!
echo "UNBOUND_PID=$UNBOUND_PID" >> .tpkg.var.test
wait_unbound_up unbound.log
echo ###
echo "[ Check cachedb cache miss. ]" #
# Bring the cachedb configured Unbound up
#
bring_up_alternate_configuration ub_cachedb.conf
#
###
teststep "Check cachedb cache miss."
echo "> dig www.example.com." echo "> dig www.example.com."
dig @127.0.0.1 +ednsopt=65534 -p $UNBOUND_PORT www.example.com. | tee outfile dig @127.0.0.1 +ednsopt=65534 -p $UNBOUND_PORT www.example.com. | tee outfile
echo "> check answer" echo "> check answer"
@ -554,8 +591,8 @@ rrset.cache.count=1
infra.cache.count=1 infra.cache.count=1
num.answer.rcode.NOERROR=1" num.answer.rcode.NOERROR=1"
echo
echo "[ Check cachedb cache hit. ]" teststep "Check cachedb cache hit."
echo "> dig www.example.com." echo "> dig www.example.com."
dig @127.0.0.1 +ednsopt=65534 -p $UNBOUND_PORT www.example.com. | tee outfile dig @127.0.0.1 +ednsopt=65534 -p $UNBOUND_PORT www.example.com. | tee outfile
echo "> check answer" echo "> check answer"
@ -582,8 +619,8 @@ rrset.cache.count=1
infra.cache.count=1 infra.cache.count=1
num.answer.rcode.NOERROR=1" num.answer.rcode.NOERROR=1"
echo
echo "[ Check cachedb cache hit with stat reset ]" teststep "Check cachedb cache hit with stat reset."
echo "> dig www.example.com." echo "> dig www.example.com."
dig @127.0.0.1 +ednsopt=65534 -p $UNBOUND_PORT www.example.com. | tee outfile dig @127.0.0.1 +ednsopt=65534 -p $UNBOUND_PORT www.example.com. | tee outfile
echo "> check answer" echo "> check answer"

12
testdata/stat_values.tdir/stat_values.testns vendored
View file

@ -31,3 +31,15 @@ SECTION QUESTION
SECTION ANSWER SECTION ANSWER
0ttl 0 IN A 0.0.0.1 0ttl 0 IN A 0.0.0.1
ENTRY_END ENTRY_END
$ORIGIN slow.
ENTRY_BEGIN
MATCH opcode qtype qname
REPLY QR AA NOERROR
ADJUST copy_id sleep=2
SECTION QUESTION
www. IN A
SECTION ANSWER
www. 0 IN A 10.20.30.40
ENTRY_END

12
testdata/stat_values.tdir/stat_values_cachedb.conf vendored
View file

@ -1,7 +1,6 @@
server: server:
verbosity: 5 verbosity: 5
module-config: "cachedb iterator" module-config: "cachedb iterator"
serve-expired: yes
num-threads: 1 num-threads: 1
interface: 127.0.0.1 interface: 127.0.0.1
port: @PORT@ port: @PORT@
@ -17,8 +16,6 @@ server:
root-key-sentinel: no root-key-sentinel: no
trust-anchor-signaling: no trust-anchor-signaling: no
local-zone: local.zone static
local-data: "www.local.zone A 192.0.2.1"
remote-control: remote-control:
control-enable: yes control-enable: yes
control-interface: 127.0.0.1 control-interface: 127.0.0.1
@ -28,9 +25,6 @@ remote-control:
server-cert-file: "unbound_server.pem" server-cert-file: "unbound_server.pem"
control-key-file: "unbound_control.key" control-key-file: "unbound_control.key"
control-cert-file: "unbound_control.pem" control-cert-file: "unbound_control.pem"
forward-zone: stub-zone:
name: "." name: "example.com."
forward-addr: "127.0.0.1@@TOPORT@" stub-addr: "127.0.0.1@@TOPORT@"
forward-zone:
name: "expired."
forward-addr: "127.0.0.1@@EXPIREDPORT@"

34
testdata/stat_values.tdir/stat_values_discard_wait_limit.conf vendored Normal file
View file

@ -0,0 +1,34 @@
server:
verbosity: 5
num-threads: 1
interface: 127.0.0.1
module-config: "validator iterator"
port: @PORT@
use-syslog: no
directory: ""
pidfile: "unbound.pid"
chroot: ""
username: ""
do-not-query-localhost: no
extended-statistics: yes
identity: "stat_values"
outbound-msg-retry: 0
root-key-sentinel: no
trust-anchor-signaling: no
discard-timeout: 800
wait-limit: 1
infra-cache-min-rtt: 3000 # This is for the discard-timeout test
remote-control:
control-enable: yes
control-interface: 127.0.0.1
# control-interface: ::1
control-port: @CONTROL_PORT@
server-key-file: "unbound_server.key"
server-cert-file: "unbound_server.pem"
control-key-file: "unbound_control.key"
control-cert-file: "unbound_control.pem"
stub-zone:
name: "slow."
stub-addr: "127.0.0.1@@TOPORT@"