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

- Fix stat_values test to work with dig that enables DNS cookies.

Browse source
This commit is contained in:
W.C.A. Wijngaards 2023-08-18 13:39:27 +02:00
parent 8756ad63dd
commit 083770cb39
2 changed files with 20 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
doc/Changelog
View file

@ -2,6 +2,7 @@
- Fix for iter_dec_attempts that could cause a hang, part of - Fix for iter_dec_attempts that could cause a hang, part of
capsforid and qname minimisation, depending on the settings. capsforid and qname minimisation, depending on the settings.
- Fix uninitialized memory passed in padding bytes of cmsg to sendmsg. - Fix uninitialized memory passed in padding bytes of cmsg to sendmsg.
- Fix stat_values test to work with dig that enables DNS cookies.
17 August 2023: Wouter 17 August 2023: Wouter
- Merge PR #762: Downstream DNS Server Cookies a la RFC7873 and - Merge PR #762: Downstream DNS Server Cookies a la RFC7873 and

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

@ -52,6 +52,12 @@ REST_STATS_FILE=rest_stats.$$
DEBUG=0 DEBUG=0
if dig -h 2>&1 | grep "cookie" >/dev/null; then
nocookie="+nocookie"
else
nocookie=""
fi
# Write stats to $STATS_FILE. # Write stats to $STATS_FILE.
# Call this when you want to get stats from unbound. # Call this when you want to get stats from unbound.
get_stats () { get_stats () {
@ -416,6 +422,9 @@ infra.cache.count=2"
# Bring the downstream DNS Cookies configured Unbound up # Bring the downstream DNS Cookies configured Unbound up
kill_pid $UNBOUND_PID # kill current Unbound kill_pid $UNBOUND_PID # kill current Unbound
echo ""
cat unbound.log
echo ""
$PRE/unbound -d -c ub_downstream_cookies.conf >unbound.log 2>&1 & $PRE/unbound -d -c ub_downstream_cookies.conf >unbound.log 2>&1 &
UNBOUND_PID=$! UNBOUND_PID=$!
echo "UNBOUND_PID=$UNBOUND_PID" >> .tpkg.var.test echo "UNBOUND_PID=$UNBOUND_PID" >> .tpkg.var.test
@ -423,8 +432,8 @@ wait_unbound_up unbound.log
echo echo
echo "[ Get a DNS Cookie. ]" echo "[ Get a DNS Cookie. ]"
echo "> dig www.local.zone +tcp +ednsopt=10:0102030405060708" echo "> dig www.local.zone +tcp $nocookie +ednsopt=10:0102030405060708"
dig @127.0.0.1 -p $UNBOUND_PORT +tcp +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"
if grep "192.0.2.1" outfile; then if grep "192.0.2.1" outfile; then
echo "OK" echo "OK"
@ -449,8 +458,8 @@ num.answer.rcode.NOERROR=1"
echo echo
echo "[ Present the valid DNS Cookie. ]" echo "[ Present the valid DNS Cookie. ]"
echo "> dig www.local.zone +ednsopt=10:valid_cookie" echo "> dig www.local.zone $nocookie +ednsopt=10:valid_cookie"
dig @127.0.0.1 -p $UNBOUND_PORT +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"
if grep "192.0.2.1" outfile; then if grep "192.0.2.1" outfile; then
echo "OK" echo "OK"
@ -471,8 +480,8 @@ num.answer.rcode.NOERROR=1"
echo echo
echo "[ Present an invalid DNS Cookie. ]" echo "[ Present an invalid DNS Cookie. ]"
echo "> dig www.local.zone +ednsopt=10:invalid_cookie" echo "> dig www.local.zone $nocookie +ednsopt=10:invalid_cookie"
dig @127.0.0.1 -p $UNBOUND_PORT +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"
if grep "192.0.2.1" outfile; then if grep "192.0.2.1" outfile; then
end 1 end 1
@ -491,7 +500,7 @@ num.answer.rcode.YXRRSET=1"
echo echo
echo "[ Present no DNS Cookie. ]" echo "[ 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 +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"
if grep "192.0.2.1" outfile; then if grep "192.0.2.1" outfile; then
end 1 end 1
@ -509,6 +518,9 @@ if test x$USE_CACHEDB = "x1"; then
# Bring the cachedb configured Unbound up # Bring the cachedb configured Unbound up
kill_pid $UNBOUND_PID # kill current Unbound kill_pid $UNBOUND_PID # kill current Unbound
echo ""
cat unbound.log
echo ""
$PRE/unbound -d -c ub_cachedb.conf >unbound.log 2>&1 & $PRE/unbound -d -c ub_cachedb.conf >unbound.log 2>&1 &
UNBOUND_PID=$! UNBOUND_PID=$!
echo "UNBOUND_PID=$UNBOUND_PID" >> .tpkg.var.test echo "UNBOUND_PID=$UNBOUND_PID" >> .tpkg.var.test