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/dscp/clean.sh | 20 ++++++++++++++++ bin/tests/system/dscp/ns1/named.args | 1 + bin/tests/system/dscp/ns1/named.conf.in | 31 ++++++++++++++++++++++++ bin/tests/system/dscp/ns1/root.db | 19 +++++++++++++++ bin/tests/system/dscp/ns2/named.args | 1 + bin/tests/system/dscp/ns2/named.conf.in | 32 +++++++++++++++++++++++++ bin/tests/system/dscp/ns3/hint.db | 16 +++++++++++++ bin/tests/system/dscp/ns3/named.args | 1 + bin/tests/system/dscp/ns3/named.conf.in | 31 ++++++++++++++++++++++++ bin/tests/system/dscp/ns4/named.args | 1 + bin/tests/system/dscp/ns4/named.conf.in | 31 ++++++++++++++++++++++++ bin/tests/system/dscp/ns4/root.db | 19 +++++++++++++++ bin/tests/system/dscp/ns5/named.args | 1 + bin/tests/system/dscp/ns5/named.conf.in | 33 ++++++++++++++++++++++++++ bin/tests/system/dscp/ns6/hint.db | 16 +++++++++++++ bin/tests/system/dscp/ns6/named.args | 1 + bin/tests/system/dscp/ns6/named.conf.in | 31 ++++++++++++++++++++++++ bin/tests/system/dscp/ns7/named.args | 1 + bin/tests/system/dscp/ns7/named.conf.in | 36 ++++++++++++++++++++++++++++ bin/tests/system/dscp/setup.sh | 23 ++++++++++++++++++ bin/tests/system/dscp/tests.sh | 42 +++++++++++++++++++++++++++++++++ 21 files changed, 387 insertions(+) create mode 100644 bin/tests/system/dscp/clean.sh create mode 100644 bin/tests/system/dscp/ns1/named.args create mode 100644 bin/tests/system/dscp/ns1/named.conf.in create mode 100644 bin/tests/system/dscp/ns1/root.db create mode 100644 bin/tests/system/dscp/ns2/named.args create mode 100644 bin/tests/system/dscp/ns2/named.conf.in create mode 100644 bin/tests/system/dscp/ns3/hint.db create mode 100644 bin/tests/system/dscp/ns3/named.args create mode 100644 bin/tests/system/dscp/ns3/named.conf.in create mode 100644 bin/tests/system/dscp/ns4/named.args create mode 100644 bin/tests/system/dscp/ns4/named.conf.in create mode 100644 bin/tests/system/dscp/ns4/root.db create mode 100644 bin/tests/system/dscp/ns5/named.args create mode 100644 bin/tests/system/dscp/ns5/named.conf.in create mode 100644 bin/tests/system/dscp/ns6/hint.db create mode 100644 bin/tests/system/dscp/ns6/named.args create mode 100644 bin/tests/system/dscp/ns6/named.conf.in create mode 100644 bin/tests/system/dscp/ns7/named.args create mode 100644 bin/tests/system/dscp/ns7/named.conf.in create mode 100644 bin/tests/system/dscp/setup.sh create mode 100644 bin/tests/system/dscp/tests.sh (limited to 'bin/tests/system/dscp') diff --git a/bin/tests/system/dscp/clean.sh b/bin/tests/system/dscp/clean.sh new file mode 100644 index 0000000..e52f7b6 --- /dev/null +++ b/bin/tests/system/dscp/clean.sh @@ -0,0 +1,20 @@ +#!/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 */root.bk +rm -f dig.out.10.53.0.? +rm -f */named.memstats +rm -f */named.run +rm -f */named.conf +rm -f ns*/named.lock +rm -f ns*/managed-keys.bind* diff --git a/bin/tests/system/dscp/ns1/named.args b/bin/tests/system/dscp/ns1/named.args new file mode 100644 index 0000000..0c955c7 --- /dev/null +++ b/bin/tests/system/dscp/ns1/named.args @@ -0,0 +1 @@ +-m record,size,mctx -c named.conf -d 99 -D dscp-ns1 -X named.lock -g -U 4 -T maxcachesize=2097152 -T dscp=46 diff --git a/bin/tests/system/dscp/ns1/named.conf.in b/bin/tests/system/dscp/ns1/named.conf.in new file mode 100644 index 0000000..e5c7971 --- /dev/null +++ b/bin/tests/system/dscp/ns1/named.conf.in @@ -0,0 +1,31 @@ +/* + * 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 { + dscp 46; + 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; + dnssec-validation no; + notify yes; +}; + +zone "." { + type primary; + file "root.db"; +}; diff --git a/bin/tests/system/dscp/ns1/root.db b/bin/tests/system/dscp/ns1/root.db new file mode 100644 index 0000000..9d473e2 --- /dev/null +++ b/bin/tests/system/dscp/ns1/root.db @@ -0,0 +1,19 @@ +; 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 3600 +. SOA ns1.nil-servers. marka.isc.org. 1 3600 1200 3600000 1200 +. NS ns1.nil-servers. +. NS ns2.nil-servers. +ns1.nil-servers. A 10.53.0.1 +ns2.nil-servers. A 10.53.0.2 +xxx.example. A 10.53.0.1 +xxx.tld. A 10.53.0.1 diff --git a/bin/tests/system/dscp/ns2/named.args b/bin/tests/system/dscp/ns2/named.args new file mode 100644 index 0000000..ff501a8 --- /dev/null +++ b/bin/tests/system/dscp/ns2/named.args @@ -0,0 +1 @@ +-m record,size,mctx -c named.conf -d 99 -D dscp-ns2 -X named.lock -g -U 4 -T maxcachesize=2097152 -T dscp=46 diff --git a/bin/tests/system/dscp/ns2/named.conf.in b/bin/tests/system/dscp/ns2/named.conf.in new file mode 100644 index 0000000..ca835c8 --- /dev/null +++ b/bin/tests/system/dscp/ns2/named.conf.in @@ -0,0 +1,32 @@ +/* + * 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 { + dscp 46; + 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; + dnssec-validation no; + notify yes; +}; + +zone "." { + type secondary; + file "root.bk"; + primaries { 10.53.0.1; }; +}; diff --git a/bin/tests/system/dscp/ns3/hint.db b/bin/tests/system/dscp/ns3/hint.db new file mode 100644 index 0000000..875a407 --- /dev/null +++ b/bin/tests/system/dscp/ns3/hint.db @@ -0,0 +1,16 @@ +; 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 3600 +. NS ns1.nil-servers. +. NS ns2.nil-servers. +ns1.nil-servers. A 10.53.0.1 +ns2.nil-servers. A 10.53.0.2 diff --git a/bin/tests/system/dscp/ns3/named.args b/bin/tests/system/dscp/ns3/named.args new file mode 100644 index 0000000..3d1981f --- /dev/null +++ b/bin/tests/system/dscp/ns3/named.args @@ -0,0 +1 @@ +-m record,size,mctx -c named.conf -d 99 -D dscp-ns3 -X named.lock -g -U 4 -T maxcachesize=2097152 -T dscp=46 diff --git a/bin/tests/system/dscp/ns3/named.conf.in b/bin/tests/system/dscp/ns3/named.conf.in new file mode 100644 index 0000000..38d4985 --- /dev/null +++ b/bin/tests/system/dscp/ns3/named.conf.in @@ -0,0 +1,31 @@ +/* + * 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 { + dscp 46; + query-source address 10.53.0.3; + notify-source 10.53.0.3; + transfer-source 10.53.0.3; + port @PORT@; + pid-file "named.pid"; + listen-on { 10.53.0.3; }; + listen-on-v6 { none; }; + notify yes; + recursion yes; + dnssec-validation yes; +}; + +zone "." { + type hint; + file "hint.db"; +}; diff --git a/bin/tests/system/dscp/ns4/named.args b/bin/tests/system/dscp/ns4/named.args new file mode 100644 index 0000000..277a47b --- /dev/null +++ b/bin/tests/system/dscp/ns4/named.args @@ -0,0 +1 @@ +-m record,size,mctx -c named.conf -d 99 -D dscp-ns4 -X named.lock -g -U 4 -T maxcachesize=2097152 -T dscp=46 diff --git a/bin/tests/system/dscp/ns4/named.conf.in b/bin/tests/system/dscp/ns4/named.conf.in new file mode 100644 index 0000000..8c8ca4f --- /dev/null +++ b/bin/tests/system/dscp/ns4/named.conf.in @@ -0,0 +1,31 @@ +/* + * 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 { + dscp 47; + query-source dscp 46 address 10.53.0.4; + notify-source 10.53.0.4 dscp 46; + transfer-source 10.53.0.4 dscp 46; + port @PORT@; + pid-file "named.pid"; + listen-on dscp 46 { 10.53.0.4; }; + listen-on-v6 { none; }; + recursion no; + dnssec-validation no; + notify yes; +}; + +zone "." { + type primary; + file "root.db"; +}; diff --git a/bin/tests/system/dscp/ns4/root.db b/bin/tests/system/dscp/ns4/root.db new file mode 100644 index 0000000..cb3b395 --- /dev/null +++ b/bin/tests/system/dscp/ns4/root.db @@ -0,0 +1,19 @@ +; 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 3600 +. SOA ns4.nil-servers. marka.isc.org. 1 3600 1200 3600000 1200 +. NS ns4.nil-servers. +. NS ns5.nil-servers. +ns4.nil-servers. A 10.53.0.4 +ns5.nil-servers. A 10.53.0.5 +xxx.example. A 10.53.0.1 +xxx.tld. A 10.53.0.1 diff --git a/bin/tests/system/dscp/ns5/named.args b/bin/tests/system/dscp/ns5/named.args new file mode 100644 index 0000000..c678163 --- /dev/null +++ b/bin/tests/system/dscp/ns5/named.args @@ -0,0 +1 @@ +-m record,size,mctx -c named.conf -d 99 -D dscp-ns5 -X named.lock -g -U 4 -T maxcachesize=2097152 -T dscp=46 diff --git a/bin/tests/system/dscp/ns5/named.conf.in b/bin/tests/system/dscp/ns5/named.conf.in new file mode 100644 index 0000000..2d1db3c --- /dev/null +++ b/bin/tests/system/dscp/ns5/named.conf.in @@ -0,0 +1,33 @@ +/* + * 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 { + dscp 47; + query-source dscp 46 address 10.53.0.5; + notify-source 10.53.0.5 dscp 46; + transfer-source 10.53.0.5 dscp 46; + alt-transfer-source 10.53.0.5 dscp 46; + port @PORT@; + pid-file "named.pid"; + listen-on dscp 46 { 10.53.0.5; }; + listen-on-v6 { none; }; + recursion no; + dnssec-validation no; + notify yes; +}; + +zone "." { + type secondary; + file "root.bk"; + primaries { 10.53.0.4; }; +}; diff --git a/bin/tests/system/dscp/ns6/hint.db b/bin/tests/system/dscp/ns6/hint.db new file mode 100644 index 0000000..c2c51f2 --- /dev/null +++ b/bin/tests/system/dscp/ns6/hint.db @@ -0,0 +1,16 @@ +; 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 3600 +. NS ns4.nil-servers. +. NS ns5.nil-servers. +ns4.nil-servers. A 10.53.0.4 +ns5.nil-servers. A 10.53.0.5 diff --git a/bin/tests/system/dscp/ns6/named.args b/bin/tests/system/dscp/ns6/named.args new file mode 100644 index 0000000..283cf22 --- /dev/null +++ b/bin/tests/system/dscp/ns6/named.args @@ -0,0 +1 @@ +-m record,size,mctx -c named.conf -d 99 -D dscp-ns6 -X named.lock -g -U 4 -T maxcachesize=2097152 -T dscp=46 diff --git a/bin/tests/system/dscp/ns6/named.conf.in b/bin/tests/system/dscp/ns6/named.conf.in new file mode 100644 index 0000000..94c1b59 --- /dev/null +++ b/bin/tests/system/dscp/ns6/named.conf.in @@ -0,0 +1,31 @@ +/* + * 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 { + dscp 47; + query-source dscp 46 address 10.53.0.6; + notify-source 10.53.0.6 dscp 46; + transfer-source 10.53.0.6 dscp 46; + port @PORT@; + pid-file "named.pid"; + listen-on dscp 46 { 10.53.0.6; }; + listen-on-v6 { none; }; + notify yes; + recursion yes; + dnssec-validation yes; +}; + +zone "." { + type hint; + file "hint.db"; +}; diff --git a/bin/tests/system/dscp/ns7/named.args b/bin/tests/system/dscp/ns7/named.args new file mode 100644 index 0000000..4ccf38e --- /dev/null +++ b/bin/tests/system/dscp/ns7/named.args @@ -0,0 +1 @@ +-m record,size,mctx -c named.conf -d 99 -D dscp-ns7 -X named.lock -g -U 4 -T maxcachesize=2097152 -T dscp=46 diff --git a/bin/tests/system/dscp/ns7/named.conf.in b/bin/tests/system/dscp/ns7/named.conf.in new file mode 100644 index 0000000..cbf7096 --- /dev/null +++ b/bin/tests/system/dscp/ns7/named.conf.in @@ -0,0 +1,36 @@ +/* + * 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 { + dscp 47; + query-source dscp 46 address 10.53.0.7; + notify-source 10.53.0.7 dscp 47; + transfer-source 10.53.0.7 dscp 47; + alt-transfer-source 10.53.0.7 dscp 47; + port @PORT@; + pid-file "named.pid"; + listen-on dscp 46 { 10.53.0.7; }; + listen-on-v6 { none; }; + recursion no; + dnssec-validation no; + notify yes; +}; + +zone "." { + type secondary; + file "root.bk"; + transfer-source 10.53.0.7 dscp 46; + notify-source 10.53.0.7 dscp 46; + alt-transfer-source 10.53.0.7 dscp 46; + primaries { 10.53.0.4; }; +}; diff --git a/bin/tests/system/dscp/setup.sh b/bin/tests/system/dscp/setup.sh new file mode 100644 index 0000000..5cc2958 --- /dev/null +++ b/bin/tests/system/dscp/setup.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. + +SYSTEMTESTTOP=.. +. $SYSTEMTESTTOP/conf.sh + +copy_setports ns1/named.conf.in ns1/named.conf +copy_setports ns2/named.conf.in ns2/named.conf +copy_setports ns3/named.conf.in ns3/named.conf +copy_setports ns4/named.conf.in ns4/named.conf +copy_setports ns5/named.conf.in ns5/named.conf +copy_setports ns6/named.conf.in ns6/named.conf +copy_setports ns7/named.conf.in ns7/named.conf diff --git a/bin/tests/system/dscp/tests.sh b/bin/tests/system/dscp/tests.sh new file mode 100644 index 0000000..d6b0824 --- /dev/null +++ b/bin/tests/system/dscp/tests.sh @@ -0,0 +1,42 @@ +#!/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. + +SYSTEMTESTTOP=.. +. $SYSTEMTESTTOP/conf.sh + +DIGOPTS="+tcp +noadd +nosea +nostat +noquest -p ${PORT}" + +status=0 + +# +# 10.53.0.1 10.53.0.2 10.53.0.3 have a global dscp setting; +# 10.53.0.4 10.53.0.5 10.53.0.6 have dscp set in option *-source clauses; +# 10.53.0.7 has dscp set in zone *-source clauses; +# +for server in 10.53.0.1 10.53.0.2 10.53.0.3 10.53.0.4 10.53.0.5 \ + 10.53.0.6 10.53.0.7 +do + echo_i "testing root SOA lookup at $server" + for i in 0 1 2 3 4 5 6 7 8 9 + do + ret=0 + $DIG $DIGOPTS @$server soa . > dig.out.$server + grep "status: NOERROR" dig.out.$server > /dev/null || ret=1 + test $ret = 0 && break + sleep 1 + done + test $ret = 0 || { echo_i "failed"; status=`expr $status + $ret`; } +done + +echo_i "exit status: $status" +[ $status -eq 0 ] || exit 1 -- cgit v1.2.3