Skip to content

Commit a37760d

Browse files
wcawijngaardswcawijngaards
committed
- Test for the multiple transfer failure, xfr_over_notify.
1 parent bf8200f commit a37760d

12 files changed

+334
-0
lines changed

‎doc/ChangeLog

+1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
26 March 2025: Wouter
22
- Fix multiple zone transfers in one reload so that xfrd does not
33
check the update as failed and restart the transfer.
4+
- Test for the multiple transfer failure, xfr_over_notify.
45

56
25 March 2025: Wouter
67
- Fix to please sanitizer for ixfr store of data in cancelled state.

‎tpkg/xfr_over_notify.tdir/xfr_over_notify.conf

+27
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
server:
2+
logfile: "/dev/stderr"
3+
xfrdfile: xfrd.state
4+
zonesdir: ""
5+
username: ""
6+
chroot: ""
7+
pidfile: nsd.pid
8+
zonelistfile: "zone.list"
9+
interface: 127.0.0.1
10+
xfrd-reload-timeout: 1
11+
12+
# verifier to delay zone reload
13+
verify:
14+
enable: yes
15+
port: VERIFY_PORT
16+
verifier: "./verifier.sh"
17+
18+
zone:
19+
name: example.net
20+
zonefile: xfr_over_notify.zone
21+
request-xfr: AXFR 127.0.0.1@LDNS_PORT NOKEY
22+
allow-notify: 127.0.0.1 NOKEY
23+
allow-notify: ::1 NOKEY
24+
allow-notify: ::ffff:127.0.0.1 NOKEY
25+
provide-xfr: 127.0.0.1 NOKEY
26+
provide-xfr: ::1 NOKEY
27+
provide-xfr: ::ffff:127.0.0.1 NOKEY

‎tpkg/xfr_over_notify.tdir/xfr_over_notify.datafile

+21
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
$ORIGIN example.net.
2+
$TTL 7200
3+
4+
ENTRY_BEGIN
5+
MATCH opcode qtype qname
6+
REPLY QUERY NOERROR AA AD
7+
ADJUST copy_id ; ’copy_id’ copies the ID from the query to the answer.
8+
9+
SECTION QUESTION
10+
example.net. IN AXFR
11+
SECTION ANSWER
12+
13+
; This reply indicates the currently hosted serial
14+
example.net. IN SOA nibbler.example.net. leela.example.net. 1 3600 3600 3600 3600
15+
unmodified IN A 8.8.8.7
16+
unmodified IN A 8.8.8.6
17+
unmodified IN TXT "this entry has not been modified"
18+
example.net. IN SOA nibbler.example.net. leela.example.net. 1 3600 3600 3600 3600
19+
SECTION AUTHORITY
20+
SECTION ADDITIONAL
21+
ENTRY_END

‎tpkg/xfr_over_notify.tdir/xfr_over_notify.datafile2

+34
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
$ORIGIN example.net.
2+
$TTL 7200
3+
4+
ENTRY_BEGIN
5+
; first give MATCH lines, that say what queries are matched
6+
; by this entry.
7+
; ’opcode’ makes the query match the opcode from the reply
8+
; if you leave it out, any opcode matches this entry.
9+
; ’qtype’ makes the query match the qtype from the reply
10+
; ’qname’ makes the query match the qname from the reply
11+
; ’serial=1023’ makes the query match if ixfr serial is 1023.
12+
MATCH opcode qtype qname
13+
14+
; Then the REPLY header is specified.
15+
REPLY QUERY
16+
REPLY NOERROR
17+
REPLY AA AD
18+
19+
; any additional actions to do.
20+
ADJUST copy_id ; ’copy_id’ copies the ID from the query to the answer.
21+
22+
SECTION QUESTION
23+
example.net. IN AXFR
24+
SECTION ANSWER
25+
example.net. IN SOA nibbler.example.net. leela.example.net. 4 3600 3600 3600 3600
26+
new IN A 1.2.3.4
27+
unmodified IN A 8.8.8.7
28+
unmodified IN A 8.8.8.6
29+
unmodified IN TXT "this entry has not been modified"
30+
example.net. IN SOA nibbler.example.net. leela.example.net. 4 3600 3600 3600 3600
31+
SECTION AUTHORITY
32+
SECTION ADDITIONAL
33+
ENTRY_END
34+

