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/keepalive/clean.sh | 21 ++++++ bin/tests/system/keepalive/expected | 4 ++ bin/tests/system/keepalive/ns1/named.conf.in | 38 +++++++++++ bin/tests/system/keepalive/ns1/root.db | 24 +++++++ bin/tests/system/keepalive/ns2/example.db | 16 +++++ bin/tests/system/keepalive/ns2/named.conf.in | 45 +++++++++++++ bin/tests/system/keepalive/ns3/named.conf.in | 44 +++++++++++++ bin/tests/system/keepalive/setup.sh | 19 ++++++ bin/tests/system/keepalive/tests.sh | 98 ++++++++++++++++++++++++++++ 9 files changed, 309 insertions(+) create mode 100644 bin/tests/system/keepalive/clean.sh create mode 100644 bin/tests/system/keepalive/expected create mode 100644 bin/tests/system/keepalive/ns1/named.conf.in create mode 100644 bin/tests/system/keepalive/ns1/root.db create mode 100644 bin/tests/system/keepalive/ns2/example.db create mode 100644 bin/tests/system/keepalive/ns2/named.conf.in create mode 100644 bin/tests/system/keepalive/ns3/named.conf.in create mode 100644 bin/tests/system/keepalive/setup.sh create mode 100644 bin/tests/system/keepalive/tests.sh (limited to 'bin/tests/system/keepalive') diff --git a/bin/tests/system/keepalive/clean.sh b/bin/tests/system/keepalive/clean.sh new file mode 100644 index 0000000..9ccbd12 --- /dev/null +++ b/bin/tests/system/keepalive/clean.sh @@ -0,0 +1,21 @@ +#!/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 dig.out.* +rm -f output +rm -f ns*/named.memstats +rm -f ns*/named.run +rm -f ns*/named.conf +rm -f ns*/named.stats +rm -f ns*/named.lock +rm -f ns*/managed-keys.bind* diff --git a/bin/tests/system/keepalive/expected b/bin/tests/system/keepalive/expected new file mode 100644 index 0000000..e498db7 --- /dev/null +++ b/bin/tests/system/keepalive/expected @@ -0,0 +1,4 @@ +tcp-initial-timeout=300 +tcp-idle-timeout=300 +tcp-keepalive-timeout=300 +tcp-advertised-timeout=200 diff --git a/bin/tests/system/keepalive/ns1/named.conf.in b/bin/tests/system/keepalive/ns1/named.conf.in new file mode 100644 index 0000000..26cf4b3 --- /dev/null +++ b/bin/tests/system/keepalive/ns1/named.conf.in @@ -0,0 +1,38 @@ +/* + * 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; +}; + +key rndc_key { + secret "1234abcd8765"; + algorithm hmac-sha256; +}; + +controls { + inet 10.53.0.1 port @CONTROLPORT@ allow { any; } keys { rndc_key; }; +}; + +zone "." { + type primary; + file "root.db"; +}; diff --git a/bin/tests/system/keepalive/ns1/root.db b/bin/tests/system/keepalive/ns1/root.db new file mode 100644 index 0000000..17780d1 --- /dev/null +++ b/bin/tests/system/keepalive/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/keepalive/ns2/example.db b/bin/tests/system/keepalive/ns2/example.db new file mode 100644 index 0000000..ccc6ef9 --- /dev/null +++ b/bin/tests/system/keepalive/ns2/example.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. + +@ SOA ns2 hostmaster.isc.org. 1 600 600 1200 600 +@ NS ns2 +ns2 A 10.53.0.2 +foo A 10.53.1.1 +bar A 10.53.2.2 diff --git a/bin/tests/system/keepalive/ns2/named.conf.in b/bin/tests/system/keepalive/ns2/named.conf.in new file mode 100644 index 0000000..6e308f4 --- /dev/null +++ b/bin/tests/system/keepalive/ns2/named.conf.in @@ -0,0 +1,45 @@ +/* + * 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. + */ + +key rndc_key { + secret "1234abcd8765"; + algorithm hmac-sha256; +}; + +controls { + inet 10.53.0.2 port @CONTROLPORT@ allow { any; } keys { rndc_key; }; +}; + +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; + acache-enable yes; + send-cookie yes; + tcp-advertised-timeout 150; +}; + +zone "." { + type hint; + file "../../common/root.hint"; +}; + +zone "example" { + type primary; + file "example.db"; +}; diff --git a/bin/tests/system/keepalive/ns3/named.conf.in b/bin/tests/system/keepalive/ns3/named.conf.in new file mode 100644 index 0000000..b6b8073 --- /dev/null +++ b/bin/tests/system/keepalive/ns3/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.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; +}; + +server 10.53.0.2 { + tcp-only yes; + tcp-keepalive 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"; +}; diff --git a/bin/tests/system/keepalive/setup.sh b/bin/tests/system/keepalive/setup.sh new file mode 100644 index 0000000..57e0575 --- /dev/null +++ b/bin/tests/system/keepalive/setup.sh @@ -0,0 +1,19 @@ +#!/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 diff --git a/bin/tests/system/keepalive/tests.sh b/bin/tests/system/keepalive/tests.sh new file mode 100644 index 0000000..7aea925 --- /dev/null +++ b/bin/tests/system/keepalive/tests.sh @@ -0,0 +1,98 @@ +#!/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="-p ${PORT}" +RNDCCMD="$RNDC -c ../common/rndc.conf -s 10.53.0.2 -p ${CONTROLPORT}" + +n=0 +status=0 + +echo_i "checking that dig handles TCP keepalive ($n)" +ret=0 +n=`expr $n + 1` +$DIG $DIGOPTS +qr +keepalive foo.example @10.53.0.2 > dig.out.test$n +grep "; TCP KEEPALIVE" dig.out.test$n > /dev/null || ret=1 +if [ $ret != 0 ]; then echo_i "failed"; fi +status=`expr $status + $ret` + +echo_i "checking that dig added TCP keepalive ($n)" +ret=0 +n=`expr $n + 1` +$RNDCCMD stats +grep "EDNS TCP keepalive option received" ns2/named.stats > /dev/null || ret=1 +if [ $ret != 0 ]; then echo_i "failed"; fi +status=`expr $status + $ret` + +echo_i "checking that TCP keepalive is added for TCP responses ($n)" +ret=0 +n=`expr $n + 1` +$DIG $DIGOPTS +vc +keepalive foo.example @10.53.0.2 > dig.out.test$n +grep "; TCP KEEPALIVE" dig.out.test$n > /dev/null || ret=1 +if [ $ret != 0 ]; then echo_i "failed"; fi +status=`expr $status + $ret` + +echo_i "checking that TCP keepalive requires TCP ($n)" +ret=0 +n=`expr $n + 1` +$DIG $DIGOPTS +keepalive foo.example @10.53.0.2 > dig.out.test$n +grep "; TCP KEEPALIVE" dig.out.test$n > /dev/null && ret=1 +if [ $ret != 0 ]; then echo_i "failed"; fi +status=`expr $status + $ret` + +echo_i "checking default value ($n)" +ret=0 +n=`expr $n + 1` +$DIG $DIGOPTS +vc +keepalive foo.example @10.53.0.3 > dig.out.test$n +grep "; TCP KEEPALIVE: 30.0 secs" dig.out.test$n > /dev/null || ret=1 +if [ $ret != 0 ]; then echo_i "failed"; fi +status=`expr $status + $ret` + +echo_i "checking configured value ($n)" +ret=0 +n=`expr $n + 1` +$DIG $DIGOPTS +vc +keepalive foo.example @10.53.0.2 > dig.out.test$n +grep "; TCP KEEPALIVE: 15.0 secs" dig.out.test$n > /dev/null || ret=1 +if [ $ret != 0 ]; then echo_i "failed"; fi +status=`expr $status + $ret` + +echo_i "checking re-configured value ($n)" +ret=0 +n=`expr $n + 1` +$RNDCCMD tcp-timeouts 300 300 300 200 > output +$DIFF -b output expected || ret=1 +$DIG $DIGOPTS +vc +keepalive foo.example @10.53.0.2 > dig.out.test$n +grep "; TCP KEEPALIVE: 20.0 secs" dig.out.test$n > /dev/null || ret=1 +if [ $ret != 0 ]; then echo_i "failed"; fi +status=`expr $status + $ret` + +echo_i "checking server config entry ($n)" +ret=0 +n=`expr $n + 1` +$RNDCCMD stats +oka=`grep "EDNS TCP keepalive option received" ns2/named.stats | \ + tail -1 | awk '{ print $1}'` +$DIG $DIGOPTS bar.example @10.53.0.3 > dig.out.test$n +$RNDCCMD stats +nka=`grep "EDNS TCP keepalive option received" ns2/named.stats | \ + tail -1 | awk '{ print $1}'` +#echo oka ':' $oka +#echo nka ':' $nka +if [ "$oka" -eq "$nka" ]; then ret=1; fi +if [ $ret != 0 ]; then echo_i "failed"; fi +status=`expr $status + $ret` + +echo_i "exit status: $status" +[ $status -eq 0 ] || exit 1 -- cgit v1.2.3