Check that bad message id's are caught by named

(cherry picked from commit 06e53c9e1446fa1a83070e28b210e75b571aafc0)

diff --git a/bin/tests/system/ans.pl b/bin/tests/system/ans.pl
index d7f9f63cfac444ec6ed5ac48044bcefa118f715a..9d77eb45755587573ff0083472ee22de63656e9e 100644 (file)
--- a/bin/tests/system/ans.pl
+++ b/bin/tests/system/ans.pl
@@ -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

diff --git a/bin/tests/system/xfer/ans5/badmessageid b/bin/tests/system/xfer/ans5/badmessageid
new file mode 100644 (file)
index 0000000..e0dc041
--- /dev/null
+++ b/bin/tests/system/xfer/ans5/badmessageid
@@ -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

diff --git a/bin/tests/system/xfer/clean.sh b/bin/tests/system/xfer/clean.sh
index 0a7440d380bb64f8c23660436ed269267c54d1e2..d0890c8d84782171f3758bf9dfe3b4519257ed2f 100644 (file)
--- a/bin/tests/system/xfer/clean.sh
+++ b/bin/tests/system/xfer/clean.sh
@@ -13,23 +13,26 @@
 # 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 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/tsigzone.bk ns3/example.bk.jnl
+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 stats.*

diff --git a/bin/tests/system/xfer/tests.sh b/bin/tests/system/xfer/tests.sh
index 344e3cfb6cb292c87d61f3d934b6955a97beb6c5..39fd9c29c44ba701a7bfaf6fdab01e43b34cb791 100755 (executable)
--- a/bin/tests/system/xfer/tests.sh
+++ b/bin/tests/system/xfer/tests.sh
@@ -384,6 +384,29 @@ $DIGCMD nil. TXT | grep 'incorrect key AXFR' >/dev/null && {
     status=`expr $status + 1`
 }
 
+n=`expr $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
+
+msg="detected message ID mismatch on incoming AXFR stream, transfer will fail in BIND 9.17.2 and later if AXFR source is not fixed"
+nextpart ns4/named.run | grep "$msg" > /dev/null || {
+    echo_i "failed: expected status was not logged"
+    status=`expr $status + 1`
+}
+
+$DIGCMD nil. TXT | grep 'bad message id' >/dev/null || {
+    echo_i "failed"
+    status=`expr $status + 1`
+}
+
 n=`expr $n + 1`
 echo_i "check that we ask for and get a EDNS EXPIRE response ($n)"
 # force a refresh query

diff --git a/util/copyrights b/util/copyrights
index 88551d190b975abab08557a852e3959ce30502ac..70bb5eb1b16e20cd9451c58bb7233769e8b1e90d 100644 (file)
--- a/util/copyrights
+++ b/util/copyrights
@@ -2497,6 +2497,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