]> git.ipfire.org Git - thirdparty/bind9.git/commitdiff
Backport missing "legacy" system test checks
authorMichał Kępień <michal@isc.org>
Fri, 31 May 2019 10:43:31 +0000 (12:43 +0200)
committerMichał Kępień <michal@isc.org>
Fri, 31 May 2019 10:43:31 +0000 (12:43 +0200)
Backport "legacy" system test checks which are present in master and
v9_14 branches, but missing in the v9_11 branch, in order to improve the
consistency of this test across all maintained branches.  Note that the
"ednsnotimp" check is expected to succeed with 9.11 whereas it is
expected to fail with 9.14 and later versions.

14 files changed:
bin/tests/system/legacy/clean.sh
bin/tests/system/legacy/ns1/root.db
bin/tests/system/legacy/ns10/ednsrefused.db [new file with mode: 0644]
bin/tests/system/legacy/ns10/named.conf.in [new file with mode: 0644]
bin/tests/system/legacy/ns10/named.ednsrefused [new file with mode: 0644]
bin/tests/system/legacy/ns8/ednsformerr.db [new file with mode: 0644]
bin/tests/system/legacy/ns8/named.conf.in [new file with mode: 0644]
bin/tests/system/legacy/ns8/named.ednsformerr [new file with mode: 0644]
bin/tests/system/legacy/ns9/ednsnotimp.db [new file with mode: 0644]
bin/tests/system/legacy/ns9/named.conf.in [new file with mode: 0644]
bin/tests/system/legacy/ns9/named.ednsnotimp [new file with mode: 0644]
bin/tests/system/legacy/setup.sh
bin/tests/system/legacy/tests.sh
util/copyrights

index 50237dc5a3a8833f3f0819aace84ddb42ef38995..84605d324f4613a08e5e48e96a04ce8406505972 100644 (file)
@@ -8,9 +8,9 @@
 # information regarding copyright ownership.
 
 rm -f dig.out.*
-rm -f ns?/named.conf
-rm -f ns?/named.memstats
-rm -f ns?/named.run
+rm -f ns*/named.conf
+rm -f ns*/named.memstats
+rm -f ns*/named.run
 rm -f ns*/named.lock
 
 # build.sh
index 78ae65b8a1b9fee14a37502ea6a4eb10b3179587..e4889a8f2a503dac6262a0128ed1cb733e75e1a9 100644 (file)
@@ -23,3 +23,9 @@ edns512.              NS      ns.edns512.
 ns.edns512.            A       10.53.0.6
 edns512-notcp.         NS      ns.edns512-notcp.
 ns.edns512-notcp.      A       10.53.0.7
