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

add a regression test for default allow-recursion settings

Browse Source
This commit is contained in:
Evan Hunt
2018-06-06 15:54:49 -07:00
committed by Ondřej Surý
parent 03ecba2cdc
commit 05f25f8970
8 changed files with 84 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
bin/tests/system/allow-query/clean.sh
View File

@@ -14,7 +14,8 @@
#
rm -f dig.out.*
rm -f ns2/named.conf ns2/controls.conf
rm -f ns*/named.conf
rm -f ns2/controls.conf
rm -f */named.memstats
rm -f ns*/named.lock
rm -f ns*/named.run ns*/named.run.prev

23
bin/tests/system/allow-query/ns1/named.conf.in Normal file
View File

@@ -0,0 +1,23 @@
/*
* 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 {
port @PORT@;
pid-file "named.pid";
listen-on { 10.53.0.1; };
listen-on-v6 { none; };
recursion no;
};
zone "." {
type master;
file "root.db";
};

16
bin/tests/system/allow-query/ns1/root.db Normal file
View File

@@ -0,0 +1,16 @@
; 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.
$TTL 300
@ SOA ns1. hostmaster.localhost. 1 3600 1200 604800 3600
NS ns1.
ns1. A 10.53.0.1
normal.example. NS ns2.normal.example.
ns2.normal.example. A 10.53.0.2

2
bin/tests/system/allow-query/ns3/named.args Normal file
View File

@@ -0,0 +1,2 @@
# this server only has 127.0.0.1 in its localhost/localnets ACLs
-m record,size,mctx -c named.conf -d 99 -X named.lock -g -T clienttest -T fixedlocal

24
bin/tests/system/allow-query/ns3/named.conf.in Normal file
View File

@@ -0,0 +1,24 @@
/*
* 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 {
port @PORT@;
pid-file "named.pid";
listen-on { 10.53.0.3; };
listen-on-v6 { none; };
recursion yes;
dnssec-validation no;
};
zone "." {
type hint;
file "../../common/root.hint";
};

2
bin/tests/system/allow-query/setup.sh
View File

@@ -13,4 +13,6 @@ SYSTEMTESTTOP=..
. $SYSTEMTESTTOP/conf.sh
copy_setports ../common/controls.conf.in ns2/controls.conf
copy_setports ns1/named.conf.in ns1/named.conf
copy_setports ns2/named01.conf.in ns2/named.conf
copy_setports ns3/named.conf.in ns3/named.conf

11
bin/tests/system/allow-query/tests.sh
View File

@@ -602,5 +602,16 @@ grep '^a.aclnotallow.example' dig.out.ns2.2.$n > /dev/null && ret=1
if [ $ret != 0 ]; then echo_i "failed"; fi
status=`expr $status + $ret`
# Test 58 - allow-recursion inheritance
n=`expr $n + 1`
echo_i "test $n: default recursion configuration"
ret=0
$DIG -p ${PORT} @10.53.0.3 -b 127.0.0.1 a.normal.example a > dig.out.ns3.1.$n
grep 'status: NOERROR' dig.out.ns3.1.$n > /dev/null || ret=1
$DIG -p ${PORT} @10.53.0.3 -b 10.53.0.1 a.normal.example a > dig.out.ns3.2.$n
grep 'status: REFUSED' dig.out.ns3.2.$n > /dev/null || ret=1
if [ $ret != 0 ]; then echo_i "failed"; fi
status=`expr $status + $ret`
echo_i "exit status: $status"
[ $status -eq 0 ] || exit 1

4
util/copyrights
View File

@@ -461,6 +461,8 @@
./bin/tests/system/addzone/tests.sh SH 2010,2011,2012,2013,2014,2015,2016,2017,2018
./bin/tests/system/allow-query/.gitignore X 2018
./bin/tests/system/allow-query/clean.sh SH 2010,2012,2014,2015,2016,2018
./bin/tests/system/allow-query/ns1/named.conf.in CONF-C 2018
./bin/tests/system/allow-query/ns1/root.db ZONE 2018
./bin/tests/system/allow-query/ns2/generic.db ZONE 2018
./bin/tests/system/allow-query/ns2/named01.conf.in CONF-C 2010,2016,2018
./bin/tests/system/allow-query/ns2/named02.conf.in CONF-C 2010,2016,2018
@@ -494,6 +496,8 @@
./bin/tests/system/allow-query/ns2/named55.conf.in CONF-C 2010,2016,2018
./bin/tests/system/allow-query/ns2/named56.conf.in CONF-C 2010,2016,2018
./bin/tests/system/allow-query/ns2/named57.conf.in CONF-C 2013,2016,2018
./bin/tests/system/allow-query/ns3/named.args X 2018
./bin/tests/system/allow-query/ns3/named.conf.in CONF-C 2018
./bin/tests/system/allow-query/setup.sh SH 2010,2012,2016,2018
./bin/tests/system/allow-query/tests.sh SH 2010,2012,2013,2016,2018
./bin/tests/system/ans.pl PERL 2011,2012,2014,2016,2017,2018