mirror of
https://github.com/isc-projects/bind9.git
synced 2026-06-13 17:30:00 -04:00
Merge branch '965-delv-prints-weird-ttl-values-2-v9_11' into 'v9_11'
Test that dig and delve print correct TTL values. See merge request isc-projects/bind9!1787
This commit is contained in:
Mark Andrews
commit
377669da45
2 changed files with 62 additions and 3 deletions
2
CHANGES
2
CHANGES
|
|
@ -1,3 +1,5 @@
|
|||
5207. [test] Check delv and dig TTL values. [GL #965]
|
||||
|
||||
5205. [bug] Enforce that a DS hash exists. [GL #899]
|
||||
|
||||
5204. [test] Check that dns_rdata_fromtext() produces a record that
|
||||
|
|
|
|||
|
|
@ -15,7 +15,30 @@ n=0
|
|||
DIGOPTS="-p ${PORT}"
|
||||
SENDCMD="$PERL $SYSTEMTESTTOP/send.pl 10.53.0.4 ${EXTRAPORT1}"
|
||||
|
||||
if [ -x ${DIG} ] ; then
|
||||
# Check if response in file $1 has the correct TTL range.
|
||||
# The response record must have RRtype $2 and class IN (CLASS1).
|
||||
# Maximum TTL is given by $3. This works in most cases where TTL is
|
||||
# the second word on the line. TTL position can be adjusted with
|
||||
# setting the position $4, but that requires updating this function.
|
||||
check_ttl_range() {
|
||||
file=$1
|
||||
pos=$4
|
||||
|
||||
case "$pos" in
|
||||
"3")
|
||||
awk -v rrtype="$2" -v ttl="$3" '($4 == "IN" || $4 == "CLASS1" ) && $5 == rrtype { if ($3 <= ttl) { ok=1 } } END { exit(ok?0:1) }' < $file
|
||||
;;
|
||||
*)
|
||||
awk -v rrtype="$2" -v ttl="$3" '($3 == "IN" || $3 == "CLASS1" ) && $4 == rrtype { if ($2 <= ttl) { ok=1 } } END { exit(ok?0:1) }' < $file
|
||||
;;
|
||||
esac
|
||||
|
||||
result=$?
|
||||
[ $result -eq 0 ] || echo_i "ttl check failed"
|
||||
return $result
|
||||
}
|
||||
|
||||
if [ -x "$DIG" ] ; then
|
||||
n=`expr $n + 1`
|
||||
echo_i "checking dig short form works ($n)"
|
||||
ret=0
|
||||
|
|
@ -29,6 +52,7 @@ if [ -x ${DIG} ] ; then
|
|||
ret=0
|
||||
$DIG $DIGOPTS @10.53.0.3 +split=4 -t sshfp foo.example > dig.out.test$n || ret=1
|
||||
grep " 9ABC DEF6 7890 " < dig.out.test$n > /dev/null || ret=1
|
||||
check_ttl_range dig.out.test$n "SSHFP" 300 || ret=1
|
||||
if [ $ret != 0 ]; then echo_i "failed"; fi
|
||||
status=`expr $status + $ret`
|
||||
|
||||
|
|
@ -37,6 +61,7 @@ if [ -x ${DIG} ] ; then
|
|||
ret=0
|
||||
$DIG $DIGOPTS @10.53.0.3 +unknownformat a a.example > dig.out.test$n || ret=1
|
||||
grep "CLASS1[ ][ ]*TYPE1[ ][ ]*\\\\# 4 0A000001" < dig.out.test$n > /dev/null || ret=1
|
||||
check_ttl_range dig.out.test$n "TYPE1" 300 || ret=1
|
||||
if [ $ret != 0 ]; then echo_i "failed"; fi
|
||||
status=`expr $status + $ret`
|
||||
|
||||
|
|
@ -45,7 +70,8 @@ if [ -x ${DIG} ] ; then
|
|||
ret=0
|
||||
$DIG $DIGOPTS @10.53.0.3 -x 127.0.0.1 > dig.out.test$n 2>&1 || ret=1
|
||||
# doesn't matter if has answer
|
||||
grep -i "127\.in-addr\.arpa\." < dig.out.test$n > /dev/null || ret=1
|
||||
grep -i "127\\.in-addr\\.arpa\\." < dig.out.test$n > /dev/null || ret=1
|
||||
check_ttl_range dig.out.test$n "SOA" 86400 || ret=1
|
||||
if [ $ret != 0 ]; then echo_i "failed"; fi
|
||||
status=`expr $status + $ret`
|
||||
|
||||
|
|
@ -53,7 +79,8 @@ if [ -x ${DIG} ] ; then
|
|||
echo_i "checking dig over TCP works ($n)"
|
||||
ret=0
|
||||
$DIG $DIGOPTS +tcp @10.53.0.3 a a.example > dig.out.test$n || ret=1
|
||||
grep "10\.0\.0\.1$" < dig.out.test$n > /dev/null || ret=1
|
||||
grep "10\\.0\\.0\\.1$" < dig.out.test$n > /dev/null || ret=1
|
||||
check_ttl_range dig.out.test$n "A" 300 || ret=1
|
||||
if [ $ret != 0 ]; then echo_i "failed"; fi
|
||||
status=`expr $status + $ret`
|
||||
|
||||
|
|
@ -62,6 +89,7 @@ if [ -x ${DIG} ] ; then
|
|||
ret=0
|
||||
$DIG $DIGOPTS +tcp @10.53.0.3 +multi +norrcomments DNSKEY dnskey.example > dig.out.test$n || ret=1
|
||||
grep "; ZSK; alg = RSAMD5 ; key id = 30795" < dig.out.test$n > /dev/null && ret=1
|
||||
check_ttl_range dig.out.test$n "DNSKEY" 300 || ret=1
|
||||
if [ $ret != 0 ]; then echo_i "failed"; fi
|
||||
status=`expr $status + $ret`
|
||||
|
||||
|
|
@ -70,6 +98,7 @@ if [ -x ${DIG} ] ; then
|
|||
ret=0
|
||||
$DIG $DIGOPTS +tcp @10.53.0.3 +multi +norrcomments SOA example > dig.out.test$n || ret=1
|
||||
grep "; ZSK; alg = RSAMD5 ; key id = 30795" < dig.out.test$n > /dev/null && ret=1
|
||||
check_ttl_range dig.out.test$n "SOA" 300 || ret=1
|
||||
if [ $ret != 0 ]; then echo_i "failed"; fi
|
||||
status=`expr $status + $ret`
|
||||
|
||||
|
|
@ -78,6 +107,7 @@ if [ -x ${DIG} ] ; then
|
|||
ret=0
|
||||
$DIG $DIGOPTS +tcp @10.53.0.3 +rrcomments DNSKEY dnskey.example > dig.out.test$n || ret=1
|
||||
grep "; ZSK; alg = RSAMD5 ; key id = 30795" < dig.out.test$n > /dev/null || ret=1
|
||||
check_ttl_range dig.out.test$n "DNSKEY" 300 || ret=1
|
||||
if [ $ret != 0 ]; then echo_i "failed"; fi
|
||||
status=`expr $status + $ret`
|
||||
|
||||
|
|
@ -110,6 +140,7 @@ if [ -x ${DIG} ] ; then
|
|||
ret=0
|
||||
$DIG $DIGOPTS +tcp @10.53.0.3 +noheader-only A example > dig.out.test$n || ret=1
|
||||
grep "Got answer:" < dig.out.test$n > /dev/null || ret=1
|
||||
check_ttl_range dig.out.test$n "SOA" 300 || ret=1
|
||||
if [ $ret != 0 ]; then echo_i "failed"; fi
|
||||
status=`expr $status + $ret`
|
||||
|
||||
|
|
@ -144,6 +175,7 @@ if [ -x ${DIG} ] ; then
|
|||
$DIG $DIGOPTS +tcp @10.53.0.3 +zflag +qr A example > dig.out.test$n || ret=1
|
||||
sed -n '/Sending:/,/Got answer:/p' dig.out.test$n | grep "^;; flags: rd ad; MBZ: 0x4;" > /dev/null || ret=1
|
||||
sed -n '/Got answer:/,/AUTHORITY SECTION:/p' dig.out.test$n | grep "^;; flags: qr rd ra; QUERY: 1" > /dev/null || ret=1
|
||||
check_ttl_range dig.out.test$n "SOA" 300 || ret=1
|
||||
if [ $ret != 0 ]; then echo_i "failed"; fi
|
||||
status=`expr $status + $ret`
|
||||
|
||||
|
|
@ -156,6 +188,7 @@ if [ -x ${DIG} ] ; then
|
|||
if [ $ret != 0 ]; then echo_i "failed"; fi
|
||||
status=`expr $status + $ret`
|
||||
|
||||
n=`expr $n + 1`
|
||||
echo_i "checking dig +ttlunits works ($n)"
|
||||
ret=0
|
||||
$DIG $DIGOPTS +tcp @10.53.0.2 +ttlunits A weeks.example > dig.out.test$n || ret=1
|
||||
|
|
@ -263,6 +296,7 @@ if [ -x ${DIG} ] ; then
|
|||
ret=0
|
||||
$DIG $DIGOPTS +tcp @10.53.0.2 +subnet=127.0.0.1 A a.example > dig.out.test$n 2>&1 || ret=1
|
||||
grep "CLIENT-SUBNET: 127.0.0.1/32/0" < dig.out.test$n > /dev/null || ret=1
|
||||
check_ttl_range dig.out.test$n "A" 300 || ret=1
|
||||
if [ $ret != 0 ]; then echo_i "failed"; fi
|
||||
status=`expr $status + $ret`
|
||||
|
||||
|
|
@ -271,6 +305,7 @@ if [ -x ${DIG} ] ; then
|
|||
ret=0
|
||||
$DIG $DIGOPTS +tcp @10.53.0.2 +subnet=127.0.0.0 +subnet=127.0.0.1 A a.example > dig.out.test$n 2>&1 || ret=1
|
||||
grep "CLIENT-SUBNET: 127.0.0.1/32/0" < dig.out.test$n > /dev/null || ret=1
|
||||
check_ttl_range dig.out.test$n "A" 300 || ret=1
|
||||
if [ $ret != 0 ]; then echo_i "failed"; fi
|
||||
status=`expr $status + $ret`
|
||||
|
||||
|
|
@ -296,6 +331,7 @@ if [ -x ${DIG} ] ; then
|
|||
esac
|
||||
grep "FORMERR" < dig.out.$i.test$n > /dev/null && ret=1
|
||||
grep "CLIENT-SUBNET: $addr/$i/0" < dig.out.$i.test$n > /dev/null || ret=1
|
||||
check_ttl_range dig.out.$i.test$n "A" 300 || ret=1
|
||||
done
|
||||
if [ $ret != 0 ]; then echo_i "failed"; fi
|
||||
status=`expr $status + $ret`
|
||||
|
|
@ -307,6 +343,7 @@ if [ -x ${DIG} ] ; then
|
|||
grep "status: NOERROR" < dig.out.test$n > /dev/null || ret=1
|
||||
grep "CLIENT-SUBNET: 0.0.0.0/0/0" < dig.out.test$n > /dev/null || ret=1
|
||||
grep "10.0.0.1" < dig.out.test$n > /dev/null || ret=1
|
||||
check_ttl_range dig.out.test$n "A" 300 || ret=1
|
||||
if [ $ret != 0 ]; then echo_i "failed"; fi
|
||||
status=`expr $status + $ret`
|
||||
|
||||
|
|
@ -317,6 +354,7 @@ if [ -x ${DIG} ] ; then
|
|||
grep "status: NOERROR" < dig.out.test$n > /dev/null || ret=1
|
||||
grep "CLIENT-SUBNET: 0.0.0.0/0/0" < dig.out.test$n > /dev/null || ret=1
|
||||
grep "10.0.0.1" < dig.out.test$n > /dev/null || ret=1
|
||||
check_ttl_range dig.out.test$n "A" 300 || ret=1
|
||||
if [ $ret != 0 ]; then echo_i "failed"; fi
|
||||
status=`expr $status + $ret`
|
||||
|
||||
|
|
@ -327,6 +365,7 @@ if [ -x ${DIG} ] ; then
|
|||
grep "status: NOERROR" < dig.out.test$n > /dev/null || ret=1
|
||||
grep "CLIENT-SUBNET: ::/0/0" < dig.out.test$n > /dev/null || ret=1
|
||||
grep "10.0.0.1" < dig.out.test$n > /dev/null || ret=1
|
||||
check_ttl_range dig.out.test$n "A" 300 || ret=1
|
||||
if [ $ret != 0 ]; then echo_i "failed"; fi
|
||||
status=`expr $status + $ret`
|
||||
|
||||
|
|
@ -337,6 +376,7 @@ if [ -x ${DIG} ] ; then
|
|||
grep "status: NOERROR" < dig.out.test$n > /dev/null || ret=1
|
||||
grep "CLIENT-SUBNET: 0/0/0" < dig.out.test$n > /dev/null || ret=1
|
||||
grep "10.0.0.1" < dig.out.test$n > /dev/null || ret=1
|
||||
check_ttl_range dig.out.test$n "A" 300 || ret=1
|
||||
if [ $ret != 0 ]; then echo_i "failed"; fi
|
||||
status=`expr $status + $ret`
|
||||
|
||||
|
|
@ -358,6 +398,7 @@ ret=0
|
|||
$DIG $DIGOPTS +tcp @10.53.0.2 +subnet=10.53/$p A a.example > dig.out.test.$p.$n 2>&1 || ret=1
|
||||
grep "FORMERR" < dig.out.test.$p.$n > /dev/null && ret=1
|
||||
grep "CLIENT-SUBNET.*/$p/0" < dig.out.test.$p.$n > /dev/null || ret=1
|
||||
check_ttl_range dig.out.test.$p.$n "A" 300 || ret=1
|
||||
done
|
||||
if [ $ret != 0 ]; then echo_i "failed"; fi
|
||||
status=`expr $status + $ret`
|
||||
|
|
@ -367,6 +408,7 @@ ret=0
|
|||
ret=0
|
||||
$DIG $DIGOPTS @10.53.0.3 +sp=4 -t sshfp foo.example > dig.out.test$n || ret=1
|
||||
grep " 9ABC DEF6 7890 " < dig.out.test$n > /dev/null || ret=1
|
||||
check_ttl_range dig.out.test$n "SSHFP" 300 || ret=1
|
||||
if [ $ret != 0 ]; then echo_i "failed"; fi
|
||||
status=`expr $status + $ret`
|
||||
|
||||
|
|
@ -394,6 +436,7 @@ ret=0
|
|||
ret=0
|
||||
$DIG $DIGOPTS @10.53.0.3 +ednsopt=3 a.example > dig.out.test$n 2>&1 || ret=1
|
||||
grep 'NSID: .* ("ns3")' dig.out.test$n > /dev/null || ret=1
|
||||
check_ttl_range dig.out.test$n "A" 300 || ret=1
|
||||
if [ $ret != 0 ]; then echo_i "failed"; fi
|
||||
status=`expr $status + $ret`
|
||||
|
||||
|
|
@ -402,6 +445,7 @@ ret=0
|
|||
ret=0
|
||||
$DIG $DIGOPTS @10.53.0.3 +ednsopt=nsid a.example > dig.out.test$n 2>&1 || ret=1
|
||||
grep 'NSID: .* ("ns3")' dig.out.test$n > /dev/null || ret=1
|
||||
check_ttl_range dig.out.test$n "A" 300 || ret=1
|
||||
if [ $ret != 0 ]; then echo_i "failed"; fi
|
||||
status=`expr $status + $ret`
|
||||
|
||||
|
|
@ -426,6 +470,7 @@ ret=0
|
|||
$DIG $DIGOPTS @10.53.0.3 +ednsopt=key-tag:00010002 a.example +qr > dig.out.test$n 2>&1 || ret=1
|
||||
grep "; KEY-TAG: 1, 2$" dig.out.test$n > /dev/null || ret=1
|
||||
grep "status: FORMERR" dig.out.test$n > /dev/null && ret=1
|
||||
check_ttl_range dig.out.test$n "A" 300 || ret=1
|
||||
if [ $ret != 0 ]; then echo_i "failed"; fi
|
||||
status=`expr $status + $ret`
|
||||
|
||||
|
|
@ -488,6 +533,7 @@ if [ -x ${DELV} ] ; then
|
|||
ret=0
|
||||
$DELV $DELVOPTS @10.53.0.3 +split=4 -t sshfp foo.example > delv.out.test$n || ret=1
|
||||
grep " 9ABC DEF6 7890 " < delv.out.test$n > /dev/null || ret=1
|
||||
check_ttl_range delv.out.test$n "SSHFP" 300 || ret=1
|
||||
if [ $ret != 0 ]; then echo_i "failed"; fi
|
||||
status=`expr $status + $ret`
|
||||
|
||||
|
|
@ -496,6 +542,7 @@ if [ -x ${DELV} ] ; then
|
|||
ret=0
|
||||
$DELV $DELVOPTS @10.53.0.3 +unknownformat a a.example > delv.out.test$n || ret=1
|
||||
grep "CLASS1[ ][ ]*TYPE1[ ][ ]*\\\\# 4 0A000001" < delv.out.test$n > /dev/null || ret=1
|
||||
check_ttl_range delv.out.test$n "TYPE1" 300 || ret=1
|
||||
if [ $ret != 0 ]; then echo_i "failed"; fi
|
||||
status=`expr $status + $ret`
|
||||
|
||||
|
|
@ -549,6 +596,7 @@ if [ -x ${DELV} ] ; then
|
|||
$DELV $DELVOPTS @10.53.0.3 -x 127.0.0.1 > delv.out.test$n 2>&1 || ret=1
|
||||
# doesn't matter if has answer
|
||||
grep -i "127\.in-addr\.arpa\." < delv.out.test$n > /dev/null || ret=1
|
||||
check_ttl_range delv.out.test$n '\\-ANY' 10800 3 || ret=1
|
||||
if [ $ret != 0 ]; then echo_i "failed"; fi
|
||||
status=`expr $status + $ret`
|
||||
|
||||
|
|
@ -557,6 +605,7 @@ if [ -x ${DELV} ] ; then
|
|||
ret=0
|
||||
$DELV $DELVOPTS +tcp @10.53.0.3 a a.example > delv.out.test$n || ret=1
|
||||
grep "10\.0\.0\.1$" < delv.out.test$n > /dev/null || ret=1
|
||||
check_ttl_range delv.out.test$n "A" 300 || ret=1
|
||||
if [ $ret != 0 ]; then echo_i "failed"; fi
|
||||
status=`expr $status + $ret`
|
||||
|
||||
|
|
@ -565,6 +614,7 @@ if [ -x ${DELV} ] ; then
|
|||
ret=0
|
||||
$DELV $DELVOPTS +tcp @10.53.0.3 +multi +norrcomments DNSKEY dnskey.example > delv.out.test$n || ret=1
|
||||
grep "; ZSK; alg = RSAMD5 ; key id = 30795" < delv.out.test$n > /dev/null && ret=1
|
||||
check_ttl_range delv.out.test$n "DNSKEY" 300 || ret=1
|
||||
if [ $ret != 0 ]; then echo_i "failed"; fi
|
||||
status=`expr $status + $ret`
|
||||
|
||||
|
|
@ -573,6 +623,7 @@ if [ -x ${DELV} ] ; then
|
|||
ret=0
|
||||
$DELV $DELVOPTS +tcp @10.53.0.3 +multi +norrcomments SOA example > delv.out.test$n || ret=1
|
||||
grep "; ZSK; alg = RSAMD5 ; key id = 30795" < delv.out.test$n > /dev/null && ret=1
|
||||
check_ttl_range delv.out.test$n "SOA" 300 || ret=1
|
||||
if [ $ret != 0 ]; then echo_i "failed"; fi
|
||||
status=`expr $status + $ret`
|
||||
|
||||
|
|
@ -581,6 +632,7 @@ if [ -x ${DELV} ] ; then
|
|||
ret=0
|
||||
$DELV $DELVOPTS +tcp @10.53.0.3 +rrcomments DNSKEY dnskey.example > delv.out.test$n || ret=1
|
||||
grep "; ZSK; alg = RSAMD5 ; key id = 30795" < delv.out.test$n > /dev/null || ret=1
|
||||
check_ttl_range delv.out.test$n "DNSKEY" 300 || ret=1
|
||||
if [ $ret != 0 ]; then echo_i "failed"; fi
|
||||
status=`expr $status + $ret`
|
||||
|
||||
|
|
@ -627,6 +679,7 @@ if [ -x ${DELV} ] ; then
|
|||
ret=0
|
||||
$DELV $DELVOPTS @10.53.0.3 +sp=4 -t sshfp foo.example > delv.out.test$n || ret=1
|
||||
grep " 9ABC DEF6 7890 " < delv.out.test$n > /dev/null || ret=1
|
||||
check_ttl_range delv.out.test$n "SSHFP" 300 || ret=1
|
||||
if [ $ret != 0 ]; then echo_i "failed"; fi
|
||||
status=`expr $status + $ret`
|
||||
|
||||
|
|
@ -643,6 +696,7 @@ if [ -x ${DELV} ] ; then
|
|||
ret=0
|
||||
$DELV $DELVOPTS @10.53.0.3 -c IN -t a a.example > delv.out.test$n || ret=1
|
||||
grep "a.example." < delv.out.test$n > /dev/null || ret=1
|
||||
check_ttl_range delv.out.test$n "A" 300 || ret=1
|
||||
if [ $ret != 0 ]; then echo_i "failed"; fi
|
||||
status=`expr $status + $ret`
|
||||
|
||||
|
|
@ -651,6 +705,7 @@ if [ -x ${DELV} ] ; then
|
|||
ret=0
|
||||
$DELV $DELVOPTS @10.53.0.3 -c CH -t a a.example > delv.out.test$n || ret=1
|
||||
grep "a.example." < delv.out.test$n > /dev/null || ret=1
|
||||
check_ttl_range delv.out.test$n "A" 300 || ret=1
|
||||
if [ $ret != 0 ]; then echo_i "failed"; fi
|
||||
status=`expr $status + $ret`
|
||||
|
||||
|
|
@ -659,6 +714,7 @@ if [ -x ${DELV} ] ; then
|
|||
ret=0
|
||||
$DELV $DELVOPTS @10.53.0.3 -c CH -t a a.example > delv.out.test$n || ret=1
|
||||
grep "a.example." < delv.out.test$n > /dev/null || ret=1
|
||||
check_ttl_range delv.out.test$n "A" 300 || ret=1
|
||||
if [ $ret != 0 ]; then echo_i "failed"; fi
|
||||
status=`expr $status + $ret`
|
||||
|
||||
|
|
@ -669,6 +725,7 @@ if [ -x ${DELV} ] ; then
|
|||
grep '^; -m\..*[0-9]*.*IN.*ANY.*;' delv.out.test$n > /dev/null || ret=1
|
||||
grep "^add " delv.out.test$n > /dev/null && ret=1
|
||||
grep "^del " delv.out.test$n > /dev/null && ret=1
|
||||
check_ttl_range delv.out.test$n '\\-ANY' 300 3 || ret=1
|
||||
if [ $ret != 0 ]; then echo_i "failed"; fi
|
||||
status=`expr $status + $ret`
|
||||
else
|
||||
|
|
|
|||
Loading…
Reference in a new issue