[rt46602] Convert allow_query to dynamic port

This commit is contained in:
Ondřej Surý 2017-10-18 13:38:20 +02:00 committed by Stephen Morris
parent f83ebd34b9
commit 992a2bafec
37 changed files with 151 additions and 139 deletions

View file

@ -45,11 +45,16 @@ feature-test@EXEEXT@: feature-test.@O@
check: test
test: subdirs
TESTS = allow_query serve-stale
test: subdirs $(TESTS)
if test -f ./runall.sh; then $(SHELL) ./runall.sh; fi
server-stale:
$(SHELL) ./run.sh -p 5310 -c 9954 server-stale
serve-stale:
$(SHELL) ./run.sh -p 5304 -c 9954 $@
allow_query:
$(SHELL) ./run.sh -p 5305 -c 9955 $@
testclean clean distclean::
if test -f ./cleanall.sh; then sh ./cleanall.sh; fi
@ -67,4 +72,4 @@ install::
uninstall::
.PHONY: server-stale
.PHONY: $(TESTS)

View file

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

View file

@ -11,14 +11,14 @@
controls { /* empty */ };
options {
port 5300;
port @PORT@;
pid-file "named.pid";
listen-on { 10.53.0.2; };
listen-on-v6 { none; };
recursion no;
};
include "../../common/controls.conf";
include "controls.conf";
zone "." {
type hint;

View file

@ -11,7 +11,7 @@
controls { /* empty */ };
options {
port 5300;
port @PORT@;
pid-file "named.pid";
listen-on { 10.53.0.2; };
listen-on-v6 { none; };
@ -19,7 +19,7 @@ options {
allow-query { any; };
};
include "../../common/controls.conf";
include "controls.conf";
zone "." {
type hint;

View file

@ -11,7 +11,7 @@
controls { /* empty */ };
options {
port 5300;
port @PORT@;
pid-file "named.pid";
listen-on { 10.53.0.2; };
listen-on-v6 { none; };
@ -19,7 +19,7 @@ options {
allow-query { none; };
};
include "../../common/controls.conf";
include "controls.conf";
zone "." {
type hint;

View file

@ -11,7 +11,7 @@
controls { /* empty */ };
options {
port 5300;
port @PORT@;
pid-file "named.pid";
listen-on { 10.53.0.2; };
listen-on-v6 { none; };
@ -19,7 +19,7 @@ options {
allow-query { 10.53.0.2; };
};
include "../../common/controls.conf";
include "controls.conf";
zone "." {
type hint;

View file

@ -11,7 +11,7 @@
controls { /* empty */ };
options {
port 5300;
port @PORT@;
pid-file "named.pid";
listen-on { 10.53.0.2; };
listen-on-v6 { none; };
@ -19,7 +19,7 @@ options {
allow-query { 10.53.0.1; };
};
include "../../common/controls.conf";
include "controls.conf";
zone "." {
type hint;

View file

@ -11,7 +11,7 @@
controls { /* empty */ };
options {
port 5300;
port @PORT@;
pid-file "named.pid";
listen-on { 10.53.0.2; };
listen-on-v6 { none; };
@ -19,7 +19,7 @@ options {
allow-query {! 10.53.0.2; };
};
include "../../common/controls.conf";
include "controls.conf";
zone "." {
type hint;

View file

@ -13,7 +13,7 @@ controls { /* empty */ };
acl accept { 10.53.0.2; };
options {
port 5300;
port @PORT@;
pid-file "named.pid";
listen-on { 10.53.0.2; };
listen-on-v6 { none; };
@ -21,7 +21,7 @@ options {
allow-query { accept; };
};
include "../../common/controls.conf";
include "controls.conf";
zone "." {
type hint;

View file

@ -13,7 +13,7 @@ controls { /* empty */ };
acl accept { 10.53.0.1; };
options {
port 5300;
port @PORT@;
pid-file "named.pid";
listen-on { 10.53.0.2; };
listen-on-v6 { none; };
@ -21,7 +21,7 @@ options {
allow-query { accept; };
};
include "../../common/controls.conf";
include "controls.conf";
zone "." {
type hint;

View file

@ -13,7 +13,7 @@ controls { /* empty */ };
acl accept { 10.53.0.2; };
options {
port 5300;
port @PORT@;
pid-file "named.pid";
listen-on { 10.53.0.2; };
listen-on-v6 { none; };
@ -21,7 +21,7 @@ options {
allow-query {! accept; };
};
include "../../common/controls.conf";
include "controls.conf";
zone "." {
type hint;

View file

@ -17,7 +17,7 @@ key one {
};
options {
port 5300;
port @PORT@;
pid-file "named.pid";
listen-on { 10.53.0.2; };
listen-on-v6 { none; };
@ -25,7 +25,7 @@ options {
allow-query { key one; };
};
include "../../common/controls.conf";
include "controls.conf";
zone "." {
type hint;

View file

@ -23,7 +23,7 @@ key two {
options {
port 5300;
port @PORT@;
pid-file "named.pid";
listen-on { 10.53.0.2; };
listen-on-v6 { none; };
@ -31,7 +31,7 @@ options {
allow-query { key one; };
};
include "../../common/controls.conf";
include "controls.conf";
zone "." {
type hint;

View file

@ -16,7 +16,7 @@ key one {
};
options {
port 5300;
port @PORT@;
pid-file "named.pid";
listen-on { 10.53.0.2; };
listen-on-v6 { none; };
@ -24,7 +24,7 @@ options {
allow-query {! key one; };
};
include "../../common/controls.conf";
include "controls.conf";
zone "." {
type hint;

View file

@ -11,14 +11,14 @@
controls { /* empty */ };
options {
port 5300;
port @PORT@;
pid-file "named.pid";
listen-on { 10.53.0.2; };
listen-on-v6 { none; };
recursion no;
};
include "../../common/controls.conf";
include "controls.conf";
view "internal" {

View file

@ -11,14 +11,14 @@
controls { /* empty */ };
options {
port 5300;
port @PORT@;
pid-file "named.pid";
listen-on { 10.53.0.2; };
listen-on-v6 { none; };
recursion no;
};
include "../../common/controls.conf";
include "controls.conf";
view "internal" {
@ -34,4 +34,4 @@ view "internal" {
file "normal.db";
};
};
};

View file

@ -11,14 +11,14 @@
controls { /* empty */ };
options {
port 5300;
port @PORT@;
pid-file "named.pid";
listen-on { 10.53.0.2; };
listen-on-v6 { none; };
recursion no;
};
include "../../common/controls.conf";
include "controls.conf";
view "internal" {

View file

@ -11,14 +11,14 @@
controls { /* empty */ };
options {
port 5300;
port @PORT@;
pid-file "named.pid";
listen-on { 10.53.0.2; };
listen-on-v6 { none; };
recursion no;
};
include "../../common/controls.conf";
include "controls.conf";
view "internal" {
@ -33,4 +33,4 @@ view "internal" {
type master;
file "normal.db";
};
};
};

View file

@ -11,14 +11,14 @@
controls { /* empty */ };
options {
port 5300;
port @PORT@;
pid-file "named.pid";
listen-on { 10.53.0.2; };
listen-on-v6 { none; };
recursion no;
};
include "../../common/controls.conf";
include "controls.conf";
view "internal" {
@ -33,4 +33,4 @@ view "internal" {
type master;
file "normal.db";
};
};
};

View file

@ -11,14 +11,14 @@
controls { /* empty */ };
options {
port 5300;
port @PORT@;
pid-file "named.pid";
listen-on { 10.53.0.2; };
listen-on-v6 { none; };
recursion no;
};
include "../../common/controls.conf";
include "controls.conf";
view "internal" {

View file

@ -13,14 +13,14 @@ controls { /* empty */ };
acl accept { 10.53.0.2; };
options {
port 5300;
port @PORT@;
pid-file "named.pid";
listen-on { 10.53.0.2; };
listen-on-v6 { none; };
recursion no;
};
include "../../common/controls.conf";
include "controls.conf";
view "internal" {

View file

@ -13,14 +13,14 @@ controls { /* empty */ };
acl accept { 10.53.0.1; };
options {
port 5300;
port @PORT@;
pid-file "named.pid";
listen-on { 10.53.0.2; };
listen-on-v6 { none; };
recursion no;
};
include "../../common/controls.conf";
include "controls.conf";
view "internal" {

View file

@ -13,14 +13,14 @@ controls { /* empty */ };
acl accept { 10.53.0.2; };
options {
port 5300;
port @PORT@;
pid-file "named.pid";
listen-on { 10.53.0.2; };
listen-on-v6 { none; };
recursion no;
};
include "../../common/controls.conf";
include "controls.conf";
view "internal" {

View file

@ -17,14 +17,14 @@ key one {
};
options {
port 5300;
port @PORT@;
pid-file "named.pid";
listen-on { 10.53.0.2; };
listen-on-v6 { none; };
recursion no;
};
include "../../common/controls.conf";
include "controls.conf";
view "internal" {

View file

@ -23,7 +23,7 @@ key two {
options {
port 5300;
port @PORT@;
pid-file "named.pid";
listen-on { 10.53.0.2; };
listen-on-v6 { none; };
@ -31,7 +31,7 @@ options {
allow-query { key one; };
};
include "../../common/controls.conf";
include "controls.conf";
view "internal" {
@ -46,4 +46,4 @@ view "internal" {
type master;
file "normal.db";
};
};
};

View file

@ -16,14 +16,14 @@ key one {
};
options {
port 5300;
port @PORT@;
pid-file "named.pid";
listen-on { 10.53.0.2; };
listen-on-v6 { none; };
recursion no;
};
include "../../common/controls.conf";
include "controls.conf";
view "internal" {

View file

@ -11,7 +11,7 @@
controls { /* empty */ };
options {
port 5300;
port @PORT@;
pid-file "named.pid";
listen-on { 10.53.0.2; };
listen-on-v6 { none; };
@ -19,7 +19,7 @@ options {
allow-query { none; };
};
include "../../common/controls.conf";
include "controls.conf";
view "internal" {

View file

@ -11,7 +11,7 @@
controls { /* empty */ };
options {
port 5300;
port @PORT@;
pid-file "named.pid";
listen-on { 10.53.0.2; };
listen-on-v6 { none; };
@ -19,7 +19,7 @@ options {
allow-query { any; };
};
include "../../common/controls.conf";
include "controls.conf";
view "internal" {

View file

@ -25,14 +25,14 @@ key two {
};
options {
port 5300;
port @PORT@;
pid-file "named.pid";
listen-on { 10.53.0.2; };
listen-on-v6 { none; };
recursion no;
};
include "../../common/controls.conf";
include "controls.conf";
zone "." {
type hint;

View file

@ -11,7 +11,7 @@
controls { /* empty */ };
options {
port 5300;
port @PORT@;
pid-file "named.pid";
listen-on { 10.53.0.2; };
listen-on-v6 { none; };
@ -19,7 +19,7 @@ options {
allow-query { none; };
};
include "../../common/controls.conf";
include "controls.conf";
zone "." {
type hint;

View file

@ -11,7 +11,7 @@
controls { /* empty */ };
options {
port 5300;
port @PORT@;
pid-file "named.pid";
listen-on { 10.53.0.2; };
listen-on-v6 { none; };
@ -19,7 +19,7 @@ options {
allow-query { any; };
};
include "../../common/controls.conf";
include "controls.conf";
zone "." {
type hint;

View file

@ -11,14 +11,14 @@
controls { /* empty */ };
options {
port 5300;
port @PORT@;
pid-file "named.pid";
listen-on { 10.53.0.2; };
listen-on-v6 { none; };
recursion no;
};
include "../../common/controls.conf";
include "controls.conf";
view "internal" {

View file

@ -11,14 +11,14 @@
controls { /* empty */ };
options {
port 5300;
port @PORT@;
pid-file "named.pid";
listen-on { 10.53.0.2; };
listen-on-v6 { none; };
recursion no;
};
include "../../common/controls.conf";
include "controls.conf";
view "internal" {

View file

@ -9,14 +9,14 @@
controls { /* empty */ };
options {
port 5300;
port @PORT@;
pid-file "named.pid";
listen-on { 10.53.0.2; };
listen-on-v6 { none; };
recursion no;
};
include "../../common/controls.conf";
include "controls.conf";
view "internal" {
allow-query-on { any; };

View file

@ -1,4 +1,4 @@
#!/bin/sh
#!/bin/sh -e
#
# Copyright (C) 2010, 2012, 2016 Internet Systems Consortium, Inc. ("ISC")
#
@ -8,4 +8,8 @@
# $Id: setup.sh,v 1.2 2010/11/16 01:37:36 sar Exp $
cp -f ns2/named01.conf ns2/named.conf
. ../getopts.sh
sed -e "s/@PORT@/${port}/g;s/@CONTROLPORT@/${controlport}/g;" < ../common/controls.conf.in > ns2/controls.conf
sed -e "s/@PORT@/${port}/g;s/@CONTROLPORT@/${controlport}/g;" < ns2/named01.conf.in > ns2/named.conf
echo "${port}" > ns2/named.port

View file

@ -52,7 +52,10 @@
SYSTEMTESTTOP=..
. $SYSTEMTESTTOP/conf.sh
DIGOPTS="+tcp +nosea +nostat +nocmd +norec +noques +noauth +noadd +nostats +dnssec -p 5300"
. ../getopts.sh
DIGOPTS="+tcp +nosea +nostat +nocmd +norec +noques +noauth +noadd +nostats +dnssec -p ${port}"
RNDCCMD="$RNDC -c ../common/rndc.conf -s 10.53.0.2 -p ${controlport}"
status=0
n=0
@ -68,8 +71,8 @@ status=`expr $status + $ret`
# Test 2 - explicit any, query allowed
n=`expr $n + 1`
cp -f ns2/named02.conf ns2/named.conf
$RNDC -c ../common/rndc.conf -s 10.53.0.2 -p 9953 reload 2>&1 | sed 's/^/I:ns2 /'
sed -e "s/@PORT@/${port}/g;s/@CONTROLPORT@/${controlport}/g;" < ns2/named02.conf.in > ns2/named.conf
$RNDCCMD reload 2>&1 | sed 's/^/I:ns2 /'
sleep 5
echo "I:test $n: explicit any - query allowed"
@ -82,8 +85,8 @@ status=`expr $status + $ret`
# Test 3 - none, query refused
n=`expr $n + 1`
cp -f ns2/named03.conf ns2/named.conf
$RNDC -c ../common/rndc.conf -s 10.53.0.2 -p 9953 reload 2>&1 | sed 's/^/I:ns2 /'
sed -e "s/@PORT@/${port}/g;s/@CONTROLPORT@/${controlport}/g;" < ns2/named03.conf.in > ns2/named.conf
$RNDCCMD reload 2>&1 | sed 's/^/I:ns2 /'
sleep 5
echo "I:test $n: none - query refused"
@ -96,8 +99,8 @@ status=`expr $status + $ret`
# Test 4 - address allowed, query allowed
n=`expr $n + 1`
cp -f ns2/named04.conf ns2/named.conf
$RNDC -c ../common/rndc.conf -s 10.53.0.2 -p 9953 reload 2>&1 | sed 's/^/I:ns2 /'
sed -e "s/@PORT@/${port}/g;s/@CONTROLPORT@/${controlport}/g;" < ns2/named04.conf.in > ns2/named.conf
$RNDCCMD reload 2>&1 | sed 's/^/I:ns2 /'
sleep 5
echo "I:test $n: address allowed - query allowed"
@ -110,8 +113,8 @@ status=`expr $status + $ret`
# Test 5 - address not allowed, query refused
n=`expr $n + 1`
cp -f ns2/named05.conf ns2/named.conf
$RNDC -c ../common/rndc.conf -s 10.53.0.2 -p 9953 reload 2>&1 | sed 's/^/I:ns2 /'
sed -e "s/@PORT@/${port}/g;s/@CONTROLPORT@/${controlport}/g;" < ns2/named05.conf.in > ns2/named.conf
$RNDCCMD reload 2>&1 | sed 's/^/I:ns2 /'
sleep 5
echo "I:test $n: address not allowed - query refused"
@ -124,8 +127,8 @@ status=`expr $status + $ret`
# Test 6 - address disallowed, query refused
n=`expr $n + 1`
cp -f ns2/named06.conf ns2/named.conf
$RNDC -c ../common/rndc.conf -s 10.53.0.2 -p 9953 reload 2>&1 | sed 's/^/I:ns2 /'
sed -e "s/@PORT@/${port}/g;s/@CONTROLPORT@/${controlport}/g;" < ns2/named06.conf.in > ns2/named.conf
$RNDCCMD reload 2>&1 | sed 's/^/I:ns2 /'
sleep 5
echo "I:test $n: address disallowed - query refused"
@ -138,8 +141,8 @@ status=`expr $status + $ret`
# Test 7 - acl allowed, query allowed
n=`expr $n + 1`
cp -f ns2/named07.conf ns2/named.conf
$RNDC -c ../common/rndc.conf -s 10.53.0.2 -p 9953 reload 2>&1 | sed 's/^/I:ns2 /'
sed -e "s/@PORT@/${port}/g;s/@CONTROLPORT@/${controlport}/g;" < ns2/named07.conf.in > ns2/named.conf
$RNDCCMD reload 2>&1 | sed 's/^/I:ns2 /'
sleep 5
echo "I:test $n: acl allowed - query allowed"
@ -152,8 +155,8 @@ status=`expr $status + $ret`
# Test 8 - acl not allowed, query refused
n=`expr $n + 1`
cp -f ns2/named08.conf ns2/named.conf
$RNDC -c ../common/rndc.conf -s 10.53.0.2 -p 9953 reload 2>&1 | sed 's/^/I:ns2 /'
sed -e "s/@PORT@/${port}/g;s/@CONTROLPORT@/${controlport}/g;" < ns2/named08.conf.in > ns2/named.conf
$RNDCCMD reload 2>&1 | sed 's/^/I:ns2 /'
sleep 5
echo "I:test $n: acl not allowed - query refused"
@ -167,8 +170,8 @@ status=`expr $status + $ret`
# Test 9 - acl disallowed, query refused
n=`expr $n + 1`
cp -f ns2/named09.conf ns2/named.conf
$RNDC -c ../common/rndc.conf -s 10.53.0.2 -p 9953 reload 2>&1 | sed 's/^/I:ns2 /'
sed -e "s/@PORT@/${port}/g;s/@CONTROLPORT@/${controlport}/g;" < ns2/named09.conf.in > ns2/named.conf
$RNDCCMD reload 2>&1 | sed 's/^/I:ns2 /'
sleep 5
echo "I:test $n: acl disallowed - query refused"
@ -181,8 +184,8 @@ status=`expr $status + $ret`
# Test 10 - key allowed, query allowed
n=`expr $n + 1`
cp -f ns2/named10.conf ns2/named.conf
$RNDC -c ../common/rndc.conf -s 10.53.0.2 -p 9953 reload 2>&1 | sed 's/^/I:ns2 /'
sed -e "s/@PORT@/${port}/g;s/@CONTROLPORT@/${controlport}/g;" < ns2/named10.conf.in > ns2/named.conf
$RNDCCMD reload 2>&1 | sed 's/^/I:ns2 /'
sleep 5
echo "I:test $n: key allowed - query allowed"
@ -195,8 +198,8 @@ status=`expr $status + $ret`
# Test 11 - key not allowed, query refused
n=`expr $n + 1`
cp -f ns2/named11.conf ns2/named.conf
$RNDC -c ../common/rndc.conf -s 10.53.0.2 -p 9953 reload 2>&1 | sed 's/^/I:ns2 /'
sed -e "s/@PORT@/${port}/g;s/@CONTROLPORT@/${controlport}/g;" < ns2/named11.conf.in > ns2/named.conf
$RNDCCMD reload 2>&1 | sed 's/^/I:ns2 /'
sleep 5
echo "I:test $n: key not allowed - query refused"
@ -209,8 +212,8 @@ status=`expr $status + $ret`
# Test 12 - key disallowed, query refused
n=`expr $n + 1`
cp -f ns2/named12.conf ns2/named.conf
$RNDC -c ../common/rndc.conf -s 10.53.0.2 -p 9953 reload 2>&1 | sed 's/^/I:ns2 /'
sed -e "s/@PORT@/${port}/g;s/@CONTROLPORT@/${controlport}/g;" < ns2/named12.conf.in > ns2/named.conf
$RNDCCMD reload 2>&1 | sed 's/^/I:ns2 /'
sleep 5
echo "I:test $n: key disallowed - query refused"
@ -226,8 +229,8 @@ status=`expr $status + $ret`
n=20
# Test 21 - views default, query allowed
n=`expr $n + 1`
cp -f ns2/named21.conf ns2/named.conf
$RNDC -c ../common/rndc.conf -s 10.53.0.2 -p 9953 reload 2>&1 | sed 's/^/I:ns2 /'
sed -e "s/@PORT@/${port}/g;s/@CONTROLPORT@/${controlport}/g;" < ns2/named21.conf.in > ns2/named.conf
$RNDCCMD reload 2>&1 | sed 's/^/I:ns2 /'
sleep 5
echo "I:test $n: views default - query allowed"
@ -240,8 +243,8 @@ status=`expr $status + $ret`
# Test 22 - views explicit any, query allowed
n=`expr $n + 1`
cp -f ns2/named22.conf ns2/named.conf
$RNDC -c ../common/rndc.conf -s 10.53.0.2 -p 9953 reload 2>&1 | sed 's/^/I:ns2 /'
sed -e "s/@PORT@/${port}/g;s/@CONTROLPORT@/${controlport}/g;" < ns2/named22.conf.in > ns2/named.conf
$RNDCCMD reload 2>&1 | sed 's/^/I:ns2 /'
sleep 5
echo "I:test $n: views explicit any - query allowed"
@ -254,8 +257,8 @@ status=`expr $status + $ret`
# Test 23 - views none, query refused
n=`expr $n + 1`
cp -f ns2/named23.conf ns2/named.conf
$RNDC -c ../common/rndc.conf -s 10.53.0.2 -p 9953 reload 2>&1 | sed 's/^/I:ns2 /'
sed -e "s/@PORT@/${port}/g;s/@CONTROLPORT@/${controlport}/g;" < ns2/named23.conf.in > ns2/named.conf
$RNDCCMD reload 2>&1 | sed 's/^/I:ns2 /'
sleep 5
echo "I:test $n: views none - query refused"
@ -268,8 +271,8 @@ status=`expr $status + $ret`
# Test 24 - views address allowed, query allowed
n=`expr $n + 1`
cp -f ns2/named24.conf ns2/named.conf
$RNDC -c ../common/rndc.conf -s 10.53.0.2 -p 9953 reload 2>&1 | sed 's/^/I:ns2 /'
sed -e "s/@PORT@/${port}/g;s/@CONTROLPORT@/${controlport}/g;" < ns2/named24.conf.in > ns2/named.conf
$RNDCCMD reload 2>&1 | sed 's/^/I:ns2 /'
sleep 5
echo "I:test $n: views address allowed - query allowed"
@ -282,8 +285,8 @@ status=`expr $status + $ret`
# Test 25 - views address not allowed, query refused
n=`expr $n + 1`
cp -f ns2/named25.conf ns2/named.conf
$RNDC -c ../common/rndc.conf -s 10.53.0.2 -p 9953 reload 2>&1 | sed 's/^/I:ns2 /'
sed -e "s/@PORT@/${port}/g;s/@CONTROLPORT@/${controlport}/g;" < ns2/named25.conf.in > ns2/named.conf
$RNDCCMD reload 2>&1 | sed 's/^/I:ns2 /'
sleep 5
echo "I:test $n: views address not allowed - query refused"
@ -296,8 +299,8 @@ status=`expr $status + $ret`
# Test 26 - views address disallowed, query refused
n=`expr $n + 1`
cp -f ns2/named26.conf ns2/named.conf
$RNDC -c ../common/rndc.conf -s 10.53.0.2 -p 9953 reload 2>&1 | sed 's/^/I:ns2 /'
sed -e "s/@PORT@/${port}/g;s/@CONTROLPORT@/${controlport}/g;" < ns2/named26.conf.in > ns2/named.conf
$RNDCCMD reload 2>&1 | sed 's/^/I:ns2 /'
sleep 5
echo "I:test $n: views address disallowed - query refused"
@ -310,8 +313,8 @@ status=`expr $status + $ret`
# Test 27 - views acl allowed, query allowed
n=`expr $n + 1`
cp -f ns2/named27.conf ns2/named.conf
$RNDC -c ../common/rndc.conf -s 10.53.0.2 -p 9953 reload 2>&1 | sed 's/^/I:ns2 /'
sed -e "s/@PORT@/${port}/g;s/@CONTROLPORT@/${controlport}/g;" < ns2/named27.conf.in > ns2/named.conf
$RNDCCMD reload 2>&1 | sed 's/^/I:ns2 /'
sleep 5
echo "I:test $n: views acl allowed - query allowed"
@ -324,8 +327,8 @@ status=`expr $status + $ret`
# Test 28 - views acl not allowed, query refused
n=`expr $n + 1`
cp -f ns2/named28.conf ns2/named.conf
$RNDC -c ../common/rndc.conf -s 10.53.0.2 -p 9953 reload 2>&1 | sed 's/^/I:ns2 /'
sed -e "s/@PORT@/${port}/g;s/@CONTROLPORT@/${controlport}/g;" < ns2/named28.conf.in > ns2/named.conf
$RNDCCMD reload 2>&1 | sed 's/^/I:ns2 /'
sleep 5
echo "I:test $n: views acl not allowed - query refused"
@ -338,8 +341,8 @@ status=`expr $status + $ret`
# Test 29 - views acl disallowed, query refused
n=`expr $n + 1`
cp -f ns2/named29.conf ns2/named.conf
$RNDC -c ../common/rndc.conf -s 10.53.0.2 -p 9953 reload 2>&1 | sed 's/^/I:ns2 /'
sed -e "s/@PORT@/${port}/g;s/@CONTROLPORT@/${controlport}/g;" < ns2/named29.conf.in > ns2/named.conf
$RNDCCMD reload 2>&1 | sed 's/^/I:ns2 /'
sleep 5
echo "I:test $n: views acl disallowed - query refused"
@ -352,8 +355,8 @@ status=`expr $status + $ret`
# Test 30 - views key allowed, query allowed
n=`expr $n + 1`
cp -f ns2/named30.conf ns2/named.conf
$RNDC -c ../common/rndc.conf -s 10.53.0.2 -p 9953 reload 2>&1 | sed 's/^/I:ns2 /'
sed -e "s/@PORT@/${port}/g;s/@CONTROLPORT@/${controlport}/g;" < ns2/named30.conf.in > ns2/named.conf
$RNDCCMD reload 2>&1 | sed 's/^/I:ns2 /'
sleep 5
echo "I:test $n: views key allowed - query allowed"
@ -366,8 +369,8 @@ status=`expr $status + $ret`
# Test 31 - views key not allowed, query refused
n=`expr $n + 1`
cp -f ns2/named31.conf ns2/named.conf
$RNDC -c ../common/rndc.conf -s 10.53.0.2 -p 9953 reload 2>&1 | sed 's/^/I:ns2 /'
sed -e "s/@PORT@/${port}/g;s/@CONTROLPORT@/${controlport}/g;" < ns2/named31.conf.in > ns2/named.conf
$RNDCCMD reload 2>&1 | sed 's/^/I:ns2 /'
sleep 5
echo "I:test $n: views key not allowed - query refused"
@ -380,8 +383,8 @@ status=`expr $status + $ret`
# Test 32 - views key disallowed, query refused
n=`expr $n + 1`
cp -f ns2/named32.conf ns2/named.conf
$RNDC -c ../common/rndc.conf -s 10.53.0.2 -p 9953 reload 2>&1 | sed 's/^/I:ns2 /'
sed -e "s/@PORT@/${port}/g;s/@CONTROLPORT@/${controlport}/g;" < ns2/named32.conf.in > ns2/named.conf
$RNDCCMD reload 2>&1 | sed 's/^/I:ns2 /'
sleep 5
echo "I:test $n: views key disallowed - query refused"
@ -394,8 +397,8 @@ status=`expr $status + $ret`
# Test 33 - views over options, views allow, query allowed
n=`expr $n + 1`
cp -f ns2/named33.conf ns2/named.conf
$RNDC -c ../common/rndc.conf -s 10.53.0.2 -p 9953 reload 2>&1 | sed 's/^/I:ns2 /'
sed -e "s/@PORT@/${port}/g;s/@CONTROLPORT@/${controlport}/g;" < ns2/named33.conf.in > ns2/named.conf
$RNDCCMD reload 2>&1 | sed 's/^/I:ns2 /'
sleep 5
echo "I:test $n: views over options, views allow - query allowed"
@ -408,8 +411,8 @@ status=`expr $status + $ret`
# Test 34 - views over options, views disallow, query refused
n=`expr $n + 1`
cp -f ns2/named34.conf ns2/named.conf
$RNDC -c ../common/rndc.conf -s 10.53.0.2 -p 9953 reload 2>&1 | sed 's/^/I:ns2 /'
sed -e "s/@PORT@/${port}/g;s/@CONTROLPORT@/${controlport}/g;" < ns2/named34.conf.in > ns2/named.conf
$RNDCCMD reload 2>&1 | sed 's/^/I:ns2 /'
sleep 5
echo "I:test $n: views over options, views disallow - query refused"
@ -426,8 +429,8 @@ n=40
# Test 41 - zone default, query allowed
n=`expr $n + 1`
cp -f ns2/named40.conf ns2/named.conf
$RNDC -c ../common/rndc.conf -s 10.53.0.2 -p 9953 reload 2>&1 | sed 's/^/I:ns2 /'
sed -e "s/@PORT@/${port}/g;s/@CONTROLPORT@/${controlport}/g;" < ns2/named40.conf.in > ns2/named.conf
$RNDCCMD reload 2>&1 | sed 's/^/I:ns2 /'
sleep 5
echo "I:test $n: zone default - query allowed"
@ -550,8 +553,8 @@ status=`expr $status + $ret`
# Test 53 - zones over options, zones allow, query allowed
n=`expr $n + 1`
cp -f ns2/named53.conf ns2/named.conf
$RNDC -c ../common/rndc.conf -s 10.53.0.2 -p 9953 reload 2>&1 | sed 's/^/I:ns2 /'
sed -e "s/@PORT@/${port}/g;s/@CONTROLPORT@/${controlport}/g;" < ns2/named53.conf.in > ns2/named.conf
$RNDCCMD reload 2>&1 | sed 's/^/I:ns2 /'
sleep 5
echo "I:test $n: views over options, views allow - query allowed"
@ -564,8 +567,8 @@ status=`expr $status + $ret`
# Test 54 - zones over options, zones disallow, query refused
n=`expr $n + 1`
cp -f ns2/named54.conf ns2/named.conf
$RNDC -c ../common/rndc.conf -s 10.53.0.2 -p 9953 reload 2>&1 | sed 's/^/I:ns2 /'
sed -e "s/@PORT@/${port}/g;s/@CONTROLPORT@/${controlport}/g;" < ns2/named54.conf.in > ns2/named.conf
$RNDCCMD reload 2>&1 | sed 's/^/I:ns2 /'
sleep 5
echo "I:test $n: views over options, views disallow - query refused"
@ -578,8 +581,8 @@ status=`expr $status + $ret`
# Test 55 - zones over views, zones allow, query allowed
n=`expr $n + 1`
cp -f ns2/named55.conf ns2/named.conf
$RNDC -c ../common/rndc.conf -s 10.53.0.2 -p 9953 reload 2>&1 | sed 's/^/I:ns2 /'
sed -e "s/@PORT@/${port}/g;s/@CONTROLPORT@/${controlport}/g;" < ns2/named55.conf.in > ns2/named.conf
$RNDCCMD reload 2>&1 | sed 's/^/I:ns2 /'
sleep 5
echo "I:test $n: zones over views, views allow - query allowed"
@ -592,8 +595,8 @@ status=`expr $status + $ret`
# Test 56 - zones over views, zones disallow, query refused
n=`expr $n + 1`
cp -f ns2/named56.conf ns2/named.conf
$RNDC -c ../common/rndc.conf -s 10.53.0.2 -p 9953 reload 2>&1 | sed 's/^/I:ns2 /'
sed -e "s/@PORT@/${port}/g;s/@CONTROLPORT@/${controlport}/g;" < ns2/named56.conf.in > ns2/named.conf
$RNDCCMD reload 2>&1 | sed 's/^/I:ns2 /'
sleep 5
echo "I:test $n: zones over views, views disallow - query refused"
@ -606,8 +609,8 @@ status=`expr $status + $ret`
# Test 57 - zones over views, zones disallow, query refused (allow-query-on)
n=`expr $n + 1`
cp -f ns2/named57.conf ns2/named.conf
$RNDC -c ../common/rndc.conf -s 10.53.0.2 -p 9953 reload 2>&1 | sed 's/^/I:ns2 /'
sed -e "s/@PORT@/${port}/g;s/@CONTROLPORT@/${controlport}/g;" < ns2/named57.conf.in > ns2/named.conf
$RNDCCMD reload 2>&1 | sed 's/^/I:ns2 /'
sleep 5
echo "I:test $n: zones over views, allow-query-on"

View file

@ -72,7 +72,7 @@ KRB5_CONFIG=/dev/null
# The "stress" test is not run by default since it creates enough
# load on the machine to make it unusable to other users.
# v6synth
SUBDIRS="acl additional addzone allow_query auth autosign builtin
SUBDIRS="acl additional addzone auth autosign builtin
cacheclean case catz cds chain
checkconf @CHECKDS@ checknames checkzone cookie @COVERAGE@
database digdelv dlv dlz dlzexternal