mirror of
https://github.com/isc-projects/bind9.git
synced 2026-03-10 18:28:43 -04:00
e2393ba27b
some EDNS option names, including DAU, DHU, N3U, and CHAIN, were not printed in dns_message_pseudosectiontotext() or _psuedosectiontoyaml(); they were displayed as unknown options. this has been corrected. that code was also refactored to use switch instead of if/else, and to look up the option code names in a table to prevent inconsistencies between the two formats. one such inconsistency was corrected: the "TCP-KEEPALIVE" option is now always printed with a hyphen, instead of being "TCP KEEPALIVE" when not using YAML. the keepalive system test has been updated to expect this. EDNS options that print DNS names (i.e., CHAIN and Report-Channel) now enclose them in quotation marks to ensure YAML correctness. the auth system test has been updated to expect this when grepping for Report-Channel options.
242 lines
9.9 KiB
Bash
242 lines
9.9 KiB
Bash
#!/bin/sh
|
|
|
|
# Copyright (C) Internet Systems Consortium, Inc. ("ISC")
|
|
#
|
|
# SPDX-License-Identifier: MPL-2.0
|
|
#
|
|
# 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 https://mozilla.org/MPL/2.0/.
|
|
#
|
|
# See the COPYRIGHT file distributed with this work for additional
|
|
# information regarding copyright ownership.
|
|
|
|
set -e
|
|
|
|
. ../conf.sh
|
|
|
|
DIGOPTS="+tcp -p ${PORT}"
|
|
|
|
status=0
|
|
n=0
|
|
|
|
n=$((n + 1))
|
|
echo_i "wait for zones to finish transferring to ns2 ($n)"
|
|
for i in 1 2 3 4 5 6 7 8 9 10; do
|
|
ret=0
|
|
for zone in example.com example.net; do
|
|
$DIG $DIGOPTS @10.53.0.2 soa $zone >dig.out.test$n || ret=1
|
|
grep "ANSWER: 1," dig.out.test$n >/dev/null || ret=1
|
|
done
|
|
[ $ret -eq 0 ] && break
|
|
sleep 1
|
|
done
|
|
[ $ret -eq 0 ] || echo_i "failed"
|
|
status=$((status + ret))
|
|
|
|
#
|
|
# If recursion is unrequested or unavailable, then cross-zone CNAME records
|
|
# should not be followed. If both requested and available, they should be.
|
|
#
|
|
n=$((n + 1))
|
|
echo_i "check that cross-zone CNAME record does not return target data (rd=0/ra=0) ($n)"
|
|
ret=0
|
|
$DIG $DIGOPTS +norec @10.53.0.1 www.example.com >dig.out.test$n || ret=1
|
|
grep "ANSWER: 1," dig.out.test$n >/dev/null || ret=1
|
|
grep "flags: qr aa;" dig.out.test$n >/dev/null || ret=1
|
|
grep "www.example.com.*CNAME.*server.example.net" dig.out.test$n >/dev/null || ret=1
|
|
grep "server.example.net.*A.*10.53.0.100" dig.out.test$n >/dev/null && ret=1
|
|
[ $ret -eq 0 ] || echo_i "failed"
|
|
status=$((status + ret))
|
|
|
|
n=$((n + 1))
|
|
echo_i "check that cross-zone CNAME record does not return target data (rd=1/ra=0) ($n)"
|
|
ret=0
|
|
$DIG $DIGOPTS +rec @10.53.0.1 www.example.com >dig.out.test$n || ret=1
|
|
grep "ANSWER: 1," dig.out.test$n >/dev/null || ret=1
|
|
grep "flags: qr aa rd;" dig.out.test$n >/dev/null || ret=1
|
|
grep "www.example.com.*CNAME.*server.example.net" dig.out.test$n >/dev/null || ret=1
|
|
grep "server.example.net.*A.*10.53.0.100" dig.out.test$n >/dev/null && ret=1
|
|
[ $ret -eq 0 ] || echo_i "failed"
|
|
status=$((status + ret))
|
|
|
|
n=$((n + 1))
|
|
echo_i "check that cross-zone CNAME record does not return target data (rd=0/ra=1) ($n)"
|
|
ret=0
|
|
$DIG $DIGOPTS +norec @10.53.0.2 www.example.com >dig.out.test$n || ret=1
|
|
grep "ANSWER: 1," dig.out.test$n >/dev/null || ret=1
|
|
grep "flags: qr aa ra;" dig.out.test$n >/dev/null || ret=1
|
|
grep "www.example.com.*CNAME.*server.example.net" dig.out.test$n >/dev/null || ret=1
|
|
grep "server.example.net.*A.*10.53.0.100" dig.out.test$n >/dev/null && ret=1
|
|
[ $ret -eq 0 ] || echo_i "failed"
|
|
status=$((status + ret))
|
|
|
|
n=$((n + 1))
|
|
echo_i "check that cross-zone CNAME records return target data (rd=1/ra=1) ($n)"
|
|
ret=0
|
|
$DIG $DIGOPTS @10.53.0.2 www.example.com >dig.out.test$n || ret=1
|
|
grep "ANSWER: 2," dig.out.test$n >/dev/null || ret=1
|
|
grep "flags: qr aa rd ra;" dig.out.test$n >/dev/null || ret=1
|
|
grep "www.example.com.*CNAME.*server.example.net" dig.out.test$n >/dev/null || ret=1
|
|
grep "server.example.net.*A.*10.53.0.100" dig.out.test$n >/dev/null || ret=1
|
|
[ $ret -eq 0 ] || echo_i "failed"
|
|
status=$((status + ret))
|
|
|
|
#
|
|
# In-zone CNAME records should always be followed regardless of RD and RA.
|
|
#
|
|
n=$((n + 1))
|
|
echo_i "check that in-zone CNAME records return target data (rd=0/ra=0) ($n)"
|
|
ret=0
|
|
$DIG $DIGOPTS +norec @10.53.0.1 inzone.example.com >dig.out.test$n || ret=1
|
|
grep "ANSWER: 2," dig.out.test$n >/dev/null || ret=1
|
|
grep "flags: qr aa;" dig.out.test$n >/dev/null || ret=1
|
|
grep "inzone.example.com.*CNAME.*a.example.com" dig.out.test$n >/dev/null || ret=1
|
|
grep "a.example.com.*A.*10.53.0.1" dig.out.test$n >/dev/null || ret=1
|
|
[ $ret -eq 0 ] || echo_i "failed"
|
|
status=$((status + ret))
|
|
|
|
n=$((n + 1))
|
|
echo_i "check that in-zone CNAME records returns target data (rd=1/ra=0) ($n)"
|
|
ret=0
|
|
$DIG $DIGOPTS +rec @10.53.0.1 inzone.example.com >dig.out.test$n || ret=1
|
|
grep "ANSWER: 2," dig.out.test$n >/dev/null || ret=1
|
|
grep "flags: qr aa rd;" dig.out.test$n >/dev/null || ret=1
|
|
grep "inzone.example.com.*CNAME.*a.example.com" dig.out.test$n >/dev/null || ret=1
|
|
grep "a.example.com.*A.*10.53.0.1" dig.out.test$n >/dev/null || ret=1
|
|
[ $ret -eq 0 ] || echo_i "failed"
|
|
status=$((status + ret))
|
|
|
|
n=$((n + 1))
|
|
echo_i "check that in-zone CNAME records return target data (rd=0/ra=1) ($n)"
|
|
ret=0
|
|
$DIG $DIGOPTS +norec @10.53.0.2 inzone.example.com >dig.out.test$n || ret=1
|
|
grep "ANSWER: 2," dig.out.test$n >/dev/null || ret=1
|
|
grep "flags: qr aa ra;" dig.out.test$n >/dev/null || ret=1
|
|
grep "inzone.example.com.*CNAME.*a.example.com" dig.out.test$n >/dev/null || ret=1
|
|
grep "a.example.com.*A.*10.53.0.1" dig.out.test$n >/dev/null || ret=1
|
|
[ $ret -eq 0 ] || echo_i "failed"
|
|
status=$((status + ret))
|
|
|
|
n=$((n + 1))
|
|
echo_i "check that in-zone CNAME records return target data (rd=1/ra=1) ($n)"
|
|
ret=0
|
|
$DIG $DIGOPTS @10.53.0.2 inzone.example.com >dig.out.test$n || ret=1
|
|
grep "ANSWER: 2," dig.out.test$n >/dev/null || ret=1
|
|
grep "flags: qr aa rd ra;" dig.out.test$n >/dev/null || ret=1
|
|
grep "inzone.example.com.*CNAME.*a.example.com" dig.out.test$n >/dev/null || ret=1
|
|
grep "a.example.com.*A.*10.53.0.1" dig.out.test$n >/dev/null || ret=1
|
|
[ $ret -eq 0 ] || echo_i "failed"
|
|
status=$((status + ret))
|
|
|
|
n=$((n + 1))
|
|
echo_i "check that in-zone CNAME records does not return target data when QTYPE is CNAME (rd=1/ra=1) ($n)"
|
|
ret=0
|
|
$DIG $DIGOPTS @10.53.0.2 -t cname inzone.example.com >dig.out.test$n || ret=1
|
|
grep 'ANSWER: 1,' dig.out.test$n >/dev/null || ret=1
|
|
grep 'flags: qr aa rd ra;' dig.out.test$n >/dev/null || ret=1
|
|
grep 'inzone\.example\.com\..*CNAME.a\.example\.com\.' dig.out.test$n >/dev/null || ret=1
|
|
grep 'a\.example\.com\..*A.10\.53\.0\.1' dig.out.test$n >/dev/null && ret=1
|
|
[ $ret -eq 0 ] || echo_i "failed"
|
|
status=$((status + ret))
|
|
|
|
n=$((n + 1))
|
|
echo_i "check that in-zone CNAME records does not return target data when QTYPE is ANY (rd=1/ra=1) ($n)"
|
|
ret=0
|
|
$DIG $DIGOPTS @10.53.0.2 -t any inzone.example.com >dig.out.test$n || ret=1
|
|
grep 'ANSWER: 1,' dig.out.test$n >/dev/null || ret=1
|
|
grep 'flags: qr aa rd ra;' dig.out.test$n >/dev/null || ret=1
|
|
grep 'inzone\.example\.com\..*CNAME.a\.example\.com\.' dig.out.test$n >/dev/null || ret=1
|
|
grep 'a\.example\.com\..*A.10\.53\.0\.1' dig.out.test$n >/dev/null && ret=1
|
|
[ $ret -eq 0 ] || echo_i "failed"
|
|
status=$((status + ret))
|
|
|
|
n=$((n + 1))
|
|
echo_i "check that in-zone DNAME records does not return target data when QTYPE is CNAME (rd=1/ra=1) ($n)"
|
|
ret=0
|
|
$DIG $DIGOPTS @10.53.0.2 -t cname inzone.dname.example.com >dig.out.test$n || ret=1
|
|
grep 'ANSWER: 2,' dig.out.test$n >/dev/null || ret=1
|
|
grep 'flags: qr aa rd ra;' dig.out.test$n >/dev/null || ret=1
|
|
grep 'dname\.example\.com\..*DNAME.example\.com\.' dig.out.test$n >/dev/null || ret=1
|
|
grep 'inzone\.dname\.example\.com\..*CNAME.inzone\.example\.com\.' dig.out.test$n >/dev/null || ret=1
|
|
grep 'inzone\.example\.com\..*CNAME.a\.example\.com\.' dig.out.test$n >/dev/null && ret=1
|
|
grep 'a\.example\.com\..*A.10\.53\.0\.1' dig.out.test$n >/dev/null && ret=1
|
|
[ $ret -eq 0 ] || echo_i "failed"
|
|
status=$((status + ret))
|
|
|
|
n=$((n + 1))
|
|
echo_i "check that in-zone DNAME records does not return target data when QTYPE is ANY (rd=1/ra=1) ($n)"
|
|
ret=0
|
|
$DIG $DIGOPTS @10.53.0.2 -t any inzone.dname.example.com >dig.out.test$n || ret=1
|
|
grep 'ANSWER: 2,' dig.out.test$n >/dev/null || ret=1
|
|
grep 'flags: qr aa rd ra;' dig.out.test$n >/dev/null || ret=1
|
|
grep 'dname\.example\.com\..*DNAME.example\.com\.' dig.out.test$n >/dev/null || ret=1
|
|
grep 'inzone\.dname\.example\.com\..*CNAME.inzone\.example\.com\.' dig.out.test$n >/dev/null || ret=1
|
|
grep 'inzone\.example\.com.*CNAME.a\.example\.com\.' dig.out.test$n >/dev/null && ret=1
|
|
grep 'a\.example\.com.*A.10\.53\.0\.1' dig.out.test$n >/dev/null && ret=1
|
|
[ $ret -eq 0 ] || echo_i "failed"
|
|
status=$((status + ret))
|
|
|
|
n=$((n + 1))
|
|
echo_i "check that CHAOS addresses are compared correctly ($n)"
|
|
ret=0
|
|
$DIG $DIGOPTS @10.53.0.1 +noall +answer ch test.example.chaos >dig.out.test$n || ret=1
|
|
lines=$(wc -l <dig.out.test$n)
|
|
[ ${lines:-0} -eq 2 ] || ret=1
|
|
[ $ret -eq 0 ] || echo_i "failed"
|
|
status=$((status + ret))
|
|
|
|
n=$((n + 1))
|
|
echo_i "check that a Report-Channel EDNS option is added to responses ($n)"
|
|
ret=0
|
|
$DIG $DIGOPTS @10.53.0.1 example.net >dig.out.test$n
|
|
grep "; Report-Channel: \"example.rad\"" dig.out.test$n >/dev/null || ret=1
|
|
[ $ret -eq 0 ] || echo_i "failed"
|
|
status=$((status + ret))
|
|
|
|
n=$((n + 1))
|
|
echo_i "check that Report-Channel option is omitted for names in error-logging zones ($n)"
|
|
ret=0
|
|
$DIG $DIGOPTS @10.53.0.1 example.rad >dig.out.test$n
|
|
grep "; Report-Channel: \"example.rad\"" dig.out.test$n >/dev/null && ret=1
|
|
[ $ret -eq 0 ] || echo_i "failed"
|
|
status=$((status + ret))
|
|
|
|
n=$((n + 1))
|
|
echo_i "check that Report-Channel option is omitted for zones above the agent-domain ($n)"
|
|
ret=0
|
|
$DIG $DIGOPTS @10.53.0.1 rad >dig.out.test$n
|
|
grep "; Report-Channel: \"example.rad\"" dig.out.test$n >/dev/null && ret=1
|
|
[ $ret -eq 0 ] || echo_i "failed"
|
|
status=$((status + ret))
|
|
|
|
n=$((n + 1))
|
|
echo_i "check that a zone-level Report-Channel EDNS option is added to responses ($n)"
|
|
ret=0
|
|
$DIG $DIGOPTS @10.53.0.1 example.com >dig.out.test$n
|
|
grep "; Report-Channel: \"rad.example.net\"" dig.out.test$n >/dev/null || ret=1
|
|
[ $ret -eq 0 ] || echo_i "failed"
|
|
status=$((status + ret))
|
|
|
|
n=$((n + 1))
|
|
echo_i "check that error report queries are logged and no Report-Channel option is present in the response ($n)"
|
|
ret=0
|
|
nextpart ns1/named.run >/dev/null
|
|
$DIG $DIGOPTS @10.53.0.1 _er.0.example.1._er.example.rad TXT >dig.out.test$n
|
|
nextpart ns1/named.run | grep "dns-reporting-agent '_er.0.example.1._er.example.rad/IN'" >/dev/null || ret=1
|
|
grep "; Report-Channel: \"example.rad\"" dig.out.test$n >/dev/null && ret=1
|
|
[ $ret -eq 0 ] || echo_i "failed"
|
|
status=$((status + ret))
|
|
|
|
n=$((n + 1))
|
|
echo_i "check that error report queries to non-logging zones are not logged ($n)"
|
|
ret=0
|
|
nextpart ns1/named.run >/dev/null
|
|
$DIG $DIGOPTS @10.53.0.1 _er.0.example.1._er.example.com TXT >dig.out.test$n
|
|
nextpart ns1/named.run | grep "dns-reporting-agent '_er.0.example.1._er.example.com/IN'" >/dev/null && ret=1
|
|
grep "; Report-Channel: \"rad.example.net\"" dig.out.test$n >/dev/null || ret=1
|
|
[ $ret -eq 0 ] || echo_i "failed"
|
|
status=$((status + ret))
|
|
|
|
echo_i "exit status: $status"
|
|
[ $status -eq 0 ] || exit 1
|