ComputerSurge/bind9
3
0
Fork 0
Code Pull Requests 1 Activity

Check that bad message id's are caught by named

Browse Source
This commit is contained in:
Mark Andrews
2020-03-19 12:26:37 +11:00
parent ac45bde2fa
commit ba445afb4f
5 changed files with 57 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
bin/tests/system/ans.pl
View File

@@ -62,6 +62,11 @@
# Note that this data will still be sent with any request for
# pattern, only this data will be signed. Currently, this is only
# done for TCP.
#
# /pattern bad-id <key> <key_data>/
# /pattern bad-id/
#
# will add 50 to the message id of the response.
use IO::File;
@@ -361,7 +366,7 @@ sub handleTCP {
my $r;
foreach $r (@rules) {
my $pattern = $r->{pattern};
my($dbtype, $key_name, $key_data) = split(/ /,$pattern);
my($dbtype, $key_name, $key_data, $extra) = split(/ /,$pattern);
print "[handleTCP] $dbtype, $key_name, $key_data \n";
if ("$qname $qtype" =~ /$dbtype/) {
$count_these++;
@@ -369,6 +374,11 @@ sub handleTCP {
foreach $a (@{$r->{answer}}) {
$packet->push("answer", $a);
}
if(defined($key_name) && $key_name eq "bad-id") {
$packet->header->id(($id+50)%0xffff);
$key_name = $key_data;
$key_data = $extra;
}
if (defined($key_name) && defined($key_data)) {
my $tsig;
# sign the packet

10
bin/tests/system/xfer/ans5/badmessageid Normal file
View File

@@ -0,0 +1,10 @@
/SOA tsig_key LSAnCU+Z/
nil. 300 SOA ns.nil. root.nil. 1 300 300 604800 300
/AXFR tsig_key LSAnCU+Z/
nil. 300 SOA ns.nil. root.nil. 1 300 300 604800 300
/AXFR bad-id tsig_key LSAnCU+Z/
nil. 300 NS ns.nil.
nil. 300 TXT "bad message id"
a.nil. 60 A 10.0.0.61
/AXFR bad-id tsig_key LSAnCU+Z/
nil. 300 SOA ns.nil. root.nil. 1 300 300 604800 300

26
bin/tests/system/xfer/clean.sh
View File

@@ -13,25 +13,25 @@
# Clean up after zone transfer tests.
#
rm -f dig.out.*
rm -f */ans.run
rm -f */named.conf
rm -f */named.memstats
rm -f */named.run
rm -f */named.run.prev
rm -f axfr.out
rm -f stats.*
rm -f ns1/slave.db ns2/slave.db
rm -f dig.out.*
rm -f ns*/managed-keys.bind*
rm -f ns*/named.lock
rm -f ns1/edns-expire.db
rm -f ns1/ixfr-too-big.db ns1/ixfr-too-big.db.jnl
rm -f ns1/slave.db ns2/slave.db
rm -f ns2/example.db ns2/tsigzone.db ns2/example.db.jnl
rm -f ns2/mapped.db
rm -f ns3/example.bk ns3/xfer-stats.bk ns3/tsigzone.bk ns3/example.bk.jnl
rm -f ns3/mapped.bk
rm -f ns3/master.bk ns3/master.bk.jnl
rm -f ns4/*.db ns4/*.jnl
rm -f ns6/*.db ns6/*.bk ns6/*.jnl
rm -f ns7/*.db ns7/*.bk ns7/*.jnl
rm -f ns8/large.db ns8/small.db
rm -f */named.conf
rm -f */named.run
rm -f */named.memstats
rm -f */named.run
rm -f */ans.run
rm -f ns*/named.lock
rm -f ns2/mapped.db
rm -f ns3/mapped.bk
rm -f ns1/ixfr-too-big.db ns1/ixfr-too-big.db.jnl
rm -f ns*/managed-keys.bind*
rm -f stats.*

22
bin/tests/system/xfer/tests.sh
View File

@@ -384,6 +384,28 @@ $DIGCMD nil. TXT | grep 'incorrect key AXFR' >/dev/null && {
status=$((status+1))
}
n=$((n+1))
echo_i "bad message id ($n)"
$SENDCMD < ans5/badmessageid
# Uncomment to see AXFR stream with mismatching IDs.
# $DIG $DIGOPTS @10.53.0.5 -y tsig_key:LSAnCU+Z nil. AXFR +all
$RNDCCMD 10.53.0.4 retransfer nil | sed 's/^/ns4 /' | cat_i
sleep 2
nextpart ns4/named.run | grep "unexpected message id" > /dev/null || {
echo_i "failed: expected status was not logged"
status=$((status+1))
}
$DIGCMD nil. TXT | grep 'bad message id' >/dev/null && {
echo_i "failed"
status=$((status+1))
}
n=$((n+1))
echo_i "check that we ask for and get a EDNS EXPIRE response ($n)"
# force a refresh query

1
util/copyrights
View File

@@ -1167,6 +1167,7 @@
./bin/tests/system/win32/pipequeries.vcxproj.in X 2016,2017,2018,2019,2020
./bin/tests/system/win32/pipequeries.vcxproj.user X 2016,2018,2019,2020
./bin/tests/system/xfer/ans5/badkeydata X 2011,2018,2019,2020
./bin/tests/system/xfer/ans5/badmessageid X 2020
./bin/tests/system/xfer/ans5/goodaxfr X 2011,2018,2019,2020
./bin/tests/system/xfer/ans5/partial X 2011,2018,2019,2020
./bin/tests/system/xfer/ans5/unknownkey X 2011,2018,2019,2020