check that a malformed truncated response to a TSIG query is handled

(cherry picked from commit 8bbf3eb5f3480ae7aaa811ed456700c2ea459caa)

diff --git a/bin/tests/system/tsig/ans2/ans.pl b/bin/tests/system/tsig/ans2/ans.pl
new file mode 100644 (file)
index 0000000..a3420bb
--- /dev/null
+++ b/bin/tests/system/tsig/ans2/ans.pl
@@ -0,0 +1,50 @@
+# 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.
+
+#
+# An adhoc server that returns a TC=1 response with the final byte
+# removed to generate UNEXPECTEDEND form dns_message_parse.
+#
+
+use IO::File;
+use IO::Socket;
+
+my $localport = int($ENV{'PORT'});
+if (!$localport) { $localport = 5300; }
+printf "localport %u\n", $localport;
+
+my $sock = IO::Socket::INET->new(LocalAddr => "10.53.0.2",
+   LocalPort => $localport, Proto => "udp") or die "$!";
+
+my $pidf = new IO::File "ans.pid", "w" or die "cannot open pid file: $!";
+print $pidf "$$\n" or die "cannot write pid file: $!";
+$pidf->close or die "cannot close pid file: $!";
+sub rmpid { unlink "ans.pid"; exit 1; };
+
+$SIG{INT} = \&rmpid;
+$SIG{TERM} = \&rmpid;
+
+sub arraystring {
+    my $string = join("", @_);
+    return $string;
+}
+
+for (;;) {
+       $from = $sock->recv($buf, 512);
+       ($port, $ip_address) = unpack_sockaddr_in($from);
+       $l = length($buf);
+       printf "received %u bytes from %s#%u\n", $l, inet_ntoa($ip_address), $port;
+       @up = unpack("C[$l]", $buf);
+       $up[2] |= 0x80; # QR
+       $up[2] |= 0x02; # TC
+       $up[3] |= 0x80; # RA
+       $l -= 1;        # truncate the response 1 byte
+       $replydata = pack("C[$l]", @up);
+       printf "sent %u bytes\n", $sock->send($replydata);
+}

diff --git a/bin/tests/system/tsig/ns1/named.conf.in b/bin/tests/system/tsig/ns1/named.conf.in
index fbf30c6dc4eb7dc27bdf93389c9f4f80f0766fff..4ee703f6c9693d80bf3faa6f65621f55045e8c9a 100644 (file)
--- a/bin/tests/system/tsig/ns1/named.conf.in
+++ b/bin/tests/system/tsig/ns1/named.conf.in
@@ -17,7 +17,7 @@ options {
        pid-file "named.pid";
        listen-on { 10.53.0.1; };
        listen-on-v6 { none; };
-       recursion no;
+       recursion yes;
        notify no;
 };
 
@@ -85,3 +85,13 @@ zone "example.nil" {
        type master;
        file "example.db";
 };
+
+server 10.53.0.2 {
+       keys sha256;
+};
+
+zone "bad-tsig" {
+       type forward;
+       forwarders { 10.53.0.2; };
+       forward only;
+};

diff --git a/bin/tests/system/tsig/prereq.sh b/bin/tests/system/tsig/prereq.sh
new file mode 100644 (file)
index 0000000..35d6202
--- /dev/null
+++ b/bin/tests/system/tsig/prereq.sh
@@ -0,0 +1,22 @@
+#!/bin/sh
+#
+# 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.
+
+# shellcheck source=conf.sh
+. "$SYSTEMTESTTOP/conf.sh"
+
+set -e
+
+if test -z "$PERL"; then
+    echo "I:This test requires Perl." >&2
+    exit 1
+fi
+
+exit 0

diff --git a/bin/tests/system/tsig/tests.sh b/bin/tests/system/tsig/tests.sh
index 526dbca74c0ae165d1ff25c092716ca6a0e8e19d..9422bb241f289ee9b4766c41c197a66bff425081 100644 (file)
--- a/bin/tests/system/tsig/tests.sh
+++ b/bin/tests/system/tsig/tests.sh
@@ -238,6 +238,13 @@ then
   fi
 fi
 
+echo_i "check that a malformed truncated response to a TSIG query is handled"
+ret=0
+$DIG -p $PORT @10.53.0.1 bad-tsig > dig.out.bad-tsig || ret=1
+grep "status: SERVFAIL" dig.out.bad-tsig > /dev/null || ret=1
+if [ $ret -eq 1 ] ; then
+    echo_i "failed"; status=1
+fi
 
 echo_i "exit status: $status"
 [ $status -eq 0 ] || exit 1

diff --git a/util/copyrights b/util/copyrights
index e1dfae343a6d04606d322c74443b19fdb2377b29..d3e331ede5b018615022d7e5f1b85ed3855c581a 100644 (file)
--- a/util/copyrights
+++ b/util/copyrights
@@ -2366,11 +2366,13 @@
 ./bin/tests/system/tkey/prereq.sh              SH      2001,2004,2006,2007,2009,2012,2014,2016,2018,2019,2020
 ./bin/tests/system/tkey/setup.sh               SH      2001,2004,2007,2009,2012,2013,2014,2016,2018,2019,2020
 ./bin/tests/system/tkey/tests.sh               SH      2001,2004,2007,2009,2011,2012,2013,2014,2016,2018,2019,2020
+./bin/tests/system/tsig/ans2/ans.pl            PERL    2020
 ./bin/tests/system/tsig/badlocation            X       2020
 ./bin/tests/system/tsig/badtime                        X       2020
 ./bin/tests/system/tsig/clean.sh               SH      2005,2006,2007,2012,2014,2016,2018,2019,2020
 ./bin/tests/system/tsig/ns1/example.db         ZONE    2005,2006,2007,2009,2012,2016,2018,2019,2020
 ./bin/tests/system/tsig/ns1/named.conf.in      CONF-C  2018,2019,2020
+./bin/tests/system/tsig/prereq.sh              SH      2020
 ./bin/tests/system/tsig/setup.sh               SH      2016,2018,2019,2020
 ./bin/tests/system/tsig/tests.sh               SH      2005,2006,2007,2011,2012,2016,2018,2019,2020
 ./bin/tests/system/tsiggss/authsock.pl         PERL    2011,2012,2016,2018,2019,2020