‎tpkg/xfr_over_notify.tdir/xfr_over_notify.datafile3

+35
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
$ORIGIN example.net.
2+
$TTL 7200
3+
4+
ENTRY_BEGIN
5+
; first give MATCH lines, that say what queries are matched
6+
; by this entry.
7+
; ’opcode’ makes the query match the opcode from the reply
8+
; if you leave it out, any opcode matches this entry.
9+
; ’qtype’ makes the query match the qtype from the reply
10+
; ’qname’ makes the query match the qname from the reply
11+
; ’serial=1023’ makes the query match if ixfr serial is 1023.
12+
MATCH opcode qtype qname
13+
14+
; Then the REPLY header is specified.
15+
REPLY QUERY
16+
REPLY NOERROR
17+
REPLY AA AD
18+
19+
; any additional actions to do.
20+
ADJUST copy_id ; ’copy_id’ copies the ID from the query to the answer.
21+
22+
SECTION QUESTION
23+
example.net. IN AXFR
24+
SECTION ANSWER
25+
example.net. IN SOA nibbler.example.net. leela.example.net. 5 3600 3600 3600 3600
26+
new IN A 1.2.3.4
27+
new5 IN A 1.2.3.5
28+
unmodified IN A 8.8.8.7
29+
unmodified IN A 8.8.8.6
30+
unmodified IN TXT "this entry has not been modified"
31+
example.net. IN SOA nibbler.example.net. leela.example.net. 5 3600 3600 3600 3600
32+
SECTION AUTHORITY
33+
SECTION ADDITIONAL
34+
ENTRY_END
35+

‎tpkg/xfr_over_notify.tdir/xfr_over_notify.datafile4

+36
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
$ORIGIN example.net.
2+
$TTL 7200
3+
4+
ENTRY_BEGIN
5+
; first give MATCH lines, that say what queries are matched
6+
; by this entry.
7+
; ’opcode’ makes the query match the opcode from the reply
8+
; if you leave it out, any opcode matches this entry.
9+
; ’qtype’ makes the query match the qtype from the reply
10+
; ’qname’ makes the query match the qname from the reply
11+
; ’serial=1023’ makes the query match if ixfr serial is 1023.
12+
MATCH opcode qtype qname
13+
14+
; Then the REPLY header is specified.
15+
REPLY QUERY
16+
REPLY NOERROR
17+
REPLY AA AD
18+
19+
; any additional actions to do.
20+
ADJUST copy_id ; ’copy_id’ copies the ID from the query to the answer.
21+
22+
SECTION QUESTION
23+
example.net. IN AXFR
24+
SECTION ANSWER
25+
example.net. IN SOA nibbler.example.net. leela.example.net. 6 3600 3600 3600 3600
26+
new IN A 1.2.3.4
27+
new5 IN A 1.2.3.5
28+
new6 IN A 1.2.3.6
29+
unmodified IN A 8.8.8.7
30+
unmodified IN A 8.8.8.6
31+
unmodified IN TXT "this entry has not been modified"
32+
example.net. IN SOA nibbler.example.net. leela.example.net. 6 3600 3600 3600 3600
33+
SECTION AUTHORITY
34+
SECTION ADDITIONAL
35+
ENTRY_END
36+

‎tpkg/xfr_over_notify.tdir/xfr_over_notify.dsc

+16
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
BaseName: xfr_over_notify
2+
Version: 1.0
3+
Description: Test for zone transfer that fetches serial newer than the notify.
4+
CreationDate: Wed Mar 26 10:00:00 CET 2025
5+
Maintainer: Wouter Wijngaards
6+
Category:
7+
Component:
8+
CmdDepends:
9+
Depends:
10+
Help:
11+
Pre: xfr_over_notify.pre
12+
Post: xfr_over_notify.post
13+
Test: xfr_over_notify.test
14+
AuxFiles: xfr_over_notify.conf, xfr_over_notify.zone, xfr_over_notify.datafile
15+
Passed:
16+
Failure:

