From ea648e70a989cca190cd7403fe892fd2dcc290b4 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Sun, 5 May 2024 20:37:14 +0200 Subject: Adding upstream version 1:9.11.5.P4+dfsg. Signed-off-by: Daniel Baumann --- bin/tests/system/glue/clean.sh | 20 ++++++++ bin/tests/system/glue/fi.good | 27 +++++++++++ bin/tests/system/glue/noglue.good | 14 ++++++ bin/tests/system/glue/ns1/cache.in | 15 ++++++ bin/tests/system/glue/ns1/mil.db | 23 +++++++++ bin/tests/system/glue/ns1/named.conf.in | 43 +++++++++++++++++ bin/tests/system/glue/ns1/net.db | 32 +++++++++++++ bin/tests/system/glue/ns1/root-servers.nil.db | 23 +++++++++ bin/tests/system/glue/ns1/root.db | 68 +++++++++++++++++++++++++++ bin/tests/system/glue/setup.sh | 18 +++++++ bin/tests/system/glue/tests.sh | 40 ++++++++++++++++ bin/tests/system/glue/xx.good | 16 +++++++ bin/tests/system/glue/yy.good | 17 +++++++ 13 files changed, 356 insertions(+) create mode 100644 bin/tests/system/glue/clean.sh create mode 100644 bin/tests/system/glue/fi.good create mode 100644 bin/tests/system/glue/noglue.good create mode 100644 bin/tests/system/glue/ns1/cache.in create mode 100644 bin/tests/system/glue/ns1/mil.db create mode 100644 bin/tests/system/glue/ns1/named.conf.in create mode 100644 bin/tests/system/glue/ns1/net.db create mode 100644 bin/tests/system/glue/ns1/root-servers.nil.db create mode 100644 bin/tests/system/glue/ns1/root.db create mode 100644 bin/tests/system/glue/setup.sh create mode 100644 bin/tests/system/glue/tests.sh create mode 100644 bin/tests/system/glue/xx.good create mode 100644 bin/tests/system/glue/yy.good (limited to 'bin/tests/system/glue') diff --git a/bin/tests/system/glue/clean.sh b/bin/tests/system/glue/clean.sh new file mode 100644 index 0000000..25e408d --- /dev/null +++ b/bin/tests/system/glue/clean.sh @@ -0,0 +1,20 @@ +#!/bin/sh +# +# Copyright (C) Internet Systems Consortium, Inc. ("ISC") +# +# 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 http://mozilla.org/MPL/2.0/. +# +# See the COPYRIGHT file distributed with this work for additional +# information regarding copyright ownership. + +# +# Clean up after glue tests. +# + +rm -f dig.out ns1/cache +rm -f */named.conf +rm -f */named.memstats +rm -f */named.run +rm -f ns*/named.lock diff --git a/bin/tests/system/glue/fi.good b/bin/tests/system/glue/fi.good new file mode 100644 index 0000000..a08bc7a --- /dev/null +++ b/bin/tests/system/glue/fi.good @@ -0,0 +1,27 @@ + +; <<>> DiG 9.0 <<>> +norec @10.53.0.1 -p 5300 foo.bar.fi. A +;; global options: printcmd +;; Got answer: +;; ->>HEADER<<- opcode: QUERY, status: NOERROR, id: 58772 +;; flags: qr ad; QUERY: 1, ANSWER: 0, AUTHORITY: 6, ADDITIONAL: 7 + +;; QUESTION SECTION: +;foo.bar.fi. IN A + +;; AUTHORITY SECTION: +fi. 172800 IN NS NS.EU.NET. +fi. 172800 IN NS NS.TELE.fi. +fi. 172800 IN NS PRIFI.EUNET.fi. +fi. 172800 IN NS NS.UU.NET. +fi. 172800 IN NS T.NS.VERIO.NET. +fi. 172800 IN NS HYDRA.HELSINKI.fi. + +;; ADDITIONAL SECTION: +NS.TELE.fi. 172800 IN A 193.210.19.19 +NS.TELE.fi. 172800 IN A 193.210.18.18 +PRIFI.EUNET.fi. 172800 IN A 193.66.1.146 +NS.UU.NET. 172800 IN A 137.39.1.3 +T.NS.VERIO.NET. 172800 IN A 192.67.14.16 +HYDRA.HELSINKI.fi. 172800 IN A 128.214.4.29 +NS.EU.NET. 172800 IN A 192.16.202.11 + diff --git a/bin/tests/system/glue/noglue.good b/bin/tests/system/glue/noglue.good new file mode 100644 index 0000000..22eca7b --- /dev/null +++ b/bin/tests/system/glue/noglue.good @@ -0,0 +1,14 @@ + +; <<>> DiG 9.0 <<>> @10.53.0.1 -p 5300 example.net a +;; global options: printcmd +;; Got answer: +;; ->>HEADER<<- opcode: QUERY, status: NOERROR, id: 29409 +;; flags: qr rd ad; QUERY: 1, ANSWER: 0, AUTHORITY: 2, ADDITIONAL: 0 + +;; QUESTION SECTION: +;example.net. IN A + +;; AUTHORITY SECTION: +example.net. 300 IN NS ns2.example. +example.net. 300 IN NS ns1.example. + diff --git a/bin/tests/system/glue/ns1/cache.in b/bin/tests/system/glue/ns1/cache.in new file mode 100644 index 0000000..8089efb --- /dev/null +++ b/bin/tests/system/glue/ns1/cache.in @@ -0,0 +1,15 @@ +; Copyright (C) Internet Systems Consortium, Inc. ("ISC") +; +; 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 http://mozilla.org/MPL/2.0/. +; +; See the COPYRIGHT file distributed with this work for additional +; information regarding copyright ownership. + +; Preloaded cache data for glue test + +$TTL 86400 +ns.zz. 3600 IN A 10.0.0.1 +ns.zz. IN AAAA 10::1 +ns.zz. IN A6 0 ffff:ffff:ffff:ffff:ffff:ffff:ffff:ffff diff --git a/bin/tests/system/glue/ns1/mil.db b/bin/tests/system/glue/ns1/mil.db new file mode 100644 index 0000000..2dda694 --- /dev/null +++ b/bin/tests/system/glue/ns1/mil.db @@ -0,0 +1,23 @@ +; Copyright (C) Internet Systems Consortium, Inc. ("ISC") +; +; 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 http://mozilla.org/MPL/2.0/. +; +; See the COPYRIGHT file distributed with this work for additional +; information regarding copyright ownership. + +$ORIGIN mil. +$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. + +ARL.MIL. 172800 IN NS NS1.ARL.MIL. +NS1.arl.mil. 172800 IN A 128.63.16.4 + diff --git a/bin/tests/system/glue/ns1/named.conf.in b/bin/tests/system/glue/ns1/named.conf.in new file mode 100644 index 0000000..20cc887 --- /dev/null +++ b/bin/tests/system/glue/ns1/named.conf.in @@ -0,0 +1,43 @@ +/* + * Copyright (C) Internet Systems Consortium, Inc. ("ISC") + * + * 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 http://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 yes; + notify no; + cache-file "cache"; + check-integrity no; +}; + +zone "." { + type master; + file "root.db"; +}; + +zone "root-servers.nil" { + type master; + file "root-servers.nil.db"; +}; +zone "net" { + type master; + file "net.db"; +}; + +zone "mil" { + type master; + file "mil.db"; +}; diff --git a/bin/tests/system/glue/ns1/net.db b/bin/tests/system/glue/ns1/net.db new file mode 100644 index 0000000..b98271e --- /dev/null +++ b/bin/tests/system/glue/ns1/net.db @@ -0,0 +1,32 @@ +; Copyright (C) Internet Systems Consortium, Inc. ("ISC") +; +; 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 http://mozilla.org/MPL/2.0/. +; +; See the COPYRIGHT file distributed with this work for additional +; information regarding copyright ownership. + +$ORIGIN net. +$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. + +; FI. authoritative servers, for the FI. glue test. +uu.net. NS ns.uu.net. +NS.UU.NET. 172800 IN A 137.39.1.3 +eu.net. NS ns.eu.net. +NS.EU.NET. 172800 IN A 192.16.202.11 + +; Referral outside of server authority, but with glue records present. +; Don't hand out the glue. +example.net. NS ns1.example. +example.net. NS ns2.example. +ns1.example. 172800 IN A 1.1.1.1 +ns2.example. 172800 IN A 2.2.2.2 diff --git a/bin/tests/system/glue/ns1/root-servers.nil.db b/bin/tests/system/glue/ns1/root-servers.nil.db new file mode 100644 index 0000000..e40f392 --- /dev/null +++ b/bin/tests/system/glue/ns1/root-servers.nil.db @@ -0,0 +1,23 @@ +; Copyright (C) Internet Systems Consortium, Inc. ("ISC") +; +; 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 http://mozilla.org/MPL/2.0/. +; +; See the COPYRIGHT file distributed with this work for additional +; information regarding copyright ownership. + +$TTL 300 +@ IN SOA ns hostmaster ( + 1 + 3600 + 1800 + 1814400 + 3600 + ) + NS a +a A 10.53.0.1 +b A 10.53.0.2 + + + diff --git a/bin/tests/system/glue/ns1/root.db b/bin/tests/system/glue/ns1/root.db new file mode 100644 index 0000000..1d58542 --- /dev/null +++ b/bin/tests/system/glue/ns1/root.db @@ -0,0 +1,68 @@ +; Copyright (C) Internet Systems Consortium, Inc. ("ISC") +; +; 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 http://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. + +root-servers.nil. NS a.root-servers.nil. +a.root-servers.nil. A 10.53.0.1 + +; Delegate some domains that contain name servers for the sample +; ccTLDs below. +net. 172800 IN NS a.root-servers.nil. +mil. 172800 IN NS a.root-servers.nil. +se. 172800 IN NS ns.uu.net. + +; +; A sample ccTLD +; +fi. 172800 IN NS NS.TELE.fi. +fi. 172800 IN NS PRIFI.EUNET.fi. +fi. 172800 IN NS NS.UU.NET. +fi. 172800 IN NS T.NS.VERIO.NET. +fi. 172800 IN NS HYDRA.HELSINKI.fi. +fi. 172800 IN NS NS.EU.NET. +NS.TELE.fi. 172800 IN A 193.210.18.18 +NS.TELE.fi. 172800 IN A 193.210.19.19 +PRIFI.EUNET.fi. 172800 IN A 193.66.1.146 +NS.UU.NET. 172800 IN A 137.39.1.3 +T.NS.VERIO.NET. 172800 IN A 192.67.14.16 +HYDRA.HELSINKI.fi. 172800 IN A 128.214.4.29 +NS.EU.NET. 172800 IN A 192.16.202.11 + +; +; Another sample ccTLD +; +is. 172800 IN NS ISGATE.is. +is. 172800 IN NS NISC.JVNC.NET. +is. 172800 IN NS NS.EU.NET. +is. 172800 IN NS SPARKY.ARL.MIL. +is. 172800 IN NS SUNIC.SUNET.SE. +ISGATE.is. 172800 IN A 193.4.58.51 +NISC.JVNC.NET. 172800 IN A 128.121.50.7 +NS.EU.NET. 172800 IN A 192.16.202.11 +SPARKY.ARL.MIL. 172800 IN A 128.63.58.18 +SUNIC.SUNET.SE. 172800 IN A 192.36.125.2 + +; +; A hypothetical ccTLD where we are authoritative for the NS glue. +; +xx. 172800 IN NS b.root-servers.nil. + +; +; A hypothetical ccTLD where we have cached NS glue. +; +yy. 172800 IN NS ns.zz. diff --git a/bin/tests/system/glue/setup.sh b/bin/tests/system/glue/setup.sh new file mode 100644 index 0000000..062e453 --- /dev/null +++ b/bin/tests/system/glue/setup.sh @@ -0,0 +1,18 @@ +#!/bin/sh +# +# Copyright (C) Internet Systems Consortium, Inc. ("ISC") +# +# 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 http://mozilla.org/MPL/2.0/. +# +# See the COPYRIGHT file distributed with this work for additional +# information regarding copyright ownership. + +SYSTEMTESTTOP=.. +. $SYSTEMTESTTOP/conf.sh + +$SHELL clean.sh +copy_setports ns1/named.conf.in ns1/named.conf + +cd ns1 && cp -f cache.in cache diff --git a/bin/tests/system/glue/tests.sh b/bin/tests/system/glue/tests.sh new file mode 100644 index 0000000..0425a34 --- /dev/null +++ b/bin/tests/system/glue/tests.sh @@ -0,0 +1,40 @@ +#!/bin/sh +# +# Copyright (C) Internet Systems Consortium, Inc. ("ISC") +# +# 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 http://mozilla.org/MPL/2.0/. +# +# See the COPYRIGHT file distributed with this work for additional +# information regarding copyright ownership. + +SYSTEMTESTTOP=.. +. $SYSTEMTESTTOP/conf.sh + +# +# Do glue tests. +# + +DIGOPTS="+norec -p ${PORT}" + +status=0 + +echo_i "testing that a ccTLD referral gets a full glue set from the root zone" +$DIG $DIGOPTS @10.53.0.1 foo.bar.fi. A >dig.out || status=1 +digcomp --lc fi.good dig.out || status=1 + +echo_i "testing that we find glue A RRs we are authoritative for" +$DIG +norec @10.53.0.1 -p ${PORT} foo.bar.xx. a >dig.out || status=1 +$PERL ../digcomp.pl xx.good dig.out || status=1 + +echo_i "testing that we find glue A/AAAA RRs in the cache" +$DIG +norec @10.53.0.1 -p ${PORT} foo.bar.yy. a >dig.out || status=1 +$PERL ../digcomp.pl yy.good dig.out || status=1 + +echo_i "testing that we don't find out-of-zone glue" +$DIG $DIGOPTS @10.53.0.1 example.net. a > dig.out || status=1 +digcomp noglue.good dig.out || status=1 + +echo_i "exit status: $status" +[ $status -eq 0 ] || exit 1 diff --git a/bin/tests/system/glue/xx.good b/bin/tests/system/glue/xx.good new file mode 100644 index 0000000..19ae1d7 --- /dev/null +++ b/bin/tests/system/glue/xx.good @@ -0,0 +1,16 @@ + +; <<>> DiG 9.0 <<>> +norec @10.53.0.1 -p 5300 foo.bar.xx. a +;; global options: printcmd +;; Got answer: +;; ->>HEADER<<- opcode: QUERY, status: NOERROR, id: 41239 +;; flags: qr ad; QUERY: 1, ANSWER: 0, AUTHORITY: 1, ADDITIONAL: 1 + +;; QUESTION SECTION: +;foo.bar.xx. IN A + +;; AUTHORITY SECTION: +xx. 172800 IN NS b.root-servers.nil. + +;; ADDITIONAL SECTION: +b.root-servers.nil. 300 IN A 10.53.0.2 + diff --git a/bin/tests/system/glue/yy.good b/bin/tests/system/glue/yy.good new file mode 100644 index 0000000..fd97e3d --- /dev/null +++ b/bin/tests/system/glue/yy.good @@ -0,0 +1,17 @@ + +; <<>> DiG 9.0 <<>> +norec @10.53.0.1 -p 5300 foo.bar.yy. a +;; global options: printcmd +;; Got answer: +;; ->>HEADER<<- opcode: QUERY, status: NOERROR, id: 6172 +;; flags: qr ad; QUERY: 1, ANSWER: 0, AUTHORITY: 1, ADDITIONAL: 3 + +;; QUESTION SECTION: +;foo.bar.yy. IN A + +;; AUTHORITY SECTION: +yy. 172800 IN NS ns.zz. + +;; ADDITIONAL SECTION: +ns.zz. 3463 IN A 10.0.0.1 +ns.zz. 86263 IN AAAA 10::1 + -- cgit v1.2.3