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/padding/clean.sh | 21 +++++ bin/tests/system/padding/ns1/named.conf.in | 39 ++++++++ bin/tests/system/padding/ns1/root.db | 24 +++++ bin/tests/system/padding/ns2/example.db | 15 +++ bin/tests/system/padding/ns2/named.conf.in | 45 +++++++++ bin/tests/system/padding/ns3/named.conf.in | 45 +++++++++ bin/tests/system/padding/ns4/named.conf.in | 45 +++++++++ bin/tests/system/padding/setup.sh | 23 +++++ bin/tests/system/padding/tests.sh | 135 +++++++++++++++++++++++++++ bin/tests/system/padding/tests_sh_padding.py | 14 +++ 10 files changed, 406 insertions(+) create mode 100644 bin/tests/system/padding/clean.sh create mode 100644 bin/tests/system/padding/ns1/named.conf.in create mode 100644 bin/tests/system/padding/ns1/root.db create mode 100644 bin/tests/system/padding/ns2/example.db create mode 100644 bin/tests/system/padding/ns2/named.conf.in create mode 100644 bin/tests/system/padding/ns3/named.conf.in create mode 100644 bin/tests/system/padding/ns4/named.conf.in create mode 100644 bin/tests/system/padding/setup.sh create mode 100644 bin/tests/system/padding/tests.sh create mode 100644 bin/tests/system/padding/tests_sh_padding.py (limited to 'bin/tests/system/padding') diff --git a/bin/tests/system/padding/clean.sh b/bin/tests/system/padding/clean.sh new file mode 100644 index 0000000..eef2174 --- /dev/null +++ b/bin/tests/system/padding/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 ns*/named.memstats +rm -f ns*/named.run +rm -f ns*/named.stats +rm -f ns*/named.stats.prev +rm -f ns*/named.lock +rm -f ns*/named.conf +rm -f ns*/managed-keys.bind* diff --git a/bin/tests/system/padding/ns1/named.conf.in b/bin/tests/system/padding/ns1/named.conf.in new file mode 100644 index 0000000..32dbf90 --- /dev/null +++ b/bin/tests/system/padding/ns1/named.conf.in @@ -0,0 +1,39 @@ +/* + * 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; + dnssec-validation no; +}; + +key rndc_key { + secret "1234abcd8765"; + algorithm @DEFAULT_HMAC@; +}; + +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/padding/ns1/root.db b/bin/tests/system/padding/ns1/root.db new file mode 100644 index 0000000..17780d1 --- /dev/null +++ b/bin/tests/system/padding/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/padding/ns2/example.db b/bin/tests/system/padding/ns2/example.db new file mode 100644 index 0000000..f6a4b03 --- /dev/null +++ b/bin/tests/system/padding/ns2/example.db @@ -0,0 +1,15 @@ +; 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 diff --git a/bin/tests/system/padding/ns2/named.conf.in b/bin/tests/system/padding/ns2/named.conf.in new file mode 100644 index 0000000..10ba86b --- /dev/null +++ b/bin/tests/system/padding/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 @DEFAULT_HMAC@; +}; + +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; + send-cookie yes; + response-padding { !10.53.0.8; any; } block-size 64; + dnssec-validation no; +}; + +zone "." { + type hint; + file "../../common/root.hint"; +}; + +zone "example" { + type primary; + file "example.db"; +}; diff --git a/bin/tests/system/padding/ns3/named.conf.in b/bin/tests/system/padding/ns3/named.conf.in new file mode 100644 index 0000000..a719249 --- /dev/null +++ b/bin/tests/system/padding/ns3/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. + */ + +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; + dnssec-validation no; +}; + +server 10.53.0.2 { + tcp-only yes; + padding 64; +}; + +key rndc_key { + secret "1234abcd8765"; + algorithm @DEFAULT_HMAC@; +}; + +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/padding/ns4/named.conf.in b/bin/tests/system/padding/ns4/named.conf.in new file mode 100644 index 0000000..6828f2a --- /dev/null +++ b/bin/tests/system/padding/ns4/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. + */ + +options { + query-source address 10.53.0.4; + notify-source 10.53.0.4; + transfer-source 10.53.0.4; + port @PORT@; + directory "."; + pid-file "named.pid"; + listen-on { 10.53.0.4; }; + listen-on-v6 { none; }; + recursion yes; + notify yes; + dnssec-validation no; +}; + +server 10.53.0.2 { + tcp-only no; + padding 64; +}; + +key rndc_key { + secret "1234abcd8765"; + algorithm @DEFAULT_HMAC@; +}; + +controls { + inet 10.53.0.4 port @CONTROLPORT@ allow { any; } keys { rndc_key; }; +}; + +zone "." { + type hint; + file "../../common/root.hint"; +}; diff --git a/bin/tests/system/padding/setup.sh b/bin/tests/system/padding/setup.sh new file mode 100644 index 0000000..594ae98 --- /dev/null +++ b/bin/tests/system/padding/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. + +. ../conf.sh + +$SHELL ./clean.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 + +touch ns2/named.stats diff --git a/bin/tests/system/padding/tests.sh b/bin/tests/system/padding/tests.sh new file mode 100644 index 0000000..c952537 --- /dev/null +++ b/bin/tests/system/padding/tests.sh @@ -0,0 +1,135 @@ +#!/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 + +n=0 +status=0 + +DIGOPTS="-p ${PORT}" +RNDCCMD="$RNDC -c ../common/rndc.conf -p ${CONTROLPORT} -s" + +getcookie() { + awk '$2 == "COOKIE:" { + print $3; + }' < $1 +} + +echo_i "checking that dig handles padding ($n)" +ret=0 +n=$((n + 1)) +$DIG $DIGOPTS +qr +padding=128 foo.example @10.53.0.2 > dig.out.test$n +grep "; PAD" dig.out.test$n > /dev/null || ret=1 +grep "; QUERY SIZE: 128" dig.out.test$n > /dev/null || ret=1 +if [ $ret != 0 ]; then echo_i "failed"; fi +status=$((status + ret)) + +echo_i "checking that dig added padding ($n)" +ret=0 +n=$((n + 1)) +nextpart ns2/named.stats > /dev/null +$RNDCCMD 10.53.0.2 stats +wait_for_log_peek 5 "--- Statistics Dump ---" ns2/named.stats || ret=1 +nextpart ns2/named.stats | grep "EDNS padding option received" > /dev/null || ret=1 + +if [ $ret != 0 ]; then echo_i "failed"; fi +status=$((status + ret)) + +echo_i "checking that padding is added for TCP responses ($n)" +ret=0 +n=$((n + 1)) +$DIG $DIGOPTS +vc +padding=128 foo.example @10.53.0.2 > dig.out.test$n +grep "; PAD" dig.out.test$n > /dev/null || ret=1 +grep "rcvd: 128" dig.out.test$n > /dev/null || ret=1 +if [ $ret != 0 ]; then echo_i "failed"; fi +status=$((status + ret)) + +echo_i "checking that padding is added to valid cookie responses ($n)" +ret=0 +n=$((n + 1)) +$DIG $DIGOPTS +cookie foo.example @10.53.0.2 > dig.out.testc +cookie=$(getcookie dig.out.testc) +$DIG $DIGOPTS +cookie=$cookie +padding=128 foo.example @10.53.0.2 > dig.out.test$n +grep "; PAD" dig.out.test$n > /dev/null || ret=1 +grep "rcvd: 128" dig.out.test$n > /dev/null || ret=1 +if [ $ret != 0 ]; then echo_i "failed"; fi +status=$((status + ret)) + +echo_i "checking that padding must be requested (TCP) ($n)" +ret=0 +n=$((n + 1)) +$DIG $DIGOPTS +vc foo.example @10.53.0.2 > dig.out.test$n +grep "; PAD" dig.out.test$n > /dev/null && ret=1 +if [ $ret != 0 ]; then echo_i "failed"; fi +status=$((status + ret)) + +echo_i "checking that padding must be requested (valid cookie) ($n)" +ret=0 +n=$((n + 1)) +$DIG $DIGOPTS +cookie=$cookie foo.example @10.53.0.2 > dig.out.test$n +grep "; PAD" dig.out.test$n > /dev/null && ret=1 +if [ $ret != 0 ]; then echo_i "failed"; fi +status=$((status + ret)) + +echo_i "checking that padding can be filtered out ($n)" +ret=0 +n=$((n + 1)) +$DIG $DIGOPTS +vc +padding=128 -b 10.53.0.8 foo.example @10.53.0.2 > dig.out.test$n +grep "; PAD" dig.out.test$n > /dev/null && ret=1 +if [ $ret != 0 ]; then echo_i "failed"; fi +status=$((status + ret)) + +echo_i "checking that a TCP and padding server config enables padding ($n)" +ret=0 +n=$((n + 1)) +nextpart ns2/named.stats > /dev/null +$RNDCCMD 10.53.0.2 stats +wait_for_log_peek 5 "--- Statistics Dump ---" ns2/named.stats || ret=1 +opad=$(nextpart ns2/named.stats | awk '/EDNS padding option received/ { print $1}') +$DIG $DIGOPTS foo.example @10.53.0.3 > dig.out.test$n +$RNDCCMD 10.53.0.2 stats +wait_for_log_peek 5 "--- Statistics Dump ---" ns2/named.stats || ret=1 +npad=$(nextpart ns2/named.stats | awk '/EDNS padding option received/ { print $1}') +if [ "$opad" -eq "$npad" ]; then echo_i "error: opad ($opad) == npad ($npad)"; ret=1; fi +if [ $ret != 0 ]; then echo_i "failed"; fi +status=$((status + ret)) + +echo_i "checking that a padding server config should enforce TCP ($n)" +ret=0 +n=$((n + 1)) +nextpart ns2/named.stats > /dev/null +$RNDCCMD 10.53.0.2 stats +wait_for_log_peek 5 "--- Statistics Dump ---" ns2/named.stats || ret=1 +opad=$(nextpart ns2/named.stats | awk '/EDNS padding option received/ { print $1}') +$DIG $DIGOPTS foo.example @10.53.0.4 > dig.out.test$n +$RNDCCMD 10.53.0.2 stats +wait_for_log_peek 5 "--- Statistics Dump ---" ns2/named.stats || ret=1 +npad=$(nextpart ns2/named.stats | awk '/EDNS padding option received/ { print $1}') +if [ "$opad" -ne "$npad" ]; then echo_i "error: opad ($opad) != npad ($npad)"; ret=1; fi +if [ $ret != 0 ]; then echo_i "failed"; fi +status=$((status + ret)) + +echo_i "checking that zero-length padding option has no effect ($n)" +ret=0 +n=$((n + 1)) +$DIG $DIGOPTS +qr +ednsopt=12 foo.example @10.53.0.2 > dig.out.test$n.1 +grep "; PAD" dig.out.test$n.1 > /dev/null || ret=1 +$DIG $DIGOPTS +qr +ednsopt=12:00 foo.example @10.53.0.2 > dig.out.test$n.2 +grep "; PAD" dig.out.test$n.2 > /dev/null || 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/padding/tests_sh_padding.py b/bin/tests/system/padding/tests_sh_padding.py new file mode 100644 index 0000000..a2eec7c --- /dev/null +++ b/bin/tests/system/padding/tests_sh_padding.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_padding(run_tests_sh): + run_tests_sh() -- cgit v1.2.3