From 45d6379135504814ab723b57f0eb8be23393a51d Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Sat, 27 Apr 2024 09:24:22 +0200 Subject: Adding upstream version 1:9.16.44. Signed-off-by: Daniel Baumann --- bin/tests/system/views/clean.sh | 38 +++++ bin/tests/system/views/ns1/named.conf.in | 29 ++++ bin/tests/system/views/ns1/root.db | 24 +++ bin/tests/system/views/ns2/1.10.in-addr.arpa.db | 13 ++ bin/tests/system/views/ns2/clone.db | 25 ++++ bin/tests/system/views/ns2/example1.db | 28 ++++ bin/tests/system/views/ns2/example2.db | 28 ++++ bin/tests/system/views/ns2/external/inline.db | 29 ++++ bin/tests/system/views/ns2/internal.db | 30 ++++ bin/tests/system/views/ns2/internal/inline.db | 29 ++++ bin/tests/system/views/ns2/named1.conf.in | 53 +++++++ bin/tests/system/views/ns2/named2.conf.in | 100 +++++++++++++ bin/tests/system/views/ns2/named3.conf.in | 35 +++++ bin/tests/system/views/ns3/child.clone.db | 22 +++ bin/tests/system/views/ns3/internal.db | 28 ++++ bin/tests/system/views/ns3/named1.conf.in | 50 +++++++ bin/tests/system/views/ns3/named2.conf.in | 50 +++++++ bin/tests/system/views/ns5/child.clone.db | 22 +++ bin/tests/system/views/ns5/named.conf.in | 44 ++++++ bin/tests/system/views/setup.sh | 39 +++++ bin/tests/system/views/tests.sh | 190 ++++++++++++++++++++++++ 21 files changed, 906 insertions(+) create mode 100644 bin/tests/system/views/clean.sh create mode 100644 bin/tests/system/views/ns1/named.conf.in create mode 100644 bin/tests/system/views/ns1/root.db create mode 100644 bin/tests/system/views/ns2/1.10.in-addr.arpa.db create mode 100644 bin/tests/system/views/ns2/clone.db create mode 100644 bin/tests/system/views/ns2/example1.db create mode 100644 bin/tests/system/views/ns2/example2.db create mode 100644 bin/tests/system/views/ns2/external/inline.db create mode 100644 bin/tests/system/views/ns2/internal.db create mode 100644 bin/tests/system/views/ns2/internal/inline.db create mode 100644 bin/tests/system/views/ns2/named1.conf.in create mode 100644 bin/tests/system/views/ns2/named2.conf.in create mode 100644 bin/tests/system/views/ns2/named3.conf.in create mode 100644 bin/tests/system/views/ns3/child.clone.db create mode 100644 bin/tests/system/views/ns3/internal.db create mode 100644 bin/tests/system/views/ns3/named1.conf.in create mode 100644 bin/tests/system/views/ns3/named2.conf.in create mode 100644 bin/tests/system/views/ns5/child.clone.db create mode 100644 bin/tests/system/views/ns5/named.conf.in create mode 100644 bin/tests/system/views/setup.sh create mode 100644 bin/tests/system/views/tests.sh (limited to 'bin/tests/system/views') diff --git a/bin/tests/system/views/clean.sh b/bin/tests/system/views/clean.sh new file mode 100644 index 0000000..d644c2a --- /dev/null +++ b/bin/tests/system/views/clean.sh @@ -0,0 +1,38 @@ +#!/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 + +# +# Clean up after zone transfer tests. +# + +rm -f ns*/named.conf +rm -f ns3/example.bk dig.out.ns?.? +rm -f ns2/example.db ns3/internal.bk +rm -f -- */*.jnl +rm -f -- */named.memstats +rm -f -- */named.run */named.run.prev +rm -f ns2/external/K* +rm -f ns2/external/inline.db.jbk +rm -f ns2/external/inline.db.signed +rm -f ns2/external/inline.db.signed.jnl +rm -f ns2/internal/K* +rm -f ns2/internal/inline.db.jbk +rm -f ns2/internal/inline.db.signed +rm -f ns2/internal/inline.db.signed.jnl +rm -f ns2/zones.conf +rm -f ns2/db.* ns2/K* +rm -f dig.out.external dig.out.internal +rm -f ns*/named.lock +rm -f ns*/managed-keys.bind* ns*/*.mkeys* diff --git a/bin/tests/system/views/ns1/named.conf.in b/bin/tests/system/views/ns1/named.conf.in new file mode 100644 index 0000000..eb079c9 --- /dev/null +++ b/bin/tests/system/views/ns1/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 { + 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; +}; + +zone "." { + type primary; + file "root.db"; +}; diff --git a/bin/tests/system/views/ns1/root.db b/bin/tests/system/views/ns1/root.db new file mode 100644 index 0000000..17780d1 --- /dev/null +++ b/bin/tests/system/views/ns1/root.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 300 +. IN SOA gson.nominum.com. a.root.servers.nil. ( + 2000042100 ; serial + 600 ; refresh + 600 ; retry + 1200 ; expire + 600 ; minimum + ) +. NS a.root-servers.nil. +a.root-servers.nil. A 10.53.0.1 + +example. NS ns2.example. +ns2.example. A 10.53.0.2 diff --git a/bin/tests/system/views/ns2/1.10.in-addr.arpa.db b/bin/tests/system/views/ns2/1.10.in-addr.arpa.db new file mode 100644 index 0000000..7ca723d --- /dev/null +++ b/bin/tests/system/views/ns2/1.10.in-addr.arpa.db @@ -0,0 +1,13 @@ +; 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. + +@ IN SOA . . 0 0 0 0 0 +@ IN NS . diff --git a/bin/tests/system/views/ns2/clone.db b/bin/tests/system/views/ns2/clone.db new file mode 100644 index 0000000..0f2de76 --- /dev/null +++ b/bin/tests/system/views/ns2/clone.db @@ -0,0 +1,25 @@ +; 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 600 +@ IN SOA mname1. . ( + 2 ; serial + 20 ; refresh (20 seconds) + 20 ; retry (20 seconds) + 1814400 ; expire (3 weeks) + 3600 ; minimum (1 hour) + ) +@ IN NS ns2 +ns2 IN A 10.53.0.2 + +a IN A 10.1.0.1 +child IN NS ns3.child +ns3.child IN A 10.53.0.3 diff --git a/bin/tests/system/views/ns2/example1.db b/bin/tests/system/views/ns2/example1.db new file mode 100644 index 0000000..4d60ce3 --- /dev/null +++ b/bin/tests/system/views/ns2/example1.db @@ -0,0 +1,28 @@ +; 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. + +$ORIGIN . +$TTL 300 ; 5 minutes +example IN SOA mname1. . ( + 1 ; serial + 20 ; refresh (20 seconds) + 20 ; retry (20 seconds) + 1814400 ; expire (3 weeks) + 3600 ; minimum (1 hour) + ) +example. NS ns2.example. +ns2.example. A 10.53.0.2 + +$ORIGIN example. +a A 10.0.0.1 + MX 10 mail.example. + +mail A 10.0.0.2 diff --git a/bin/tests/system/views/ns2/example2.db b/bin/tests/system/views/ns2/example2.db new file mode 100644 index 0000000..966240e --- /dev/null +++ b/bin/tests/system/views/ns2/example2.db @@ -0,0 +1,28 @@ +; 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. + +$ORIGIN . +$TTL 300 ; 5 minutes +example IN SOA mname1. . ( + 2 ; serial + 20 ; refresh (20 seconds) + 20 ; retry (20 seconds) + 1814400 ; expire (3 weeks) + 3600 ; minimum (1 hour) + ) +example. NS ns2.example. +ns2.example. A 10.53.0.4 + +$ORIGIN example. +a A 10.0.0.1 + MX 10 mail.example. + +mail A 10.0.0.2 diff --git a/bin/tests/system/views/ns2/external/inline.db b/bin/tests/system/views/ns2/external/inline.db new file mode 100644 index 0000000..16d53b9 --- /dev/null +++ b/bin/tests/system/views/ns2/external/inline.db @@ -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. + +$TTL 300 ; 5 minutes +inline. IN SOA mname1. . ( + 2 ; serial + 20 ; refresh (20 seconds) + 20 ; retry (20 seconds) + 1814400 ; expire (3 weeks) + 3600 ; minimum (1 hour) + ) +inline. NS ns2.inline. +ns2.inline. A 10.53.0.2 +inline. NS ns3.inline. +ns3.inline. A 10.53.0.3 + +$ORIGIN inline. +a A 10.1.0.1 + MX 10 extmail.inline. + +extmail A 10.1.0.2 diff --git a/bin/tests/system/views/ns2/internal.db b/bin/tests/system/views/ns2/internal.db new file mode 100644 index 0000000..4f1014f --- /dev/null +++ b/bin/tests/system/views/ns2/internal.db @@ -0,0 +1,30 @@ +; 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. + +$ORIGIN . +$TTL 300 ; 5 minutes +example IN SOA mname1. . ( + 2 ; serial + 20 ; refresh (20 seconds) + 20 ; retry (20 seconds) + 1814400 ; expire (3 weeks) + 3600 ; minimum (1 hour) + ) +example. NS ns2.example. +ns2.example. A 10.53.0.2 +example. NS ns3.example. +ns3.example. A 10.53.0.3 + +$ORIGIN example. +a A 10.1.0.1 + MX 10 intmail.example. + +intmail A 10.1.0.2 diff --git a/bin/tests/system/views/ns2/internal/inline.db b/bin/tests/system/views/ns2/internal/inline.db new file mode 100644 index 0000000..7a30873 --- /dev/null +++ b/bin/tests/system/views/ns2/internal/inline.db @@ -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. + +$TTL 300 ; 5 minutes +inline. IN SOA mname1. . ( + 2 ; serial + 20 ; refresh (20 seconds) + 20 ; retry (20 seconds) + 1814400 ; expire (3 weeks) + 3600 ; minimum (1 hour) + ) +inline. NS ns2.inline. +ns2.inline. A 10.53.0.2 +inline. NS ns3.inline. +ns3.inline. A 10.53.0.3 + +$ORIGIN inline. +a A 10.1.0.1 + MX 10 intmail.inline. + +intmail A 10.1.0.2 diff --git a/bin/tests/system/views/ns2/named1.conf.in b/bin/tests/system/views/ns2/named1.conf.in new file mode 100644 index 0000000..857235d --- /dev/null +++ b/bin/tests/system/views/ns2/named1.conf.in @@ -0,0 +1,53 @@ +/* + * 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 { + 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 yes; + notify yes; +}; + +key rndc_key { + secret "1234abcd8765"; + algorithm hmac-sha256; +}; + +controls { + inet 10.53.0.2 port @CONTROLPORT@ allow { any; } keys { rndc_key; }; +}; + + +zone "." { + type hint; + file "../../common/root.hint"; +}; + +zone "example" { + type primary; + file "example.db"; + allow-update { any; }; +}; + +zone "inline" { + type primary; + file "external/inline.db"; + key-directory "external"; + auto-dnssec maintain; + inline-signing yes; +}; diff --git a/bin/tests/system/views/ns2/named2.conf.in b/bin/tests/system/views/ns2/named2.conf.in new file mode 100644 index 0000000..f8759fb --- /dev/null +++ b/bin/tests/system/views/ns2/named2.conf.in @@ -0,0 +1,100 @@ +/* + * 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 { + 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; 10.53.0.4; }; + listen-on-v6 { none; }; + recursion yes; + notify yes; +}; + +key rndc_key { + secret "1234abcd8765"; + algorithm hmac-sha256; +}; + +controls { + inet 10.53.0.2 port @CONTROLPORT@ allow { any; } keys { rndc_key; }; +}; + +view "internal" { + match-clients { 10.53.0.2; + 10.53.0.3; }; + + zone "." { + type hint; + file "../../common/root.hint"; + }; + + zone "example" { + type primary; + file "internal.db"; + allow-update { any; }; + }; + + zone "clone" { + type primary; + file "clone.db"; + allow-update { any; }; + }; + + zone "1.10.in-addr.arpa" { + type primary; + file "1.10.in-addr.arpa.db"; + }; + + zone "inline" { + type primary; + file "internal/inline.db"; + key-directory "internal"; + auto-dnssec maintain; + inline-signing yes; + }; +}; + +view "external" { + match-clients { any; }; + + zone "." { + type hint; + file "../../common/root.hint"; + }; + + zone "example" { + type primary; + file "example.db"; + }; + + zone "clone" { + in-view internal; + forward only; + forwarders { 10.53.0.5; }; + }; + + zone "1.10.in-addr.arpa" { + in-view internal; + }; + + zone "inline" { + type primary; + file "external/inline.db"; + key-directory "external"; + auto-dnssec maintain; + inline-signing yes; + }; +}; diff --git a/bin/tests/system/views/ns2/named3.conf.in b/bin/tests/system/views/ns2/named3.conf.in new file mode 100644 index 0000000..838cfb8 --- /dev/null +++ b/bin/tests/system/views/ns2/named3.conf.in @@ -0,0 +1,35 @@ +/* + * 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 { + 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 no; +}; + +key rndc_key { + secret "1234abcd8765"; + algorithm hmac-sha256; +}; + +controls { + inet 10.53.0.2 port @CONTROLPORT@ allow { any; } keys { rndc_key; }; +}; + +include "zones.conf"; diff --git a/bin/tests/system/views/ns3/child.clone.db b/bin/tests/system/views/ns3/child.clone.db new file mode 100644 index 0000000..9b90023 --- /dev/null +++ b/bin/tests/system/views/ns3/child.clone.db @@ -0,0 +1,22 @@ +; 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 300 ; 5 minutes +@ IN SOA ns3. . ( + 1 ; serial + 20 ; refresh (20 seconds) + 20 ; retry (20 seconds) + 1814400 ; expire (3 weeks) + 3600 ; minimum (1 hour) + ) +@ NS ns3 +@ TXT This is NS3. +ns3 A 10.53.0.3 diff --git a/bin/tests/system/views/ns3/internal.db b/bin/tests/system/views/ns3/internal.db new file mode 100644 index 0000000..c93c2b0 --- /dev/null +++ b/bin/tests/system/views/ns3/internal.db @@ -0,0 +1,28 @@ +; 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. + +$ORIGIN . +$TTL 300 ; 5 minutes +example IN SOA mname1. . ( + 1 ; serial + 20 ; refresh (20 seconds) + 20 ; retry (20 seconds) + 1814400 ; expire (3 weeks) + 3600 ; minimum (1 hour) + ) +example. NS ns3.example. +ns3.example. A 10.53.0.3 + +$ORIGIN example. +a A 10.1.0.1 + MX 10 intmail.example. + +intmail A 10.1.0.2 diff --git a/bin/tests/system/views/ns3/named1.conf.in b/bin/tests/system/views/ns3/named1.conf.in new file mode 100644 index 0000000..bec49f5 --- /dev/null +++ b/bin/tests/system/views/ns3/named1.conf.in @@ -0,0 +1,50 @@ +/* + * 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 { + query-source address 10.53.0.3; + notify-source 10.53.0.3; + transfer-source 10.53.0.3; + port @PORT@; + directory "."; + pid-file "named.pid"; + listen-on { 10.53.0.3; }; + listen-on-v6 { none; }; + recursion yes; + notify yes; +}; + +key rndc_key { + secret "1234abcd8765"; + algorithm hmac-sha256; +}; + +controls { + inet 10.53.0.3 port @CONTROLPORT@ allow { any; } keys { rndc_key; }; +}; + +zone "." { + type hint; + file "../../common/root.hint"; +}; + +zone "example" { + type primary; + allow-update { any; }; + file "internal.db"; +}; + +zone "child.clone" { + type primary; + file "child.clone.db"; +}; diff --git a/bin/tests/system/views/ns3/named2.conf.in b/bin/tests/system/views/ns3/named2.conf.in new file mode 100644 index 0000000..3becdd6 --- /dev/null +++ b/bin/tests/system/views/ns3/named2.conf.in @@ -0,0 +1,50 @@ +/* + * 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 { + query-source address 10.53.0.3; + notify-source 10.53.0.3; + transfer-source 10.53.0.3; + port @PORT@; + directory "."; + pid-file "named.pid"; + listen-on { 10.53.0.3; }; + listen-on-v6 { none; }; + recursion yes; + notify yes; +}; + +key rndc_key { + secret "1234abcd8765"; + algorithm hmac-sha256; +}; + +controls { + inet 10.53.0.3 port @CONTROLPORT@ allow { any; } keys { rndc_key; }; +}; + +zone "." { + type hint; + file "../../common/root.hint"; +}; + +zone "example" { + type secondary; + primaries { 10.53.0.2; }; + file "internal.bk"; +}; + +zone "child.clone" { + type primary; + file "child.clone.db"; +}; diff --git a/bin/tests/system/views/ns5/child.clone.db b/bin/tests/system/views/ns5/child.clone.db new file mode 100644 index 0000000..e29143b --- /dev/null +++ b/bin/tests/system/views/ns5/child.clone.db @@ -0,0 +1,22 @@ +; 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 300 ; 5 minutes +@ IN SOA ns3. . ( + 1 ; serial + 20 ; refresh (20 seconds) + 20 ; retry (20 seconds) + 1814400 ; expire (3 weeks) + 3600 ; minimum (1 hour) + ) +@ NS ns3 +@ TXT This is NS5. +ns3 A 10.53.0.3 diff --git a/bin/tests/system/views/ns5/named.conf.in b/bin/tests/system/views/ns5/named.conf.in new file mode 100644 index 0000000..4b9e236 --- /dev/null +++ b/bin/tests/system/views/ns5/named.conf.in @@ -0,0 +1,44 @@ +/* + * 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 { + query-source address 10.53.0.5; + notify-source 10.53.0.5; + transfer-source 10.53.0.5; + port @PORT@; + directory "."; + pid-file "named.pid"; + listen-on { 10.53.0.5; }; + listen-on-v6 { none; }; + recursion yes; + notify yes; +}; + +key rndc_key { + secret "1234abcd8765"; + algorithm hmac-sha256; +}; + +controls { + inet 10.53.0.5 port @CONTROLPORT@ allow { any; } keys { rndc_key; }; +}; + +zone "." { + type hint; + file "../../common/root.hint"; +}; + +zone "child.clone" { + type primary; + file "child.clone.db"; +}; diff --git a/bin/tests/system/views/setup.sh b/bin/tests/system/views/setup.sh new file mode 100644 index 0000000..278cb4d --- /dev/null +++ b/bin/tests/system/views/setup.sh @@ -0,0 +1,39 @@ +#!/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 + +SYSTEMTESTTOP=.. +# shellcheck source=conf.sh +. $SYSTEMTESTTOP/conf.sh + +cp -f ns2/example1.db ns2/example.db + +copy_setports ns1/named.conf.in ns1/named.conf +copy_setports ns2/named1.conf.in ns2/named.conf +copy_setports ns3/named1.conf.in ns3/named.conf +copy_setports ns5/named.conf.in ns5/named.conf + +# +# We remove k1 and k2 as KEYGEN is deterministic when given the +# same source of "random" data and we want different keys for +# internal and external instances of inline. +# +$KEYGEN -K ns2/internal -a ${DEFAULT_ALGORITHM} -q inline > /dev/null 2>&1 +$KEYGEN -K ns2/internal -a ${DEFAULT_ALGORITHM} -qfk inline > /dev/null 2>&1 +k1=$($KEYGEN -K ns2/external -a ${DEFAULT_ALGORITHM} -q inline 2> /dev/null) +k2=$($KEYGEN -K ns2/external -a ${DEFAULT_ALGORITHM} -qfk inline 2> /dev/null) +$KEYGEN -K ns2/external -a ${DEFAULT_ALGORITHM} -q inline > /dev/null 2>&1 +$KEYGEN -K ns2/external -a ${DEFAULT_ALGORITHM} -qfk inline > /dev/null 2>&1 +test -n "$k1" && rm -f ns2/external/"$k1".* +test -n "$k2" && rm -f ns2/external/"$k2".* diff --git a/bin/tests/system/views/tests.sh b/bin/tests/system/views/tests.sh new file mode 100644 index 0000000..5f5daad --- /dev/null +++ b/bin/tests/system/views/tests.sh @@ -0,0 +1,190 @@ +#!/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 + +SYSTEMTESTTOP=.. +# shellcheck source=conf.sh +. $SYSTEMTESTTOP/conf.sh + +dig_with_opts() { + "$DIG" +tcp +noadd +nosea +nostat +noquest +nocomm +nocmd +noauth -p "${PORT}" "$@" +} + +dig_with_shortopts() { + "$DIG" +tcp +short -p "${PORT}" "$@" +} + +RNDCCMD="$RNDC -c $SYSTEMTESTTOP/common/rndc.conf -p ${CONTROLPORT} -s" + +status=0 + +echo_i "fetching a.example from ns2's initial configuration" +dig_with_opts a.example. @10.53.0.2 any > dig.out.ns2.1 || status=1 + +echo_i "fetching a.example from ns3's initial configuration" +dig_with_opts a.example. @10.53.0.3 any > dig.out.ns3.1 || status=1 + +echo_i "copying in new configurations for ns2 and ns3" +rm -f ns2/named.conf ns3/named.conf ns2/example.db +cp -f ns2/example2.db ns2/example.db +copy_setports ns2/named2.conf.in ns2/named.conf +copy_setports ns3/named2.conf.in ns3/named.conf + +echo_i "reloading ns2 and ns3 with rndc" +nextpart ns2/named.run > /dev/null +nextpart ns3/named.run > /dev/null +rndc_reload ns2 10.53.0.2 +rndc_reload ns3 10.53.0.3 + +echo_i "wait for reload to complete" +ret=0 +_check_reload() ( + nextpartpeek ns2/named.run | grep "all zones loaded" > /dev/null && \ + nextpartpeek ns3/named.run | grep "all zones loaded" > /dev/null && \ + nextpartpeek ns3/named.run | grep "zone_dump: zone example/IN: enter" > /dev/null +) +retry_quiet 10 _check_reload || ret=1 +if [ $ret != 0 ]; then echo_i "failed"; fi +status=$((status + ret)) + +echo_i "fetching a.example from ns2's 10.53.0.4, source address 10.53.0.4" +dig_with_opts -b 10.53.0.4 a.example. @10.53.0.4 any > dig.out.ns4.2 || status=1 + +echo_i "fetching a.example from ns2's 10.53.0.2, source address 10.53.0.2" +dig_with_opts -b 10.53.0.2 a.example. @10.53.0.2 any > dig.out.ns2.2 || status=1 + +echo_i "fetching a.example from ns3's 10.53.0.3, source address defaulted" +dig_with_opts @10.53.0.3 a.example. any > dig.out.ns3.2 || status=1 + +echo_i "comparing ns3's initial a.example to one from reconfigured 10.53.0.2" +digcomp dig.out.ns3.1 dig.out.ns2.2 || status=1 + +echo_i "comparing ns3's initial a.example to one from reconfigured 10.53.0.3" +digcomp dig.out.ns3.1 dig.out.ns3.2 || status=1 + +echo_i "comparing ns2's initial a.example to one from reconfigured 10.53.0.4" +digcomp dig.out.ns2.1 dig.out.ns4.2 || status=1 + +echo_i "comparing ns2's initial a.example to one from reconfigured 10.53.0.3" +echo_i "(should be different)" +if $PERL ../digcomp.pl dig.out.ns2.1 dig.out.ns3.2 >/dev/null +then + echo_i "no differences found. something's wrong." + status=1 +fi + +echo_i "updating cloned zone in internal view" +$NSUPDATE << EOF +server 10.53.0.2 ${PORT} +zone clone +update add b.clone. 300 in a 10.1.0.3 +send +EOF +echo_i "sleeping to allow update to take effect" +sleep 5 + +echo_i "verifying update affected both views" +ret=0 +one=$(dig_with_shortopts -b 10.53.0.2 @10.53.0.2 b.clone a) +two=$(dig_with_shortopts -b 10.53.0.4 @10.53.0.2 b.clone a) +if [ "$one" != "$two" ]; then + echo_i "'$one' does not match '$two'" + ret=1 +fi +if [ $ret != 0 ]; then echo_i "failed"; fi +status=$((status + ret)) + +echo_i "verifying forwarder in cloned zone works" +ret=0 +one=$(dig_with_shortopts -b 10.53.0.2 @10.53.0.2 child.clone txt) +two=$(dig_with_shortopts -b 10.53.0.4 @10.53.0.2 child.clone txt) +three=$(dig_with_shortopts @10.53.0.3 child.clone txt) +four=$(dig_with_shortopts @10.53.0.5 child.clone txt) +echo "$three" | grep NS3 > /dev/null || { ret=1; echo_i "expected response from NS3 got '$three'"; } +echo "$four" | grep NS5 > /dev/null || { ret=1; echo_i "expected response from NS5 got '$four'"; } +if [ "$one" = "$two" ]; then + echo_i "'$one' matches '$two'" + ret=1 +fi +if [ "$one" != "$three" ]; then + echo_i "'$one' does not match '$three'" + ret=1 +fi +if [ "$two" != "$four" ]; then + echo_i "'$two' does not match '$four'" + ret=1 +fi +if [ $ret != 0 ]; then echo_i "failed"; fi +status=$((status + ret)) + +echo_i "verifying inline zones work with views" +ret=0 +wait_for_signed() { + "$DIG" -p "${PORT}" @10.53.0.2 -b 10.53.0.2 +dnssec DNSKEY inline > dig.out.internal + "$DIG" -p "${PORT}" @10.53.0.2 -b 10.53.0.5 +dnssec DNSKEY inline > dig.out.external + grep "ANSWER: 4," dig.out.internal > /dev/null || return 1 + grep "ANSWER: 4," dig.out.external > /dev/null || return 1 + return 0 +} +retry_quiet 10 wait_for_signed || ret=1 +int=$(awk '$4 == "DNSKEY" { print $8 }' dig.out.internal | sort) +ext=$(awk '$4 == "DNSKEY" { print $8 }' dig.out.external | sort) +test "$int" != "$ext" || ret=1 +if [ $ret != 0 ]; then echo_i "failed"; fi +status=$((status + ret)) + +echo_i "verifying adding of multiple inline zones followed by reconfiguration works" + +[ ! -f ns2/zones.conf ] && touch ns2/zones.conf +copy_setports ns2/named3.conf.in ns2/named.conf + +i=1 +while [ $i -lt 50 ]; do + ret=0 + zone_name=$(printf "example%03d.com" $i) + + # Add a new zone to the configuration. + cat >> ns2/zones.conf <<-EOF + zone "${zone_name}" { + type master; + file "db.${zone_name}"; + dnssec-dnskey-kskonly yes; + auto-dnssec maintain; + inline-signing yes; + }; + EOF + + # Create a master file for the zone. + cat > "ns2/db.${zone_name}" <<-EOF + \$TTL 86400 + @ IN SOA localhost. hostmaster.localhost ( + 1612542642 ; serial + 12H ; refresh + 1H ; retry + 2w ; expiry + 1h ; minimum + ) + @ IN NS localhost + localhost IN A 127.0.0.1 + EOF + + $KEYGEN -q -Kns2 -fk -aecdsa256 "${zone_name}" > /dev/null + $RNDCCMD 10.53.0.2 reconfig || ret=1 + if [ $ret != 0 ]; then echo_i "failed"; break; fi + i=$((i + 1)) +done +status=$((status + ret)) + +echo_i "exit status: $status" +[ "$status" -eq 0 ] || exit 1 -- cgit v1.2.3