diff options
Diffstat (limited to 'bin/tests/system/include-multiplecfg')
| -rw-r--r-- | bin/tests/system/include-multiplecfg/clean.sh | 23 | ||||
| -rw-r--r-- | bin/tests/system/include-multiplecfg/ns2/mars.com.db | 24 | ||||
| -rw-r--r-- | bin/tests/system/include-multiplecfg/ns2/mars.conf | 18 | ||||
| -rw-r--r-- | bin/tests/system/include-multiplecfg/ns2/named.conf.in | 29 | ||||
| -rw-r--r-- | bin/tests/system/include-multiplecfg/ns2/zone1.com.db | 24 | ||||
| -rw-r--r-- | bin/tests/system/include-multiplecfg/ns2/zone1.conf | 18 | ||||
| -rw-r--r-- | bin/tests/system/include-multiplecfg/ns2/zone2.com.db | 24 | ||||
| -rw-r--r-- | bin/tests/system/include-multiplecfg/ns2/zone2.conf | 18 | ||||
| -rw-r--r-- | bin/tests/system/include-multiplecfg/setup.sh | 18 | ||||
| -rw-r--r-- | bin/tests/system/include-multiplecfg/tests.sh | 64 | ||||
| -rw-r--r-- | bin/tests/system/include-multiplecfg/tests_sh_include_multiplecfg.py | 14 |
11 files changed, 274 insertions, 0 deletions
diff --git a/bin/tests/system/include-multiplecfg/clean.sh b/bin/tests/system/include-multiplecfg/clean.sh new file mode 100644 index 0000000..905b2dd --- /dev/null +++ b/bin/tests/system/include-multiplecfg/clean.sh @@ -0,0 +1,23 @@ +#!/bin/sh + +# Copyright (C) Internet Systems Consortium, Inc. ("ISC") +# +# SPDX-License-Identifier: MPL-2.0 +# +# 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 https://mozilla.org/MPL/2.0/. +# +# See the COPYRIGHT file distributed with this work for additional +# information regarding copyright ownership. + +# +# Clean up after allow query tests. +# + +rm -f dig.out.* +rm -f ns*/named.conf +rm -f */named.memstats +rm -f ns*/named.lock +rm -f ns*/named.run ns*/named.run.prev +rm -f ns*/managed-keys.bind* ns*/*.mkeys* diff --git a/bin/tests/system/include-multiplecfg/ns2/mars.com.db b/bin/tests/system/include-multiplecfg/ns2/mars.com.db new file mode 100644 index 0000000..cbae017 --- /dev/null +++ b/bin/tests/system/include-multiplecfg/ns2/mars.com.db @@ -0,0 +1,24 @@ +; Copyright (C) Internet Systems Consortium, Inc. ("ISC") +; +; SPDX-License-Identifier: MPL-2.0 +; +; 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 https://mozilla.org/MPL/2.0/. +; +; See the COPYRIGHT file distributed with this work for additional +; information regarding copyright ownership. + +$TTL 86400 +@ IN SOA dns1.mars.com. hostmaster.mars.com. ( + 2001062501 ; serial + 21600 ; refresh after 6 hours + 3600 ; retry after 1 hour + 604800 ; expire after 1 week + 86400 ) ; minimum TTL of 1 day + + IN NS dns1.mars.com. + + IN A 10.53.0.1 + +dns1 IN A 10.53.0.1 diff --git a/bin/tests/system/include-multiplecfg/ns2/mars.conf b/bin/tests/system/include-multiplecfg/ns2/mars.conf new file mode 100644 index 0000000..31f6da3 --- /dev/null +++ b/bin/tests/system/include-multiplecfg/ns2/mars.conf @@ -0,0 +1,18 @@ +/* + * Copyright (C) Internet Systems Consortium, Inc. ("ISC") + * + * SPDX-License-Identifier: MPL-2.0 + * + * 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 https://mozilla.org/MPL/2.0/. + * + * See the COPYRIGHT file distributed with this work for additional + * information regarding copyright ownership. + */ + +zone "mars.com" { + type primary; + file "mars.com.db"; +}; + diff --git a/bin/tests/system/include-multiplecfg/ns2/named.conf.in b/bin/tests/system/include-multiplecfg/ns2/named.conf.in new file mode 100644 index 0000000..b38c228 --- /dev/null +++ b/bin/tests/system/include-multiplecfg/ns2/named.conf.in @@ -0,0 +1,29 @@ +/* + * Copyright (C) Internet Systems Consortium, Inc. ("ISC") + * + * SPDX-License-Identifier: MPL-2.0 + * + * 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 https://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.2; }; + listen-on-v6 { none; }; + recursion no; + notify no; + dnssec-validation no; +}; + +# Should include all files matching pattern. +include "zone*.conf"; + +# Shouldn't break standard file pattern. +include "mars.conf"; + diff --git a/bin/tests/system/include-multiplecfg/ns2/zone1.com.db b/bin/tests/system/include-multiplecfg/ns2/zone1.com.db new file mode 100644 index 0000000..ef9cff4 --- /dev/null +++ b/bin/tests/system/include-multiplecfg/ns2/zone1.com.db @@ -0,0 +1,24 @@ +; Copyright (C) Internet Systems Consortium, Inc. ("ISC") +; +; SPDX-License-Identifier: MPL-2.0 +; +; 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 https://mozilla.org/MPL/2.0/. +; +; See the COPYRIGHT file distributed with this work for additional +; information regarding copyright ownership. + +$TTL 86400 +@ IN SOA dns1.zone1.com. hostmaster.zone1.com. ( + 2001062501 ; serial + 21600 ; refresh after 6 hours + 3600 ; retry after 1 hour + 604800 ; expire after 1 week + 86400 ) ; minimum TTL of 1 day + + IN NS dns1.zone1.com. + + IN A 10.53.0.1 + +dns1 IN A 10.53.0.1 diff --git a/bin/tests/system/include-multiplecfg/ns2/zone1.conf b/bin/tests/system/include-multiplecfg/ns2/zone1.conf new file mode 100644 index 0000000..e5c15ad --- /dev/null +++ b/bin/tests/system/include-multiplecfg/ns2/zone1.conf @@ -0,0 +1,18 @@ +/* + * Copyright (C) Internet Systems Consortium, Inc. ("ISC") + * + * SPDX-License-Identifier: MPL-2.0 + * + * 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 https://mozilla.org/MPL/2.0/. + * + * See the COPYRIGHT file distributed with this work for additional + * information regarding copyright ownership. + */ + +zone "zone1.com" { + type primary; + file "zone1.com.db"; +}; + diff --git a/bin/tests/system/include-multiplecfg/ns2/zone2.com.db b/bin/tests/system/include-multiplecfg/ns2/zone2.com.db new file mode 100644 index 0000000..6df12b2 --- /dev/null +++ b/bin/tests/system/include-multiplecfg/ns2/zone2.com.db @@ -0,0 +1,24 @@ +; Copyright (C) Internet Systems Consortium, Inc. ("ISC") +; +; SPDX-License-Identifier: MPL-2.0 +; +; 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 https://mozilla.org/MPL/2.0/. +; +; See the COPYRIGHT file distributed with this work for additional +; information regarding copyright ownership. + +$TTL 86400 +@ IN SOA dns1.zone2.com. hostmaster.zone2.com. ( + 2001062501 ; serial + 21600 ; refresh after 6 hours + 3600 ; retry after 1 hour + 604800 ; expire after 1 week + 86400 ) ; minimum TTL of 1 day + + IN NS dns1.zone2.com. + + IN A 10.53.0.1 + +dns1 IN A 10.53.0.1 diff --git a/bin/tests/system/include-multiplecfg/ns2/zone2.conf b/bin/tests/system/include-multiplecfg/ns2/zone2.conf new file mode 100644 index 0000000..b122b0f --- /dev/null +++ b/bin/tests/system/include-multiplecfg/ns2/zone2.conf @@ -0,0 +1,18 @@ +/* + * Copyright (C) Internet Systems Consortium, Inc. ("ISC") + * + * SPDX-License-Identifier: MPL-2.0 + * + * 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 https://mozilla.org/MPL/2.0/. + * + * See the COPYRIGHT file distributed with this work for additional + * information regarding copyright ownership. + */ + +zone "zone2.com" { + type primary; + file "zone2.com.db"; +}; + diff --git a/bin/tests/system/include-multiplecfg/setup.sh b/bin/tests/system/include-multiplecfg/setup.sh new file mode 100644 index 0000000..064fb01 --- /dev/null +++ b/bin/tests/system/include-multiplecfg/setup.sh @@ -0,0 +1,18 @@ +#!/bin/sh -e + +# Copyright (C) Internet Systems Consortium, Inc. ("ISC") +# +# SPDX-License-Identifier: MPL-2.0 +# +# 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 https://mozilla.org/MPL/2.0/. +# +# See the COPYRIGHT file distributed with this work for additional +# information regarding copyright ownership. + +. ../conf.sh + +$SHELL clean.sh + +copy_setports ns2/named.conf.in ns2/named.conf diff --git a/bin/tests/system/include-multiplecfg/tests.sh b/bin/tests/system/include-multiplecfg/tests.sh new file mode 100644 index 0000000..65b4001 --- /dev/null +++ b/bin/tests/system/include-multiplecfg/tests.sh @@ -0,0 +1,64 @@ +#!/bin/sh + +# Copyright (C) Internet Systems Consortium, Inc. ("ISC") +# +# SPDX-License-Identifier: MPL-2.0 +# +# 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 https://mozilla.org/MPL/2.0/. +# +# See the COPYRIGHT file distributed with this work for additional +# information regarding copyright ownership. + +# Test of include statement with glob expression. + +set -e + +. ../conf.sh + +DIGOPTS="+tcp +nosea +nostat +nocmd +norec +noques +noadd +nostats -p ${PORT}" + +status=0 +n=0 + +# Test 1 - check if zone1 was loaded. +n=$((n + 1)) +echo_i "checking glob include of zone1 config ($n)" +ret=0 +$DIG $DIGOPTS @10.53.0.2 -b 10.53.0.2 zone1.com. a > dig.out.ns2.$n || ret=1 +grep 'status: NOERROR' dig.out.ns2.$n > /dev/null || ret=1 +grep '^zone1.com.' dig.out.ns2.$n > /dev/null || ret=1 +if [ $ret != 0 ]; then echo_i "failed"; fi +status=$((status + ret)) + +# Test 2 - check if zone2 was loaded. +n=$((n + 1)) +echo_i "checking glob include of zone2 config ($n)" +ret=0 +$DIG $DIGOPTS @10.53.0.2 -b 10.53.0.2 zone2.com. a > dig.out.ns2.$n || ret=1 +grep 'status: NOERROR' dig.out.ns2.$n > /dev/null || ret=1 +grep '^zone2.com.' dig.out.ns2.$n > /dev/null || ret=1 +if [ $ret != 0 ]; then echo_i "failed"; fi +status=$((status + ret)) + +# Test 3 - check if standard file path (no magic chars) works. +n=$((n + 1)) +echo_i "checking include of standard file path config ($n)" +ret=0 +$DIG $DIGOPTS @10.53.0.2 -b 10.53.0.2 mars.com. a > dig.out.ns2.$n || ret=1 +grep 'status: NOERROR' dig.out.ns2.$n > /dev/null || ret=1 +grep '^mars.com.' dig.out.ns2.$n > /dev/null || ret=1 +if [ $ret != 0 ]; then echo_i "failed"; fi +status=$((status + ret)) + +# Test 4: named-checkconf correctly parses glob includes. +n=$((n + 1)) +echo_i "checking named-checkconf with glob include ($n)" +ret=0 +(cd ns2; $CHECKCONF named.conf) || ret=1 +if [ $ret != 0 ]; then echo_i "failed"; fi +status=$((status + ret)) + +echo_i "exit status: $status" +[ $status -eq 0 ] || exit 1 diff --git a/bin/tests/system/include-multiplecfg/tests_sh_include_multiplecfg.py b/bin/tests/system/include-multiplecfg/tests_sh_include_multiplecfg.py new file mode 100644 index 0000000..e767c1d --- /dev/null +++ b/bin/tests/system/include-multiplecfg/tests_sh_include_multiplecfg.py @@ -0,0 +1,14 @@ +# Copyright (C) Internet Systems Consortium, Inc. ("ISC") +# +# SPDX-License-Identifier: MPL-2.0 +# +# 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 https://mozilla.org/MPL/2.0/. +# +# See the COPYRIGHT file distributed with this work for additional +# information regarding copyright ownership. + + +def test_include_multiplecfg(run_tests_sh): + run_tests_sh() |