‎tpkg/xfr_over_notify.tdir/xfr_over_notify.post

+13
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
# #-- xfr_over_notify.post --#
2+
# source the master var file when it's there
3+
[ -f ../.tpkg.var.master ] && source ../.tpkg.var.master
4+
# source the test var file when it's there
5+
[ -f .tpkg.var.test ] && source .tpkg.var.test
6+
. ../common.sh
7+
8+
# do your teardown here
9+
kill_from_pidfile testns.pid
10+
kill_from_pidfile nsd.pid
11+
12+
cat testns.log
13+
cat nsd.log

‎tpkg/xfr_over_notify.tdir/xfr_over_notify.pre

+37
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
# #-- xfr_over_notify.pre--#
2+
# source the master var file when it's there
3+
[ -f ../.tpkg.var.master ] && source ../.tpkg.var.master
4+
# use .tpkg.var.test for in test variable passing
5+
[ -f .tpkg.var.test ] && source .tpkg.var.test
6+
PRE="../.."
7+
. ../common.sh
8+
9+
# start NSD
10+
get_random_port 3
11+
LDNS_PORT=$RND_PORT
12+
NSD_PORT=`expr $RND_PORT + 1`
13+
VERIFY_PORT=`expr $RND_PORT + 2`
14+
echo ldns-testns-port: $LDNS_PORT
15+
echo nsd-port: $NSD_PORT
16+
17+
cp xfr_over_notify.verifier.sh verifier.sh
18+
chmod +x verifier.sh
19+
20+
# start ldns-testns, be extra verbose
21+
ldns-testns -p $LDNS_PORT xfr_over_notify.datafile >testns.log 2>&1 &
22+
echo "$!" > testns.pid
23+
wait_ldns_testns_up testns.log
24+
25+
# share the vars
26+
echo "export LDNS_PORT=$LDNS_PORT" >> .tpkg.var.test
27+
echo "export NSD_PORT=$NSD_PORT" >> .tpkg.var.test
28+
echo "export VERIFY_PORT=$VERIFY_PORT" >> .tpkg.var.test
29+
30+
# replace PORT with $LDNS_PORT and put it in nsd_update.conf
31+
cat xfr_over_notify.conf | sed -e "s/VERIFY_PORT/$VERIFY_PORT/g" -e "s/LDNS_PORT/$LDNS_PORT/g" > nsd.conf
32+
if [[ $? -ne 0 ]]; then
33+
exit 1
34+
fi
35+
TPKG_NSD="$PRE/nsd"
36+
$TPKG_NSD -c nsd.conf -p $NSD_PORT -d -V 3 2>&1 | tee nsd.log &
37+
wait_nsd_up nsd.log

‎tpkg/xfr_over_notify.tdir/xfr_over_notify.test