+ednsformerr.           NS      ns.ednsformerr.
+ns.ednsformerr.                A       10.53.0.8
+ednsnotimp.            NS      ns.ednsnotimp.
+ns.ednsnotimp.         A       10.53.0.9
+ednsrefused.           NS      ns.ednsrefused.
+ns.ednsrefused.                A       10.53.0.10
diff --git a/bin/tests/system/legacy/ns10/ednsrefused.db b/bin/tests/system/legacy/ns10/ednsrefused.db
new file mode 100644 (file)
index 0000000..caac70d
--- /dev/null
@@ -0,0 +1,12 @@
+; 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.
+
+@      60      SOA     ns marka.isc.org. 1 0 0 0 0
+@      60      NS      ns
+ns     60      A       10.53.0.8
diff --git a/bin/tests/system/legacy/ns10/named.conf.in b/bin/tests/system/legacy/ns10/named.conf.in
new file mode 100644 (file)
index 0000000..e7bf8b2
--- /dev/null
@@ -0,0 +1,27 @@
+/*
+ * 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.10;
+       notify-source 10.53.0.10;
+       transfer-source 10.53.0.10;
+       port @PORT@;
+       pid-file "named.pid";
+       listen-on { 10.53.0.10; };
+       listen-on-v6 { none; };
+       recursion no;
+       dnssec-validation no;
+};
+
+zone "ednsrefused" {
+       type master;
+       file "ednsrefused.db";
+};
diff --git a/bin/tests/system/legacy/ns10/named.ednsrefused b/bin/tests/system/legacy/ns10/named.ednsrefused
new file mode 100644 (file)
index 0000000..6b43ac0
--- /dev/null
@@ -0,0 +1 @@
+ednsrefused
diff --git a/bin/tests/system/legacy/ns8/ednsformerr.db b/bin/tests/system/legacy/ns8/ednsformerr.db
new file mode 100644 (file)
index 0000000..caac70d
--- /dev/null
@@ -0,0 +1,12 @@
+; 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.
+
+@      60      SOA     ns marka.isc.org. 1 0 0 0 0
+@      60      NS      ns
+ns     60      A       10.53.0.8
diff --git a/bin/tests/system/legacy/ns8/named.conf.in b/bin/tests/system/legacy/ns8/named.conf.in
new file mode 100644 (file)
index 0000000..dc4ce6b
--- /dev/null
@@ -0,0 +1,27 @@
+/*
+ * 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.8;
+       notify-source 10.53.0.8;
+       transfer-source 10.53.0.8;
+       port @PORT@;
+       pid-file "named.pid";
+       listen-on { 10.53.0.8; };
+       listen-on-v6 { none; };
+       recursion no;
+       dnssec-validation no;
+};
+
+zone "ednsformerr" {
+       type master;
+       file "ednsformerr.db";
+};
diff --git a/bin/tests/system/legacy/ns8/named.ednsformerr b/bin/tests/system/legacy/ns8/named.ednsformerr
new file mode 100644 (file)
index 0000000..e35cb02
--- /dev/null
@@ -0,0 +1 @@
+ednsformerr
diff --git a/bin/tests/system/legacy/ns9/ednsnotimp.db b/bin/tests/system/legacy/ns9/ednsnotimp.db
new file mode 100644 (file)
index 0000000..caac70d
--- /dev/null
@@ -0,0 +1,12 @@
+; 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.
+
+@      60      SOA     ns marka.isc.org. 1 0 0 0 0
+@      60      NS      ns
+ns     60      A       10.53.0.8
diff --git a/bin/tests/system/legacy/ns9/named.conf.in b/bin/tests/system/legacy/ns9/named.conf.in
new file mode 100644 (file)
index 0000000..34ac3af
--- /dev/null
@@ -0,0 +1,27 @@
+/*
+ * 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.9;
+       notify-source 10.53.0.9;
+       transfer-source 10.53.0.9;
+       port @PORT@;
+       pid-file "named.pid";
+       listen-on { 10.53.0.9; };
+       listen-on-v6 { none; };
+       recursion no;
+       dnssec-validation no;
+};
+
+zone "ednsnotimp" {
+       type master;
+       file "ednsnotimp.db";
+};
diff --git a/bin/tests/system/legacy/ns9/named.ednsnotimp b/bin/tests/system/legacy/ns9/named.ednsnotimp
new file mode 100644 (file)
index 0000000..4e6424d
--- /dev/null
@@ -0,0 +1 @@
+ednsnotimp
index b41da9eb86156c88c38329914916b750e0174df0..6cf257b509061d49d3ae42544af3acded61d9315 100644 (file)
@@ -22,3 +22,6 @@ 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
+copy_setports ns8/named.conf.in ns8/named.conf
+copy_setports ns9/named.conf.in ns9/named.conf
+copy_setports ns10/named.conf.in ns10/named.conf
index ce22016935bc643eaa0826090de5f31d206a162b..efd74df5b015a1280fc9adc3ed7a5429aaf73090 100755 (executable)
@@ -44,6 +44,63 @@ resolution_fails() {
 status=0
 n=0
 
+n=`expr $n + 1`
+echo_i "checking formerr edns server setup ($n)"
+ret=0
+$DIG $DIGOPTS +edns @10.53.0.8 ednsformerr soa > dig.out.1.test$n || ret=1
+grep "status: FORMERR" dig.out.1.test$n > /dev/null || ret=1
+grep "EDNS: version:" dig.out.1.test$n > /dev/null && ret=1
+$DIG $DIGOPTS +noedns @10.53.0.8 ednsformerr soa > dig.out.2.test$n || ret=1
+grep "status: NOERROR" dig.out.2.test$n > /dev/null || ret=1
+grep "EDNS: version:" dig.out.2.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 recursive lookup to formerr edns server succeeds ($n)"
+ret=0
+resolution_succeeds ednsformerr. || ret=1
+if [ $ret != 0 ]; then echo_i "failed"; fi
+status=`expr $status + $ret`
+
+n=`expr $n + 1`
+echo_i "checking notimp edns server setup ($n)"
+ret=0
+$DIG $DIGOPTS +edns @10.53.0.9 ednsnotimp soa > dig.out.1.test$n || ret=1
+grep "status: NOTIMP" dig.out.1.test$n > /dev/null || ret=1
+grep "EDNS: version:" dig.out.1.test$n > /dev/null && ret=1
+$DIG $DIGOPTS +noedns @10.53.0.9 ednsnotimp soa > dig.out.2.test$n || ret=1
+grep "status: NOERROR" dig.out.2.test$n > /dev/null || ret=1
+grep "EDNS: version:" dig.out.2.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 recursive lookup to notimp edns server succeeds ($n)"
+ret=0
+resolution_succeeds ednsnotimp. || ret=1
+if [ $ret != 0 ]; then echo_i "failed"; fi
+status=`expr $status + $ret`
+
+n=`expr $n + 1`
+echo_i "checking refused edns server setup ($n)"
+ret=0
+$DIG $DIGOPTS +edns @10.53.0.10 ednsrefused soa > dig.out.1.test$n || ret=1
+grep "status: REFUSED" dig.out.1.test$n > /dev/null || ret=1
+grep "EDNS: version:" dig.out.1.test$n > /dev/null && ret=1
+$DIG $DIGOPTS +noedns @10.53.0.10 ednsrefused soa > dig.out.2.test$n || ret=1
+grep "status: NOERROR" dig.out.2.test$n > /dev/null || ret=1
+grep "EDNS: version:" dig.out.2.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 recursive lookup to refused edns server fails ($n)"
+ret=0
+resolution_fails ednsrefused. || ret=1
+if [ $ret != 0 ]; then echo_i "failed"; fi
+status=`expr $status + $ret`
+
 n=`expr $n + 1`
 echo_i "checking drop edns server setup ($n)"
 ret=0
index f7e0702f6681b3f5a80531e40be3228be3f09598..d37990d59e0b15a257390edc45665b0f2afbc4ed 100644 (file)
 ./bin/tests/system/legacy/ns1/named2.conf.in   CONF-C  2018,2019
 ./bin/tests/system/legacy/ns1/root.db          ZONE    2014,2016,2018,2019
 ./bin/tests/system/legacy/ns1/trusted.conf     X       2014,2018,2019
+./bin/tests/system/legacy/ns10/ednsrefused.db  ZONE    2018,2019
+./bin/tests/system/legacy/ns10/named.conf.in   CONF-C  2018,2019
+./bin/tests/system/legacy/ns10/named.ednsrefused       X       2018,2019
 ./bin/tests/system/legacy/ns2/dropedns.db      ZONE    2014,2016,2018,2019
 ./bin/tests/system/legacy/ns2/named.conf.in    CONF-C  2018,2019
 ./bin/tests/system/legacy/ns2/named.dropedns   X       2014,2018,2019
 ./bin/tests/system/legacy/ns7/named.conf.in    CONF-C  2018,2019
 ./bin/tests/system/legacy/ns7/named.notcp      X       2014,2018,2019
 ./bin/tests/system/legacy/ns7/sign.sh          SH      2014,2016,2018,2019
+./bin/tests/system/legacy/ns8/ednsformerr.db   ZONE    2018,2019
+./bin/tests/system/legacy/ns8/named.conf.in    CONF-C  2018,2019
+./bin/tests/system/legacy/ns8/named.ednsformerr        X       2018,2019
+./bin/tests/system/legacy/ns9/ednsnotimp.db    ZONE    2018,2019
+./bin/tests/system/legacy/ns9/named.conf.in    CONF-C  2018,2019
+./bin/tests/system/legacy/ns9/named.ednsnotimp X       2018,2019
 ./bin/tests/system/legacy/setup.sh             SH      2014,2016,2018,2019
 ./bin/tests/system/legacy/tests.sh             SH      2014,2015,2016,2018,2019
 ./bin/tests/system/limits/clean.sh             SH      2000,2001,2004,2007,2012,2014,2015,2016,2018,2019