Add system test

(cherry picked from commit a5933fa2bb6270f900515fb466cfaded2430b4ba)

diff --git a/bin/tests/system/cookie/ns7/named.conf.in b/bin/tests/system/cookie/ns7/named.conf.in
new file mode 100644 (file)
index 0000000..9c25220
--- /dev/null
+++ b/bin/tests/system/cookie/ns7/named.conf.in
@@ -0,0 +1,29 @@
+/*
+ * 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.
+ */
+
+options {
+       query-source address 10.53.0.7 dscp 1;
+       notify-source 10.53.0.7 dscp 2;
+       transfer-source 10.53.0.7 dscp 3;
+       port @PORT@;
+       pid-file "named.pid";
+       listen-on { 10.53.0.7; };
+       listen-on-v6 { none; };
+       recursion no;
+       answer-cookie no;
+       send-cookie yes;
+       nocookie-udp-size 512;
+};
+
+zone "." {
+       type master;
+       file "root.db";
+};

diff --git a/bin/tests/system/cookie/ns7/root.db b/bin/tests/system/cookie/ns7/root.db
new file mode 100644 (file)
index 0000000..96410ee
--- /dev/null
+++ b/bin/tests/system/cookie/ns7/root.db
@@ -0,0 +1,22 @@
+; 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.
+
+@      SOA     a.root-servers.nil. hostmaster.isc.org. 1 600 600 1200 600
+@      NS      a.root-servers.nil.
+a.root-servers.nil. A  10.53.0.2
+large.xxx TXT  ( large large large large large large large large
+                 large large large large large large large large
+                 large large large large large large large large
+                 large large large large large large large large
+                 large large large large large large large large
+                 large large large large large large large large
+                 large large large large large large large large
+                 large large large large large large large large
+                 large large large large large large large large
+                 large large large large large large large large )

diff --git a/bin/tests/system/cookie/setup.sh b/bin/tests/system/cookie/setup.sh
index 2e90ba22c33ca1a348b7efe516a9105c31606639..fa6de38c00d1b40fd5a0a21fe41d003cdfca7cfa 100644 (file)
--- a/bin/tests/system/cookie/setup.sh
+++ b/bin/tests/system/cookie/setup.sh
@@ -19,3 +19,4 @@ copy_setports ns3/named.conf.in ns3/named.conf
 copy_setports ns4/named.conf.in ns4/named.conf
 copy_setports ns5/named.conf.in ns5/named.conf
 copy_setports ns6/named.conf.in ns6/named.conf
+copy_setports ns7/named.conf.in ns7/named.conf

diff --git a/bin/tests/system/cookie/tests.sh b/bin/tests/system/cookie/tests.sh
index 17d782e0ea09bee5f4987b0ee9d730294728fdf9..816f6a312b5996a9050f21052fa76c4bc3ef0fb1 100755 (executable)
--- a/bin/tests/system/cookie/tests.sh
+++ b/bin/tests/system/cookie/tests.sh
@@ -73,14 +73,23 @@ if [ $ret != 0 ]; then echo_i "failed"; fi
 status=`expr $status + $ret`
 
 n=`expr $n + 1`
-echo_i "checking COOKIE token returned to empty COOKIE option ($n)"
+echo_i "checking COOKIE token is returned to empty COOKIE option ($n)"
 ret=0
-$DIG $DIGOPTS +qr +cookie version.bind txt ch @10.53.0.1 > dig.out.test$n
+$DIG $DIGOPTS +cookie version.bind txt ch @10.53.0.1 > dig.out.test$n
 grep COOKIE: dig.out.test$n > /dev/null || ret=1
 grep "status: NOERROR" dig.out.test$n > /dev/null || ret=1
 if [ $ret != 0 ]; then echo_i "failed"; fi
 status=`expr $status + $ret`
 
+n=`expr $n + 1`
+echo_i "checking COOKIE is not returned when answer-cookie is false ($n)"
+ret=0
+$DIG $DIGOPTS +cookie version.bind txt ch @10.53.0.7 > dig.out.test$n
+grep COOKIE: dig.out.test$n > /dev/null && ret=1
+grep "status: NOERROR" dig.out.test$n > /dev/null || ret=1
+if [ $ret != 0 ]; then echo_i "failed"; fi
+status=`expr $status + $ret`
+
 n=`expr $n + 1`
 echo_i "checking response size without COOKIE ($n)"
 ret=0

diff --git a/util/copyrights b/util/copyrights
index 56895425e6e8b28cba0df70baa5c8a20e6991364..02f0c2a5213b57a2addd5bd04be79d0fb7caf878 100644 (file)
--- a/util/copyrights
+++ b/util/copyrights
@@ -867,6 +867,8 @@
 ./bin/tests/system/cookie/ns5/root.hint                ZONE    2017,2018
 ./bin/tests/system/cookie/ns6/named.conf.in    CONF-C  2017,2018
 ./bin/tests/system/cookie/ns6/root.hint                ZONE    2017,2018
+./bin/tests/system/cookie/ns7/named.conf.in    CONF-C  2018
+./bin/tests/system/cookie/ns7/root.db          ZONE    2018
 ./bin/tests/system/cookie/setup.sh             SH      2018
 ./bin/tests/system/cookie/tests.sh             SH      2014,2015,2016,2017,2018
 ./bin/tests/system/coverage/01-ksk-inactive/README     X       2013,2018