+96
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,96 @@
1+
# #-- xfr_over_notify.test --#
2+
# source the master var file when it's there
3+
[ -f ../.tpkg.var.master ] && source ../.tpkg.var.master
4+
# use .tpkg.var.test for in test variable passing
5+
[ -f .tpkg.var.test ] && source .tpkg.var.test
6+
. ../common.sh
7+
8+
# Wait for NSD to test the upstream and wait on SOA timer.
9+
# this is a dbeug message, from xfrd
10+
#wait_logfile nsd.log "zone example.net got update indicating current serial" 10
11+
#instead, wait a bit.
12+
sleep 4
13+
14+
# At the start the serial is 1.
15+
dig -4 @127.0.0.1 -p $NSD_PORT example.net SOA | tee output
16+
if grep "1 3600" output; then
17+
echo "OK"
18+
else
19+
echo "wrong serial at start"
20+
exit 1
21+
fi
22+
23+
# change upstream serial
24+
echo "> kill ldns-testns"
25+
kill_from_pidfile testns.pid
26+
cat testns.log
27+
echo "> start ldns-testns"
28+
ldns-testns -p $LDNS_PORT xfr_over_notify.datafile2 >testns.log 2>&1 &
29+
echo "$!" > testns.pid
30+
wait_ldns_testns_up testns.log
31+
32+
# notify an older serial than the upstream has already got
33+
# but that serial is newer than what NSD has.
34+
ldns-notify -z example.net -p $NSD_PORT -s 2 127.0.0.1
35+
36+
# The AXFR happens for serial 4.
37+
# Wait for the verifier during the reload to pause
38+
wait_logfile nsd.log "verifier: verifier script: delay" 20
39+
40+
# change upstream serial
41+
echo "> kill ldns-testns"
42+
kill_from_pidfile testns.pid
43+
cat testns.log
44+
echo "> start ldns-testns 3"
45+
ldns-testns -p $LDNS_PORT xfr_over_notify.datafile3 >testns.log 2>&1 &
46+
echo "$!" > testns.pid
47+
wait_ldns_testns_up testns.log
48+
49+
# Reload is delayed by a couple seconds. Add some more updates in sequence.
50+
sleep 1
51+
ldns-notify -z example.net -p $NSD_PORT -s 5 127.0.0.1
52+
53+
# change upstream serial
54+
echo "> kill ldns-testns"
55+
kill_from_pidfile testns.pid
56+
cat testns.log
57+
echo "> start ldns-testns 4"
58+
ldns-testns -p $LDNS_PORT xfr_over_notify.datafile4 >testns.log 2>&1 &
59+
echo "$!" > testns.pid
60+
wait_ldns_testns_up testns.log
61+
62+
sleep 1
63+
ldns-notify -z example.net -p $NSD_PORT -s 6 127.0.0.1
64+
65+
wait_logfile nsd.log "verifier: verifier script: delay done" 20
66+
67+
# The verify script is done, the reload exits and NSD processes the
68+
# update from 1 to 4 and the queued zone transfers.
69+
70+
wait_logfile nsd.log "zone example.net serial 1 is updated to 4" 20
71+
# during the reload it logs the two updates:
72+
wait_logfile nsd.log "zone example.net. received update to serial 5" 20
73+
wait_logfile nsd.log "zone example.net. received update to serial 6" 20
74+
# reload is done
75+
wait_logfile nsd.log "zone example.net serial 4 is updated to 6" 20
76+
77+
# If it now has the log message:
78+
# "error: xfrd: zone example.net: soa serial 5 update failed, restarting transfer (notified zone)"
79+
# then if has failed because of the two updates bunched up to reload.
80+
81+
sleep 1
82+
if grep "update failed, restarting transfer" nsd.log; then
83+
echo "The reload update has failed and xfrd restarts the transfer"
84+
exit 1
85+
fi
86+
87+
# Check serial.
88+
dig -4 @127.0.0.1 -p $NSD_PORT example.net SOA | tee output
89+
if grep "6 3600" output; then
90+
echo "OK"
91+
else
92+
echo "wrong serial"
93+
exit 1
94+
fi
95+
96+
exit 0

‎tpkg/xfr_over_notify.tdir/xfr_over_notify.verifier.sh

+11
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
#!/bin/sh
2+
3+
if test -f verify_run.once; then
4+
echo "verifier script, no delay"
5+
else
6+
echo "verifier script: delay"
7+
sleep 10
8+
touch verify_run.once
9+
echo "verifier script: delay done"
10+
fi
11+
exit 0

‎tpkg/xfr_over_notify.tdir/xfr_over_notify.zone

+7
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
$TTL 4D
2+
$ORIGIN example.net.
3+
example.net. IN SOA nibbler.example.net. leela.example.net. 1 3600 3600 3600 3600
4+
5+
unmodified IN A 8.8.8.7
6+
unmodified IN A 8.8.8.6
7+
unmodified IN TXT "this entry has not been modified"

0 commit comments

Comments
 (0)