upstream/bind9
1
0
Fork 0
mirror of https://github.com/isc-projects/bind9.git synced 2026-05-28 04:34:54 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch '3721-the-nslookup-command-does-not-obey-the-port-option-when-record-type-any-is-used-v9_18' into 'v9_18'

Browse source 
Resolve "The nslookup command does not obey the port option when record type ANY is used." [v9_18]

See merge request isc-projects/bind9!7164
This commit is contained in:
Mark Andrews 2022-12-06 00:11:32 +00:00
commit ea47a9c100
10 changed files with 256 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
CHANGES
View file

@ -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]

1
bin/dig/host.c
View file

@ -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;
}
}

1
bin/dig/nslookup.c
View file

@ -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;
}
}

1
bin/tests/system/Makefile.am
View file

@ -126,6 +126,7 @@ TESTS += \
inline \
integrity \
hooks \
host \
journal \
keepalive \
keyfromlabel \

21
bin/tests/system/host/clean.sh Normal file
View file

@ -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*

31
bin/tests/system/host/ns1/example.net.db Normal file
View file

@ -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

33
bin/tests/system/host/ns1/named.conf.in Normal file
View file

@ -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";
};

22
bin/tests/system/host/setup.sh Normal file
View file

@ -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

128
bin/tests/system/host/tests.sh Normal file
View file

@ -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

15
bin/tests/system/nslookup/tests.sh
View file

@ -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