From 3b9b6d0b8e7f798023c9d109c490449d528fde80 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Sun, 7 Apr 2024 17:59:48 +0200 Subject: Adding upstream version 1:9.18.19. Signed-off-by: Daniel Baumann --- bin/tests/system/zonechecks/a.db | 14 ++ bin/tests/system/zonechecks/aaaa.db | 14 ++ bin/tests/system/zonechecks/bigserial.db | 14 ++ bin/tests/system/zonechecks/clean.sh | 22 ++ bin/tests/system/zonechecks/cname.db | 14 ++ bin/tests/system/zonechecks/dname.db | 14 ++ bin/tests/system/zonechecks/noaddress.db | 14 ++ bin/tests/system/zonechecks/ns1/named.conf.in | 72 ++++++ bin/tests/system/zonechecks/ns2/named.conf.in | 42 ++++ bin/tests/system/zonechecks/nxdomain.db | 14 ++ bin/tests/system/zonechecks/setup.sh | 33 +++ bin/tests/system/zonechecks/tests.sh | 258 +++++++++++++++++++++ bin/tests/system/zonechecks/tests_sh_zonechecks.py | 14 ++ 13 files changed, 539 insertions(+) create mode 100644 bin/tests/system/zonechecks/a.db create mode 100644 bin/tests/system/zonechecks/aaaa.db create mode 100644 bin/tests/system/zonechecks/bigserial.db create mode 100644 bin/tests/system/zonechecks/clean.sh create mode 100644 bin/tests/system/zonechecks/cname.db create mode 100644 bin/tests/system/zonechecks/dname.db create mode 100644 bin/tests/system/zonechecks/noaddress.db create mode 100644 bin/tests/system/zonechecks/ns1/named.conf.in create mode 100644 bin/tests/system/zonechecks/ns2/named.conf.in create mode 100644 bin/tests/system/zonechecks/nxdomain.db create mode 100644 bin/tests/system/zonechecks/setup.sh create mode 100644 bin/tests/system/zonechecks/tests.sh create mode 100644 bin/tests/system/zonechecks/tests_sh_zonechecks.py (limited to 'bin/tests/system/zonechecks') diff --git a/bin/tests/system/zonechecks/a.db b/bin/tests/system/zonechecks/a.db new file mode 100644 index 0000000..62d1ee7 --- /dev/null +++ b/bin/tests/system/zonechecks/a.db @@ -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. + +@ 3600 IN SOA ns hostmaster 1 3600 1200 604800 3600 +@ 3600 IN NS 127.0.0.1 +127.0.0.1 3600 IN A 127.0.0.1 diff --git a/bin/tests/system/zonechecks/aaaa.db b/bin/tests/system/zonechecks/aaaa.db new file mode 100644 index 0000000..75724d6 --- /dev/null +++ b/bin/tests/system/zonechecks/aaaa.db @@ -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. + +@ 3600 IN SOA ns hostmaster 1 3600 1200 604800 3600 +@ 3600 IN NS ::1 +::1 3600 IN AAAA ::1 diff --git a/bin/tests/system/zonechecks/bigserial.db b/bin/tests/system/zonechecks/bigserial.db new file mode 100644 index 0000000..200573a --- /dev/null +++ b/bin/tests/system/zonechecks/bigserial.db @@ -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. + +@ 3600 IN SOA ns hostmaster 3003113544 3600 1200 604800 3600 +@ 3600 IN NS ns +ns 3600 IN A 10.53.0.1 diff --git a/bin/tests/system/zonechecks/clean.sh b/bin/tests/system/zonechecks/clean.sh new file mode 100644 index 0000000..ed4012a --- /dev/null +++ b/bin/tests/system/zonechecks/clean.sh @@ -0,0 +1,22 @@ +#!/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. + +rm -f *.out +rm -f */named.memstats +rm -f */named.conf +rm -f */named.run +rm -f */*.db */*.db.signed */K*.key */K*.private */*.jnl */dsset-* +rm -f */signer.err +rm -f rndc.out.* +rm -f ns*/named.lock +rm -f ns*/managed-keys.bind* ns*/*.mkeys* diff --git a/bin/tests/system/zonechecks/cname.db b/bin/tests/system/zonechecks/cname.db new file mode 100644 index 0000000..2e8a123 --- /dev/null +++ b/bin/tests/system/zonechecks/cname.db @@ -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. + +@ 3600 IN SOA ns hostmaster 1 3600 1200 604800 3600 +@ 3600 IN NS ns +ns 3600 IN CNAME @ diff --git a/bin/tests/system/zonechecks/dname.db b/bin/tests/system/zonechecks/dname.db new file mode 100644 index 0000000..b2859d1 --- /dev/null +++ b/bin/tests/system/zonechecks/dname.db @@ -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. + +@ 3600 IN SOA ns hostmaster 1 3600 1200 604800 3600 +@ 3600 IN NS ns +@ 3600 IN DNAME . diff --git a/bin/tests/system/zonechecks/noaddress.db b/bin/tests/system/zonechecks/noaddress.db new file mode 100644 index 0000000..f656197 --- /dev/null +++ b/bin/tests/system/zonechecks/noaddress.db @@ -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. + +@ 3600 IN SOA ns hostmaster 1 3600 1200 604800 3600 +@ 3600 IN NS ns +ns 3600 IN TXT this name has no address records diff --git a/bin/tests/system/zonechecks/ns1/named.conf.in b/bin/tests/system/zonechecks/ns1/named.conf.in new file mode 100644 index 0000000..03bc918 --- /dev/null +++ b/bin/tests/system/zonechecks/ns1/named.conf.in @@ -0,0 +1,72 @@ +/* + * 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. + */ + +// NS1 + +options { + query-source address 10.53.0.1; + notify-source 10.53.0.1; + transfer-source 10.53.0.1; + port @PORT@; + pid-file "named.pid"; + listen-on { 10.53.0.1; }; + listen-on-v6 { none; }; + recursion no; + notify yes; + dnssec-validation yes; +}; + +key rndc_key { + secret "1234abcd8765"; + algorithm @DEFAULT_HMAC@; +}; + +controls { + inet 10.53.0.1 port @CONTROLPORT@ allow { any; } keys { rndc_key; }; +}; + +view unused { + match-clients { none; }; + + zone "duplicate.example" { + type primary; + file "duplicate.db"; + }; +}; + +view primary { + match-clients { any; }; + + zone "primary.example" { + type primary; + file "primary.db"; + allow-update { any; }; + allow-transfer { any; }; + auto-dnssec maintain; + }; + + zone "bigserial.example" { + type primary; + file "bigserial.db"; + }; + + zone "reload.example" { + type primary; + file "reload.db"; + }; + + zone "duplicate.example" { + type primary; + file "duplicate.db"; + }; +}; diff --git a/bin/tests/system/zonechecks/ns2/named.conf.in b/bin/tests/system/zonechecks/ns2/named.conf.in new file mode 100644 index 0000000..5ecf68b --- /dev/null +++ b/bin/tests/system/zonechecks/ns2/named.conf.in @@ -0,0 +1,42 @@ +/* + * 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. + */ + +// NS2 + +options { + query-source address 10.53.0.2; + notify-source 10.53.0.2; + transfer-source 10.53.0.2; + port @PORT@; + pid-file "named.pid"; + listen-on { 10.53.0.2; }; + listen-on-v6 { none; }; + recursion no; + notify yes; + dnssec-validation yes; +}; + +key rndc_key { + secret "1234abcd8765"; + algorithm @DEFAULT_HMAC@; +}; + +controls { + inet 10.53.0.2 port @CONTROLPORT@ allow { any; } keys { rndc_key; }; +}; + +zone "primary.example" { + type secondary; + primaries { 10.53.0.1; }; + file "sec.db"; +}; diff --git a/bin/tests/system/zonechecks/nxdomain.db b/bin/tests/system/zonechecks/nxdomain.db new file mode 100644 index 0000000..853325d --- /dev/null +++ b/bin/tests/system/zonechecks/nxdomain.db @@ -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. + +@ 3600 IN SOA ns hostmaster 1 3600 1200 604800 3600 +@ 3600 IN NS ns +; There are no records at all with the ownername of "ns". diff --git a/bin/tests/system/zonechecks/setup.sh b/bin/tests/system/zonechecks/setup.sh new file mode 100644 index 0000000..76e8a19 --- /dev/null +++ b/bin/tests/system/zonechecks/setup.sh @@ -0,0 +1,33 @@ +#!/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. + +. ../conf.sh + +$SHELL clean.sh + +copy_setports ns1/named.conf.in ns1/named.conf +copy_setports ns2/named.conf.in ns2/named.conf + +$SHELL ${TOP_SRCDIR}/bin/tests/system/genzone.sh 1 > ns1/primary.db +$SHELL ${TOP_SRCDIR}/bin/tests/system/genzone.sh 1 > ns1/duplicate.db +cp bigserial.db ns1/ +cd ns1 +touch primary.db.signed +echo '$INCLUDE "primary.db.signed"' >> primary.db +$KEYGEN -a ${DEFAULT_ALGORITHM} -q primary.example > /dev/null 2>&1 +$KEYGEN -a ${DEFAULT_ALGORITHM} -qfk primary.example > /dev/null 2>&1 +$SIGNER -SD -o primary.example primary.db > /dev/null \ + 2> signer.err || cat signer.err +echo '$INCLUDE "soa.db"' > reload.db +echo '@ 0 NS .' >> reload.db +echo '@ 0 SOA . . 1 0 0 0 0' > soa.db diff --git a/bin/tests/system/zonechecks/tests.sh b/bin/tests/system/zonechecks/tests.sh new file mode 100644 index 0000000..958bfed --- /dev/null +++ b/bin/tests/system/zonechecks/tests.sh @@ -0,0 +1,258 @@ +#!/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. + +set -e + +. ../conf.sh + +DIGOPTS="-p ${PORT}" +RNDCCMD="$RNDC -c ../common/rndc.conf -p ${CONTROLPORT} -s" + +status=0 + +# +echo_i "checking that we detect a NS which refers to a CNAME" +if $CHECKZONE . cname.db > cname.out 2>&1 +then + echo_i "failed (status)"; status=$((status + 1)) +else + if grep "is a CNAME" cname.out > /dev/null + then + : + else + echo_i "failed (message)"; status=$((status + 1)) + fi +fi + +# +echo_i "checking that we detect a NS which is below a DNAME" +if $CHECKZONE . dname.db > dname.out 2>&1 +then + echo_i "failed (status)"; status=$((status + 1)) +else + if grep "is below a DNAME" dname.out > /dev/null + then + : + else + echo_i "failed (message)"; status=$((status + 1)) + fi +fi + +# +echo_i "checking that we detect a NS which has no address records (A/AAAA)" +if $CHECKZONE . noaddress.db > noaddress.out +then + echo_i "failed (status)"; status=$((status + 1)) +else + if grep "has no address records" noaddress.out > /dev/null + then + : + else + echo_i "failed (message)"; status=$((status + 1)) + fi +fi + +# +echo_i "checking that we detect a NS which has no records" +if $CHECKZONE . nxdomain.db > nxdomain.out +then + echo_i "failed (status)"; status=$((status + 1)) +else + if grep "has no address records" noaddress.out > /dev/null + then + : + else + echo_i "failed (message)"; status=$((status + 1)) + fi +fi + +# +echo_i "checking that we detect a NS which looks like a A record (fail)" +if $CHECKZONE -n fail . a.db > a.out 2>&1 +then + echo_i "failed (status)"; status=$((status + 1)) +else + if grep "appears to be an address" a.out > /dev/null + then + : + else + echo_i "failed (message)"; status=$((status + 1)) + fi +fi + +# +echo_i "checking that we detect a NS which looks like a A record (warn=default)" +if $CHECKZONE . a.db > a.out 2>&1 +then + if grep "appears to be an address" a.out > /dev/null + then + : + else + echo_i "failed (message)"; status=$((status + 1)) + fi +else + echo_i "failed (status)"; status=$((status + 1)) +fi + +# +echo_i "checking that we detect a NS which looks like a A record (ignore)" +if $CHECKZONE -n ignore . a.db > a.out 2>&1 +then + if grep "appears to be an address" a.out > /dev/null + then + echo_i "failed (message)"; status=$((status + 1)) + else + : + fi +else + echo_i "failed (status)"; status=$((status + 1)) +fi + +# +echo_i "checking that we detect a NS which looks like a AAAA record (fail)" +if $CHECKZONE -n fail . aaaa.db > aaaa.out 2>&1 +then + echo_i "failed (status)"; status=$((status + 1)) +else + if grep "appears to be an address" aaaa.out > /dev/null + then + : + else + echo_i "failed (message)"; status=$((status + 1)) + fi +fi + +# +echo_i "checking that we detect a NS which looks like a AAAA record (warn=default)" +if $CHECKZONE . aaaa.db > aaaa.out 2>&1 +then + if grep "appears to be an address" aaaa.out > /dev/null + then + : + else + echo_i "failed (message)"; status=$((status + 1)) + fi +else + echo_i "failed (status)"; status=$((status + 1)) +fi + +# +echo_i "checking that we detect a NS which looks like a AAAA record (ignore)" +if $CHECKZONE -n ignore . aaaa.db > aaaa.out 2>&1 +then + if grep "appears to be an address" aaaa.out > /dev/null + then + echo_i "failed (message)"; status=$((status + 1)) + else + : + fi +else + echo_i "failed (status)"; status=$((status + 1)) +fi + +# +echo_i "checking 'rdnc zonestatus' output" +ret=0 +for i in 0 1 2 3 4 5 6 7 8 9 +do + $RNDCCMD 10.53.0.1 zonestatus primary.example > rndc.out.pri 2>&1 + grep "zone not loaded" rndc.out.pri > /dev/null || break + sleep 1 +done +checkfor() { + grep "$1" $2 > /dev/null || { + ret=1; + echo_i "missing string '$1' from '$2'" + } +} +checkfor "name: primary.example" rndc.out.pri +checkfor "type: primary" rndc.out.pri +checkfor "files: primary.db, primary.db.signed" rndc.out.pri +checkfor "serial: " rndc.out.pri +checkfor "nodes: " rndc.out.pri +checkfor "last loaded: " rndc.out.pri +checkfor "secure: yes" rndc.out.pri +checkfor "inline signing: no" rndc.out.pri +checkfor "key maintenance: automatic" rndc.out.pri +checkfor "next key event: " rndc.out.pri +checkfor "next resign node: " rndc.out.pri +checkfor "next resign time: " rndc.out.pri +checkfor "dynamic: yes" rndc.out.pri +checkfor "frozen: no" rndc.out.pri +for i in 0 1 2 3 4 5 6 7 8 9 +do + $RNDCCMD 10.53.0.2 zonestatus primary.example > rndc.out.sec 2>&1 + grep "zone not loaded" rndc.out.sec > /dev/null || break + sleep 1 +done +checkfor "name: primary.example" rndc.out.sec +checkfor "type: secondary" rndc.out.sec +checkfor "files: sec.db" rndc.out.sec +checkfor "serial: " rndc.out.sec +checkfor "nodes: " rndc.out.sec +checkfor "next refresh: " rndc.out.sec +checkfor "expires: " rndc.out.sec +checkfor "secure: yes" rndc.out.sec +for i in 0 1 2 3 4 5 6 7 8 9 +do + $RNDCCMD 10.53.0.1 zonestatus reload.example > rndc.out.prereload 2>&1 + grep "zone not loaded" rndc.out.prereload > /dev/null || break + sleep 1 +done +checkfor "files: reload.db, soa.db$" rndc.out.prereload +echo "@ 0 SOA . . 2 0 0 0 0" > ns1/soa.db +$RNDCCMD 10.53.0.1 reload reload.example | sed 's/^/ns1 /' | cat_i +for i in 0 1 2 3 4 5 6 7 8 9 +do + $DIG $DIGOPTS reload.example SOA @10.53.0.1 > dig.out + grep " 2 0 0 0 0" dig.out >/dev/null && break + sleep 1 +done +$RNDCCMD 10.53.0.1 zonestatus reload.example > rndc.out.postreload 2>&1 +checkfor "files: reload.db, soa.db$" rndc.out.postreload +sleep 1 +echo "@ 0 SOA . . 3 0 0 0 0" > ns1/reload.db +echo "@ 0 NS ." >> ns1/reload.db +rndc_reload ns1 10.53.0.1 reload.example +for i in 0 1 2 3 4 5 6 7 8 9 +do + $DIG $DIGOPTS reload.example SOA @10.53.0.1 > dig.out + grep " 3 0 0 0 0" dig.out >/dev/null && break + sleep 1 +done +$RNDCCMD 10.53.0.1 zonestatus reload.example > rndc.out.removeinclude 2>&1 +checkfor "files: reload.db$" rndc.out.removeinclude + +if [ $ret != 0 ]; then echo_i "failed"; fi +status=$((status + ret)) + +echo_i "checking 'rdnc zonestatus' with duplicated zone name" +ret=0 +$RNDCCMD 10.53.0.1 zonestatus duplicate.example > rndc.out.duplicate 2>&1 && ret=1 +checkfor "zone 'duplicate.example' was found in multiple views" rndc.out.duplicate +$RNDCCMD 10.53.0.1 zonestatus duplicate.example in primary > rndc.out.duplicate 2>&1 || ret=1 +checkfor "name: duplicate.example" rndc.out.duplicate +$RNDCCMD 10.53.0.1 zonestatus nosuchzone.example > rndc.out.duplicate 2>&1 && ret=1 +checkfor "no matching zone 'nosuchzone.example' in any view" rndc.out.duplicate +if [ $ret != 0 ]; then echo_i "failed"; fi +status=$((status + ret)) + +echo_i "checking 'rdnc zonestatus' with big serial value" +ret=0 +$RNDCCMD 10.53.0.1 zonestatus bigserial.example > rndc.out.bigserial 2>&1 +checkfor "serial: 3003113544" rndc.out.bigserial +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/zonechecks/tests_sh_zonechecks.py b/bin/tests/system/zonechecks/tests_sh_zonechecks.py new file mode 100644 index 0000000..28a7bb1 --- /dev/null +++ b/bin/tests/system/zonechecks/tests_sh_zonechecks.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_zonechecks(run_tests_sh): + run_tests_sh() -- cgit v1.2.3