From 375918493e1d9556c33d1541daba15c89bcd2227 Mon Sep 17 00:00:00 2001 From: Mark Andrews Date: Mon, 5 Dec 2022 09:18:51 +1100 Subject: [PATCH 1/4] Check ANY lookup using nslookup (cherry picked from commit c367dd1b0b40709b03499e21b33ea381655ec6fc) --- bin/tests/system/nslookup/tests.sh | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/bin/tests/system/nslookup/tests.sh b/bin/tests/system/nslookup/tests.sh index e3dd0f5264..1978eb40f3 100644 --- a/bin/tests/system/nslookup/tests.sh +++ b/bin/tests/system/nslookup/tests.sh @@ -122,5 +122,20 @@ grep "2001::ffff" nslookup.out${n} > /dev/null || ret=1 if [ $ret != 0 ]; then echo_i "failed"; fi status=$((status+ret)) +n=$((n+1)) +echo_i "Check ANY lookup ($n)" +ret=0 +$NSLOOKUP -port=${PORT} -type=ANY example.net 10.53.0.1 2> nslookup.err${n} > nslookup.out${n} || ret=1 +lines=$(grep -c 'Address:.10\.53\.0\.1#'"${PORT}" nslookup.out${n}) +test $lines -eq 1 || ret=1 +lines=$(grep -c 'origin = ns1\.example\.net' nslookup.out${n}) +test $lines -eq 1 || ret=1 +lines=$(grep -c 'mail addr = hostmaster\.example\.net' nslookup.out${n}) +test $lines -eq 1 || ret=1 +lines=$(grep -c 'nameserver = ns1\.example\.net.' nslookup.out${n}) +test $lines -eq 1 || ret=1 +if [ $ret != 0 ]; then echo_i "failed"; fi +status=$((status+ret)) + echo_i "exit status: $status" [ $status -eq 0 ] || exit 1 From e1234f66c6307d86c5eb5bfa4f62e401a45a4f47 Mon Sep 17 00:00:00 2001 From: Mark Andrews Date: Mon, 5 Dec 2022 10:08:54 +1100 Subject: [PATCH 2/4] Add checks for 'host' (cherry picked from commit e9c4192ee5061be0ca635bc3829829576a2ff1b1) --- bin/tests/system/Makefile.am | 1 + bin/tests/system/host/clean.sh | 21 ++++ bin/tests/system/host/ns1/example.net.db | 31 ++++++ bin/tests/system/host/ns1/named.conf.in | 33 ++++++ bin/tests/system/host/setup.sh | 22 ++++ bin/tests/system/host/tests.sh | 128 +++++++++++++++++++++++ 6 files changed, 236 insertions(+) create mode 100644 bin/tests/system/host/clean.sh create mode 100644 bin/tests/system/host/ns1/example.net.db create mode 100644 bin/tests/system/host/ns1/named.conf.in create mode 100644 bin/tests/system/host/setup.sh create mode 100644 bin/tests/system/host/tests.sh diff --git a/bin/tests/system/Makefile.am b/bin/tests/system/Makefile.am index 34a7ddd0c1..b7c8551465 100644 --- a/bin/tests/system/Makefile.am +++ b/bin/tests/system/Makefile.am @@ -126,6 +126,7 @@ TESTS += \ inline \ integrity \ hooks \ + host \ journal \ keepalive \ keyfromlabel \ diff --git a/bin/tests/system/host/clean.sh b/bin/tests/system/host/clean.sh new file mode 100644 index 0000000000..b03c4594cc --- /dev/null +++ b/bin/tests/system/host/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 ns1/example.db +rm -f host.out* +rm -f host.err* +rm -f ns*/named.lock +rm -f ns*/named.memstats +rm -f ns*/named.run +rm -f ns*/named.conf +rm -f ns*/managed-keys.bind* diff --git a/bin/tests/system/host/ns1/example.net.db b/bin/tests/system/host/ns1/example.net.db new file mode 100644 index 0000000000..73aeeb1e34 --- /dev/null +++ b/bin/tests/system/host/ns1/example.net.db @@ -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. + +$TTL 3600 + +@ 86400 IN SOA ns1 hostmaster ( + 1397051952 ; "SER0" + 5 + 5 + 1814400 + 3600 ) +@ NS ns1 +ns1 A 10.53.0.1 + +a-only A 1.2.3.4 +aaaa-only AAAA 2001::ffff + +dual A 1.2.3.4 + AAAA 2001::ffff + +cname-a-only CNAME a-only +cname-aaaa-only CNAME aaaa-only +cname-dual CNAME dual diff --git a/bin/tests/system/host/ns1/named.conf.in b/bin/tests/system/host/ns1/named.conf.in new file mode 100644 index 0000000000..67b4f4fc76 --- /dev/null +++ b/bin/tests/system/host/ns1/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 { + 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; +}; + +zone "example" { + type primary; + file "example.db"; +}; + +zone "example.net" { + type primary; + file "example.net.db"; +}; diff --git a/bin/tests/system/host/setup.sh b/bin/tests/system/host/setup.sh new file mode 100644 index 0000000000..754d4f36d4 --- /dev/null +++ b/bin/tests/system/host/setup.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. + +set -e + +. ../conf.sh + +$SHELL clean.sh + +$SHELL ${TOP_SRCDIR}/bin/tests/system/genzone.sh 1 >ns1/example.db + +copy_setports ns1/named.conf.in ns1/named.conf diff --git a/bin/tests/system/host/tests.sh b/bin/tests/system/host/tests.sh new file mode 100644 index 0000000000..c640a403b9 --- /dev/null +++ b/bin/tests/system/host/tests.sh @@ -0,0 +1,128 @@ +#!/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 + +# shellcheck disable=SC2086 +. ../conf.sh + +status=0 +n=0 + +n=$((n+1)) +echo_i "Check A only lookup ($n)" +ret=0 +$HOST -p ${PORT} a-only.example.net 10.53.0.1 2> host.err${n} > host.out${n} || ret=1 +lines=$(wc -l < host.err${n}) +test $lines -eq 0 || ret=1 +lines=$(grep -c "Address:" host.out${n}) +test $lines -eq 1 || ret=1 +lines=$(grep -c a-only.example.net host.out${n}) +test $lines -eq 1 || ret=1 +grep "1.2.3.4" host.out${n} > /dev/null || ret=1 +if [ $ret != 0 ]; then echo_i "failed"; fi +status=$((status+ret)) + +n=$((n+1)) +echo_i "Check AAAA only lookup ($n)" +ret=0 +$HOST -p ${PORT} aaaa-only.example.net 10.53.0.1 2> host.err${n} > host.out${n} || ret=1 +lines=$(wc -l < host.err${n}) +test $lines -eq 0 || ret=1 +lines=$(grep -c "Address:" host.out${n}) +test $lines -eq 1 || ret=1 +lines=$(grep -c aaaa-only.example.net host.out${n}) +test $lines -eq 1 || ret=1 +grep "2001::ffff" host.out${n} > /dev/null || ret=1 +if [ $ret != 0 ]; then echo_i "failed"; fi +status=$((status+ret)) + +n=$((n+1)) +echo_i "Check dual A + AAAA lookup ($n)" +ret=0 +$HOST -p ${PORT} dual.example.net 10.53.0.1 2> host.err${n} > host.out${n} || ret=1 +lines=$(wc -l < host.err${n}) +test $lines -eq 0 || ret=1 +lines=$(grep -c "Address:" host.out${n}) +test $lines -eq 1 || ret=1 +lines=$(grep -c dual.example.net host.out${n}) +test $lines -eq 2 || ret=1 +grep "1.2.3.4" host.out${n} > /dev/null || ret=1 +grep "2001::ffff" host.out${n} > /dev/null || ret=1 +if [ $ret != 0 ]; then echo_i "failed"; fi +status=$((status+ret)) + +n=$((n+1)) +echo_i "Check CNAME to A only lookup ($n)" +ret=0 +$HOST -p ${PORT} cname-a-only.example.net 10.53.0.1 2> host.err${n} > host.out${n} || ret=1 +lines=$(wc -l < host.err${n}) +test $lines -eq 0 || ret=1 +lines=$(grep -c "Address:" host.out${n}) +test $lines -eq 1 || ret=1 +lines=$(grep -c "cname-a-only.example.net is an alias for a-only.example.net" host.out${n}) +test $lines -eq 1 || ret=1 +lines=$(grep a-only.example.net host.out${n} | grep -cv "is an alias for") +test $lines -eq 1 || ret=1 +grep "1.2.3.4" host.out${n} > /dev/null || ret=1 +if [ $ret != 0 ]; then echo_i "failed"; fi +status=$((status+ret)) + +n=$((n+1)) +echo_i "Check CNAME to AAAA only lookup ($n)" +ret=0 +$HOST -p ${PORT} cname-aaaa-only.example.net 10.53.0.1 2> host.err${n} > host.out${n} || ret=1 +lines=$(wc -l < host.err${n}) +test $lines -eq 0 || ret=1 +lines=$(grep -c "Address:" host.out${n}) +test $lines -eq 1 || ret=1 +lines=$(grep -c "cname-aaaa-only.example.net is an alias for aaaa-only.example.net" host.out${n}) +test $lines -eq 1 || ret=1 +lines=$(grep aaaa-only.example.net host.out${n} | grep -cv "is an alias for") +test $lines -eq 1 || ret=1 +grep "2001::ffff" host.out${n} > /dev/null || ret=1 +if [ $ret != 0 ]; then echo_i "failed"; fi +status=$((status+ret)) + +n=$((n+1)) +echo_i "Check CNAME to dual A + AAAA lookup ($n)" +ret=0 +$HOST -p ${PORT} cname-dual.example.net 10.53.0.1 2> host.err${n} > host.out${n} || ret=1 +lines=$(wc -l < host.err${n}) +test $lines -eq 0 || ret=1 +lines=$(grep -c "Address:" host.out${n}) +test $lines -eq 1 || ret=1 +lines=$(grep -c "cname-dual.example.net is an alias for dual.example.net." host.out${n}) +test $lines -eq 1 || ret=1 +lines=$(grep -c "dual.example.net has address 1.2.3.4" host.out${n}) +test $lines -eq 1 || ret=1 +lines=$(grep -c "dual.example.net has IPv6 address 2001::ffff" host.out${n}) +test $lines -eq 1 || ret=1 +if [ $ret != 0 ]; then echo_i "failed"; fi +status=$((status+ret)) + +n=$((n+1)) +echo_i "Check ANY lookup ($n)" +ret=0 +$HOST -p ${PORT} -t ANY example.net 10.53.0.1 2> host.err${n} > host.out${n} || ret=1 +lines=$(grep -c 'Address:.10\.53\.0\.1#'"${PORT}" host.out${n}) +test $lines -eq 1 || ret=1 +lines=$(grep -c 'example.net has SOA record ns1.example.net. hostmaster.example.net. 1397051952 5 5 1814400 3600' host.out${n}) +test $lines -eq 1 || ret=1 +lines=$(grep -c 'example.net name server ns1.example.net.' host.out${n}) +test $lines -eq 1 || ret=1 +if [ $ret != 0 ]; then echo_i "failed"; fi +status=$((status+ret)) + +echo_i "exit status: $status" +[ $status -eq 0 ] || exit 1 From 0569fa0d252a45d0167a22a87dbea5a236f06a66 Mon Sep 17 00:00:00 2001 From: Mark Andrews Date: Mon, 5 Dec 2022 09:21:35 +1100 Subject: [PATCH 3/4] Remember that the port was set in host and nslookup Set 'port_set = true;' so that the TCP/DOT/DOH code doesn't reset the port when making connections. (cherry picked from commit 8caa94bdf1e9d03439670f603893133231083e16) --- bin/dig/host.c | 1 + bin/dig/nslookup.c | 1 + 2 files changed, 2 insertions(+) diff --git a/bin/dig/host.c b/bin/dig/host.c index 6debe59660..011587a5a6 100644 --- a/bin/dig/host.c +++ b/bin/dig/host.c @@ -854,6 +854,7 @@ parse_args(bool is_batchfile, int argc, char **argv) { break; case 'p': port = atoi(isc_commandline_argument); + port_set = true; break; } } diff --git a/bin/dig/nslookup.c b/bin/dig/nslookup.c index 67ae315610..a0f508d75a 100644 --- a/bin/dig/nslookup.c +++ b/bin/dig/nslookup.c @@ -582,6 +582,7 @@ set_port(const char *value) { isc_result_t result = parse_uint(&n, value, 65535, "port"); if (result == ISC_R_SUCCESS) { port = (uint16_t)n; + port_set = true; } } From 0033c12002e56278977a7bf094e7e76cf8cf727f Mon Sep 17 00:00:00 2001 From: Mark Andrews Date: Mon, 5 Dec 2022 09:27:13 +1100 Subject: [PATCH 4/4] Add CHANGES note for [GL #3721] (cherry picked from commit 27168dbf433910fb397b8bc5d35d6ba891f29c67) --- CHANGES | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGES b/CHANGES index 05b3e7f04e..15dfb3d3c5 100644 --- a/CHANGES +++ b/CHANGES @@ -1,3 +1,6 @@ +6036. [bug] nslookup and host were not honoring the selected port + in TCP mode. [GL #3721] + 6034. [func] Deprecate alt-transfer-source, alt-transfer-source-v6 and use-alt-transfer-source. [GL #3694]