Commit d72f659a authored by Mark Andrews's avatar Mark Andrews

add test for 'provide-ixfr no;' ; add forensics support

(cherry picked from commit d547465a)
parent 8b8f0dc1
......@@ -12,10 +12,11 @@
rm -f ns1/*.db ns1/*.jnl
rm -f ns3/*.jnl ns3/mytest.db ns3/subtest.db
rm -f ns4/*.jnl ns4/*.db
rm -f ns5/*.jnl ns5/*.db
rm -f */named.memstats
rm -f */named.conf
rm -f */named.run
rm -f */ans.run
rm -f dig.out dig.out1 dig.out2 dig.out3
rm -f dig.out.test* dig.out1.test* dig.out2.test* dig.out3.test*
rm -f ns3/large.db
rm -f ns*/named.lock
......@@ -18,7 +18,9 @@ test. 15 IN SOA ns1.test. hostmaster.test. (
)
IN NS ns1.test.
IN NS ns2.test.
IN NS ns5.test.
ns1 IN A 10.53.0.3
ns2 IN A 10.53.0.4
ns5 IN A 10.53.0.5
host1 IN A 192.168.10.3
host2 IN A 192.168.10.4
......@@ -18,7 +18,9 @@ test. 15 IN SOA ns1.test. hostmaster.test. (
)
IN NS ns1.test.
IN NS ns2.test.
IN NS ns5.test.
ns1 IN A 10.53.0.3
ns2 IN A 10.53.0.4
ns5 IN A 10.53.0.5
host1 IN A 192.168.10.13
host2 IN A 192.168.10.4
......@@ -18,7 +18,9 @@ test. 15 IN SOA ns1.test. hostmaster.test. (
)
IN NS ns1.test.
IN NS ns2.test.
IN NS ns5.test.
ns1 IN A 10.53.0.3
ns2 IN A 10.53.0.4
ns5 IN A 10.53.0.5
host1 IN A 192.168.10.13
host2 IN A 192.168.10.14
/*
* Copyright (C) Internet Systems Consortium, Inc. ("ISC")
*
* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*
* See the COPYRIGHT file distributed with this work for additional
* information regarding copyright ownership.
*/
options {
query-source address 10.53.0.5;
notify-source 10.53.0.5;
transfer-source 10.53.0.5;
port @PORT@;
pid-file "named.pid";
listen-on { 10.53.0.5; };
listen-on-v6 { none; };
recursion no;
notify yes;
provide-ixfr no;
};
key rndc_key {
secret "1234abcd8765";
algorithm hmac-sha256;
};
controls {
inet 10.53.0.5 port @CONTROLPORT@ allow { any; } keys { rndc_key; };
};
view "primary" {
ixfr-from-differences yes;
request-ixfr yes;
zone "test" IN {
type slave;
file "mytest.db";
masters { 10.53.0.3; };
};
zone "sub.test" IN {
type slave;
file "subtest.db";
request-ixfr no;
masters { 10.53.0.3; };
};
};
......@@ -39,6 +39,7 @@ EOF
copy_setports ns3/named.conf.in ns3/named.conf
copy_setports ns4/named.conf.in ns4/named.conf
copy_setports ns5/named.conf.in ns5/named.conf
# Setup initial db files for ns3
cp ns3/mytest0.db ns3/mytest.db
......
......@@ -19,12 +19,14 @@ SYSTEMTESTTOP=..
. $SYSTEMTESTTOP/conf.sh
status=0
n=0
DIGOPTS="+tcp +noadd +nosea +nostat +noquest +nocomm +nocmd -p ${PORT}"
SENDCMD="$PERL ../send.pl 10.53.0.2 ${EXTRAPORT1}"
RNDCCMD="$RNDC -p ${CONTROLPORT} -c ../common/rndc.conf -s"
echo_i "testing initial AXFR"
n=`expr $n + 1`
echo_i "testing initial AXFR ($n)"
$SENDCMD <<EOF
/SOA/
......@@ -58,8 +60,8 @@ $RNDCCMD 10.53.0.1 reload | sed 's/^/ns1 /' | cat_i
for i in 0 1 2 3 4 5 6 7 8 9
do
$DIG $DIGOPTS @10.53.0.1 nil. SOA > dig.out
grep "SOA" dig.out > /dev/null && break
$DIG $DIGOPTS @10.53.0.1 nil. SOA > dig.out.test$n
grep "SOA" dig.out.test$n > /dev/null && break
sleep 1
done
......@@ -68,7 +70,8 @@ $DIG $DIGOPTS @10.53.0.1 nil. TXT | grep 'initial AXFR' >/dev/null || {
status=1
}
echo_i "testing successful IXFR"
n=`expr $n + 1`
echo_i "testing successful IXFR ($n)"
# We change the IP address of a.nil., and the TXT record at the apex.
# Then we do a SOA-only update.
......@@ -100,7 +103,8 @@ $DIG $DIGOPTS @10.53.0.1 nil. TXT | grep 'successful IXFR' >/dev/null || {
status=1
}
echo_i "testing AXFR fallback after IXFR failure"
n=`expr $n + 1`
echo_i "testing AXFR fallback after IXFR failure ($n)"
# Provide a broken IXFR response and a working fallback AXFR response
......@@ -134,7 +138,8 @@ $DIG $DIGOPTS @10.53.0.1 nil. TXT | grep 'fallback AXFR' >/dev/null || {
status=1
}
echo_i "testing ixfr-from-differences option"
n=`expr $n + 1`
echo_i "testing ixfr-from-differences option ($n)"
# ns3 is master; ns4 is slave
$CHECKZONE test. ns3/mytest.db > /dev/null 2>&1
if [ $? -ne 0 ]
......@@ -150,8 +155,8 @@ fi
# wait for slave to be stable
for i in 0 1 2 3 4 5 6 7 8 9
do
$DIG $DIGOPTS +tcp @10.53.0.4 SOA test > dig.out
grep -i "hostmaster\.test\..1" dig.out > /dev/null && break
$DIG $DIGOPTS +tcp @10.53.0.4 SOA test > dig.out.test$n
grep -i "hostmaster\.test\..1" dig.out.test$n > /dev/null && break
sleep 1
done
......@@ -162,16 +167,16 @@ $RNDCCMD 10.53.0.3 reload | sed 's/^/ns3 /' | cat_i
#wait for master to reload load
for i in 0 1 2 3 4 5 6 7 8 9
do
$DIG $DIGOPTS +tcp @10.53.0.3 SOA test > dig.out
grep -i "hostmaster\.test\..2" dig.out > /dev/null && break
$DIG $DIGOPTS +tcp @10.53.0.3 SOA test > dig.out.test$n
grep -i "hostmaster\.test\..2" dig.out.test$n > /dev/null && break
sleep 1
done
#wait for slave to transfer zone
for i in 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14
do
$DIG $DIGOPTS +tcp @10.53.0.4 SOA test > dig.out
grep -i "hostmaster\.test\..2" dig.out > /dev/null && break
$DIG $DIGOPTS +tcp @10.53.0.4 SOA test > dig.out.test$n
grep -i "hostmaster\.test\..2" dig.out.test$n > /dev/null && break
# re-notify if we've been waiting a long time
if [ $i -ge 5 ]; then
......@@ -194,7 +199,8 @@ then
status=1
fi
echo_i "testing request-ixfr option in view vs zone"
n=`expr $n + 1`
echo_i "testing request-ixfr option in view vs zone ($n)"
# There's a view with 2 zones. In the view, "request-ixfr yes"
# but in the zone "sub.test", request-ixfr no"
# we want to make sure that a change to sub.test results in AXFR, while
......@@ -207,16 +213,16 @@ $RNDCCMD 10.53.0.3 reload | sed 's/^/ns3 /' | cat_i
#wait for master to reload zone
for i in 0 1 2 3 4 5 6 7 8 9
do
$DIG $DIGOPTS +tcp @10.53.0.3 SOA sub.test > dig.out
grep -i "hostmaster\.test\..3" dig.out > /dev/null && break
$DIG $DIGOPTS +tcp @10.53.0.3 SOA sub.test > dig.out.test$n
grep -i "hostmaster\.test\..3" dig.out.test$n > /dev/null && break
sleep 1
done
#wait for slave to transfer zone
for i in 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14
do
$DIG $DIGOPTS +tcp @10.53.0.4 SOA sub.test > dig.out
grep -i "hostmaster\.test\..3" dig.out > /dev/null && break
$DIG $DIGOPTS +tcp @10.53.0.4 SOA sub.test > dig.out.test$n
grep -i "hostmaster\.test\..3" dig.out.test$n > /dev/null && break
# re-notify if we've been waiting a long time
if [ $i -ge 5 ]; then
......@@ -247,16 +253,16 @@ $RNDCCMD 10.53.0.3 reload | sed 's/^/ns3 /' | cat_i
# wait for master to reload zone
for i in 0 1 2 3 4 5 6 7 8 9
do
$DIG +tcp -p 5300 @10.53.0.3 SOA test > dig.out
grep -i "hostmaster\.test\..4" dig.out > /dev/null && break
$DIG +tcp -p 5300 @10.53.0.3 SOA test > dig.out.test$n
grep -i "hostmaster\.test\..4" dig.out.test$n > /dev/null && break
sleep 1
done
# wait for slave to transfer zone
for i in 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14
do
$DIG $DIGOPTS +tcp @10.53.0.4 SOA test > dig.out
grep -i "hostmaster\.test\..4" dig.out > /dev/null && break
$DIG $DIGOPTS +tcp @10.53.0.4 SOA test > dig.out.test$n
grep -i "hostmaster\.test\..4" dig.out.test$n > /dev/null && break
# re-notify if we've been waiting a long time
if [ $i -ge 5 ]; then
......@@ -279,29 +285,58 @@ else
echo_i " success: IXFR it was"
fi
echo_i "testing DiG's handling of a multi message AXFR style IXFR response"
n=`expr $n + 1`
echo_i "testing DiG's handling of a multi message AXFR style IXFR response ($n)"
(
(sleep 10 && kill $$) 2>/dev/null &
sub=$!
$DIG -p ${PORT} ixfr=0 large @10.53.0.3 > dig.out
$DIG -p ${PORT} ixfr=0 large @10.53.0.3 > dig.out.test$n
kill $sub
)
lines=`grep hostmaster.large dig.out | wc -l`
lines=`grep hostmaster.large dig.out.test$n | wc -l`
test ${lines:-0} -eq 2 || { echo_i "failed"; status=1; }
messages=`sed -n 's/^;;.*messages \([0-9]*\),.*/\1/p' dig.out`
messages=`sed -n 's/^;;.*messages \([0-9]*\),.*/\1/p' dig.out.test$n`
test ${messages:-0} -gt 1 || { echo_i "failed"; status=1; }
echo_i "test 'dig +notcp ixfr=<value>' vs 'dig ixfr=<value> +notcp' vs 'dig ixfr=<value>'"
n=`expr $n + 1`
echo_i "test 'dig +notcp ixfr=<value>' vs 'dig ixfr=<value> +notcp' vs 'dig ixfr=<value>' ($n)"
ret=0
# Should be "switch to TCP" response
$DIG $DIGOPTS +notcp ixfr=1 test @10.53.0.4 > dig.out1 || ret=1
$DIG $DIGOPTS ixfr=1 +notcp test @10.53.0.4 > dig.out2 || ret=1
digcomp dig.out1 dig.out2 || ret=1
awk '$4 == "SOA" { soacnt++} END {if (soacnt == 1) exit(0); else exit(1);}' dig.out1 || ret=1
awk '$4 == "SOA" { if ($7 == 4) exit(0); else exit(1);}' dig.out1 || ret=1
$DIG $DIGOPTS +notcp ixfr=1 test @10.53.0.4 > dig.out1.test$n || ret=1
$DIG $DIGOPTS ixfr=1 +notcp test @10.53.0.4 > dig.out2.test$n || ret=1
digcomp dig.out1.test$n dig.out2.test$n || ret=1
awk '$4 == "SOA" { soacnt++} END {if (soacnt == 1) exit(0); else exit(1);}' dig.out1.test$n || ret=1
awk '$4 == "SOA" { if ($7 == 4) exit(0); else exit(1);}' dig.out1.test$n || ret=1
# Should be incremental transfer.
$DIG $DIGOPTS ixfr=1 test @10.53.0.4 > dig.out3 || ret=1
awk '$4 == "SOA" { soacnt++} END { if (soacnt == 6) exit(0); else exit(1);}' dig.out3 || ret=1
$DIG $DIGOPTS ixfr=1 test @10.53.0.4 > dig.out3.test$n || ret=1
awk '$4 == "SOA" { soacnt++} END { if (soacnt == 6) exit(0); else exit(1);}' dig.out3.test$n || ret=1
if [ ${ret} != 0 ]; then
echo_i "failed";
status=1;
fi
# wait for slave to transfer zone
for i in 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14
do
$DIG $DIGOPTS +tcp @10.53.0.5 SOA test > dig.out.test$n
grep -i "hostmaster\.test\..4" dig.out.test$n > /dev/null && break
# re-notify if we've been waiting a long time
if [ $i -ge 5 ]; then
$RNDCCMD 10.53.0.3 notify test | set 's/^/ns3 /' | cat_i
fi
sleep 1
done
n=`expr $n + 1`
echo_i "test 'provide-ixfr no;' ($n)"
ret=0
# Should be "AXFR style" response
$DIG $DIGOPTS ixfr=1 test @10.53.0.5 > dig.out1.test$n || ret=1
# Should be "switch to TCP" response
$DIG $DIGOPTS ixfr=1 +notcp test @10.53.0.5 > dig.out2.test$n || ret=1
awk '$4 == "SOA" { soacnt++} END {if (soacnt == 2) exit(0); else exit(1);}' dig.out1.test$n || ret=1
awk '$4 == "SOA" { soacnt++} END {if (soacnt == 1) exit(0); else exit(1);}' dig.out2.test$n || ret=1
if [ ${ret} != 0 ]; then
echo_i "failed";
status=1;
......
......@@ -1523,6 +1523,7 @@
./bin/tests/system/ixfr/ns3/subtest0.db ZONE 2011,2016,2018,2019
./bin/tests/system/ixfr/ns3/subtest1.db ZONE 2011,2016,2018,2019
./bin/tests/system/ixfr/ns4/named.conf.in CONF-C 2018,2019
./bin/tests/system/ixfr/ns5/named.conf.in CONF-C 2019
./bin/tests/system/ixfr/prereq.sh SH 2001,2004,2007,2012,2014,2016,2018,2019
./bin/tests/system/ixfr/setup.sh SH 2001,2004,2007,2011,2012,2013,2014,2016,2018,2019
./bin/tests/system/ixfr/tests.sh SH 2001,2004,2007,2011,2012,2014,2016,2018,2019
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment