]> git.ipfire.org Git - thirdparty/bind9.git/commitdiff
Add tests for forwarder cache poisoning scenarios
authorMark Andrews <marka@isc.org>
Mon, 17 Jan 2022 13:19:47 +0000 (00:19 +1100)
committerPetr Špaček <pspacek@isc.org>
Fri, 8 Apr 2022 09:52:01 +0000 (11:52 +0200)
- Check that an NS in an authority section returned from a forwarder
  which is above the name in a configured "forward first" or "forward
  only" zone (i.e., net/NS in a response from a forwarder configured for
  local.net) is not cached.
- Test that a DNAME for a parent domain will not be cached when sent
  in a response from a forwarder configured to answer for a child.
- Check that glue is rejected if its name falls below that of zone
  configured locally.
- Check that an extra out-of-bailiwick data in the answer section is
  not cached (this was already working correctly, but was not explicitly
  tested before).

- v9_11 backport: Revert primary/secondary to master/slave,
  backport rndc helper, backport ns8 config.

(cherry picked from commit bf3fffff67e1de78e9387a93674d471bf4291604)

31 files changed:
bin/tests/system/forward/ans11/ans.py [new file with mode: 0644]
bin/tests/system/forward/clean.sh
bin/tests/system/forward/ns1/diditwork.net.db [new file with mode: 0644]
bin/tests/system/forward/ns1/named.conf.in
bin/tests/system/forward/ns1/net.example.lll [new file with mode: 0644]
bin/tests/system/forward/ns1/spoofed.net.db [new file with mode: 0644]
bin/tests/system/forward/ns1/sub.local.net.db [new file with mode: 0644]
bin/tests/system/forward/ns10/fakenet.zone [new file with mode: 0644]
bin/tests/system/forward/ns10/fakenet2.zone [new file with mode: 0644]
bin/tests/system/forward/ns10/fakesublocalnet.zone [new file with mode: 0644]
bin/tests/system/forward/ns10/fakesublocaltld.zone [new file with mode: 0644]
bin/tests/system/forward/ns10/named.conf.in [new file with mode: 0644]
bin/tests/system/forward/ns10/net.example.lll [new file with mode: 0644]
bin/tests/system/forward/ns10/spoofednet.zone [new file with mode: 0644]
bin/tests/system/forward/ns4/named.conf.in
bin/tests/system/forward/ns4/sibling.tld.db [new file with mode: 0644]
bin/tests/system/forward/ns8/named.conf.in [new file with mode: 0644]
bin/tests/system/forward/ns8/root.db [new file with mode: 0644]
bin/tests/system/forward/ns8/sub.local.tld.db [new file with mode: 0644]
bin/tests/system/forward/ns9/local.net.db [new file with mode: 0644]
bin/tests/system/forward/ns9/local.tld.db [new file with mode: 0644]
bin/tests/system/forward/ns9/named1.conf.in [new file with mode: 0644]
bin/tests/system/forward/ns9/named2.conf.in [new file with mode: 0644]
bin/tests/system/forward/ns9/named3.conf.in [new file with mode: 0644]
bin/tests/system/forward/ns9/named4.conf.in [new file with mode: 0644]
bin/tests/system/forward/ns9/root.db [new file with mode: 0644]
bin/tests/system/forward/prereq.sh
bin/tests/system/forward/setup.sh
bin/tests/system/forward/tests.sh
bin/tests/system/ifconfig.sh
util/copyrights

diff --git a/bin/tests/system/forward/ans11/ans.py b/bin/tests/system/forward/ans11/ans.py
new file mode 100644 (file)
index 0000000..2956cf6
--- /dev/null
@@ -0,0 +1,136 @@
+############################################################################
+# 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 https://mozilla.org/MPL/2.0/.
+#
+# See the COPYRIGHT file distributed with this work for additional
+# information regarding copyright ownership.
+############################################################################
+
+from __future__ import print_function
+import os
+import sys
+import signal
+import socket
+import select
+from datetime import datetime, timedelta
+import time
+import functools
+
+import dns, dns.message, dns.query, dns.flags
+from dns.rdatatype import *
+from dns.rdataclass import *
+from dns.rcode import *
+from dns.name import *
+
+# Log query to file
+def logquery(type, qname):
+    with open("qlog", "a") as f:
+        f.write("%s %s\n", type, qname)
+
+############################################################################
+# Respond to a DNS query.
+############################################################################
+def create_response(msg):
+    m = dns.message.from_wire(msg)
+    qname = m.question[0].name.to_text()
+    rrtype = m.question[0].rdtype
+    typename = dns.rdatatype.to_text(rrtype)
+
+    with open("query.log", "a") as f:
+        f.write("%s %s\n" % (typename, qname))
+        print("%s %s" % (typename, qname), end=" ")
+
+    r = dns.message.make_response(m)
+    r.set_rcode(NOERROR)
+    if rrtype == A:
+        tld=qname.split('.')[-2] + '.'
+        ns="local." + tld
+        r.answer.append(dns.rrset.from_text(qname, 300, IN, A, "10.53.0.11"))
+        r.answer.append(dns.rrset.from_text(tld, 300, IN, NS, "local." + tld))
+        r.additional.append(dns.rrset.from_text(ns, 300, IN, A, "10.53.0.11"))
+    elif rrtype == NS:
+        r.answer.append(dns.rrset.from_text(qname, 300, IN, NS, "."))
+    elif rrtype == SOA:
+        r.answer.append(dns.rrset.from_text(qname, 300, IN, SOA, ". . 0 0 0 0 0"))
+    else:
+        r.authority.append(dns.rrset.from_text(qname, 300, IN, SOA, ". . 0 0 0 0 0"))
+    r.flags |= dns.flags.AA
+    return r
+
+def sigterm(signum, frame):
+    print ("Shutting down now...")
+    os.remove('ans.pid')
+    running = False
+    sys.exit(0)
+
+############################################################################
+# Main
+#
+# Set up responder and control channel, open the pid file, and start
+# the main loop, listening for queries on the query channel or commands
+# on the control channel and acting on them.
+############################################################################
+ip4 = "10.53.0.11"
+ip6 = "fd92:7065:b8e:ffff::11"
+
+try: port=int(os.environ['PORT'])
+except: port=5300
+
+query4_socket = socket.socket(socket.AF_INET, socket.SOCK_DGRAM)
+query4_socket.bind((ip4, port))
+havev6 = True
+try:
+    query6_socket = socket.socket(socket.AF_INET6, socket.SOCK_DGRAM)
+    try:
+        query6_socket.bind((ip6, port))
+    except:
+        query6_socket.close()
+        havev6 = False
+except:
+    havev6 = False
+signal.signal(signal.SIGTERM, sigterm)
+
+f = open('ans.pid', 'w')
+pid = os.getpid()
+print (pid, file=f)
+f.close()
+
+running = True
+
+print ("Listening on %s port %d" % (ip4, port))
+if havev6:
+    print ("Listening on %s port %d" % (ip6, port))
+print ("Ctrl-c to quit")
+
+if havev6:
+    input = [query4_socket, query6_socket]
+else:
+    input = [query4_socket]
+
+while running:
+    try:
+        inputready, outputready, exceptready = select.select(input, [], [])
+    except select.error as e:
+        break
+    except socket.error as e:
+        break
+    except KeyboardInterrupt:
+        break
+
+    for s in inputready:
+        if s == query4_socket or s == query6_socket:
+            print ("Query received on %s" %
+                    (ip4 if s == query4_socket else ip6), end=" ")
+            # Handle incoming queries
+            msg = s.recvfrom(65535)
+            rsp = create_response(msg[0])
+            if rsp:
+                print(dns.rcode.to_text(rsp.rcode()))
+                s.sendto(rsp.to_wire(), msg[1])
+            else:
+                print("NO RESPONSE")
+    if not running:
+        break
index 26e4e76db6eec396b9530ffa1112394ad1bda431..26a550db49a596769257daceb7a3c2b7fe8807e1 100644 (file)
 #
 # Clean up after forward tests.
 #
+rm -f ./ans11/query.log
 rm -f ./dig.out.*
 rm -f ./*/named.conf
 rm -f ./*/named.memstats
 rm -f ./*/named.run ./*/named.run.prev
+rm -f ./*/named_dump.db
 rm -f ./ns*/named.lock
diff --git a/bin/tests/system/forward/ns1/diditwork.net.db b/bin/tests/system/forward/ns1/diditwork.net.db
new file mode 100644 (file)
index 0000000..be9a7f7
--- /dev/null
@@ -0,0 +1,20 @@
+; 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 https://mozilla.org/MPL/2.0/.
+;
+; See the COPYRIGHT file distributed with this work for additional
+; information regarding copyright ownership.
+
+$TTL 300       ; 5 minutes
+@                      IN SOA  ns root (
+                               2000082401 ; serial
+                               1800       ; refresh (30 minutes)
+                               1800       ; retry (30 minutes)
+                               1814400    ; expire (3 weeks)
+                               3600       ; minimum (1 hour)
+                               )
+                       NS      ns
+                       TXT     "recursed"
+ns                     A       10.53.0.1
index 9904f37ef522a69579789a3181124d82fb7f4c3e..1c31d84608ce216ed4c34ae1760a78cbf88b6284 100644 (file)
@@ -54,3 +54,23 @@ zone "example5." {
 zone "example6" {
        type forward;
 };
+
+zone "diditwork.net" {
+       type master;
+       file "diditwork.net.db";
+};
+
+zone "spoofed.net" {
+       type master;
+       file "spoofed.net.db";
+};
+
+zone "sub.local.net" {
+       type master;
+       file "sub.local.net.db";
+};
+
+zone "net.example.lll" {
+       type master;
+       file "net.example.lll";
+};
diff --git a/bin/tests/system/forward/ns1/net.example.lll b/bin/tests/system/forward/ns1/net.example.lll
new file mode 100644 (file)
index 0000000..d179853
--- /dev/null
@@ -0,0 +1,13 @@
+; 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 https://mozilla.org/MPL/2.0/.
+;
+; See the COPYRIGHT file distributed with this work for additional
+; information regarding copyright ownership.
+
+$TTL 86400
+net.example.lll.               SOA     . . 0 0 0 0 0
+net.example.lll.               NS      attackSecureDomain.net.
+didItWork.net.example.lll.     TXT     "if you can see this record the attack worked"
diff --git a/bin/tests/system/forward/ns1/spoofed.net.db b/bin/tests/system/forward/ns1/spoofed.net.db
new file mode 100644 (file)
index 0000000..d498d5f
--- /dev/null
@@ -0,0 +1,20 @@
+; 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 https://mozilla.org/MPL/2.0/.
+;
+; See the COPYRIGHT file distributed with this work for additional
+; information regarding copyright ownership.
+
+$TTL 300       ; 5 minutes
+@                      IN SOA  ns root (
+                               2000082401 ; serial
+                               1800       ; refresh (30 minutes)
+                               1800       ; retry (30 minutes)
+                               1814400    ; expire (3 weeks)
+                               3600       ; minimum (1 hour)
+                               )
+                       NS      ns
+ns                     A       10.53.0.1
+sub                    TXT     "recursed"
diff --git a/bin/tests/system/forward/ns1/sub.local.net.db b/bin/tests/system/forward/ns1/sub.local.net.db
new file mode 100644 (file)
index 0000000..be9a7f7
--- /dev/null
@@ -0,0 +1,20 @@
+; 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 https://mozilla.org/MPL/2.0/.
+;
+; See the COPYRIGHT file distributed with this work for additional
+; information regarding copyright ownership.
+
+$TTL 300       ; 5 minutes
+@                      IN SOA  ns root (
+                               2000082401 ; serial
+                               1800       ; refresh (30 minutes)
+                               1800       ; retry (30 minutes)
+                               1814400    ; expire (3 weeks)
+                               3600       ; minimum (1 hour)
+                               )
+                       NS      ns
+                       TXT     "recursed"
+ns                     A       10.53.0.1
diff --git a/bin/tests/system/forward/ns10/fakenet.zone b/bin/tests/system/forward/ns10/fakenet.zone
new file mode 100644 (file)
index 0000000..14e5c77
--- /dev/null
@@ -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 https://mozilla.org/MPL/2.0/.
+;
+; See the COPYRIGHT file distributed with this work for additional
+; information regarding copyright ownership.
+
+$TTL 86400
+net.                   SOA     . . 0 0 0 0 0
+net.                   NS      attackSecureDomain.net.
+attackSecureDomain.net.        A       10.53.0.10
+didItWork.net.         TXT     "if you can see this record the attack worked"
+ns.spoofed.net.                A       10.53.0.10
diff --git a/bin/tests/system/forward/ns10/fakenet2.zone b/bin/tests/system/forward/ns10/fakenet2.zone
new file mode 100644 (file)
index 0000000..7ca28a9
--- /dev/null
@@ -0,0 +1,13 @@
+; 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 https://mozilla.org/MPL/2.0/.
+;
+; See the COPYRIGHT file distributed with this work for additional
+; information regarding copyright ownership.
+
+$TTL 86400
+net2.                  SOA     . . 0 0 0 0 0
+net2.                  NS      attackSecureDomain.net.
+net2.                  DNAME   net.example.lll.
diff --git a/bin/tests/system/forward/ns10/fakesublocalnet.zone b/bin/tests/system/forward/ns10/fakesublocalnet.zone
new file mode 100644 (file)
index 0000000..6caa071
--- /dev/null
@@ -0,0 +1,13 @@
+; 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 https://mozilla.org/MPL/2.0/.
+;
+; See the COPYRIGHT file distributed with this work for additional
+; information regarding copyright ownership.
+
+$TTL 86400
+sub.local.net.         SOA     . . 0 0 0 0 0
+sub.local.net.         NS      ns.spoofed.net.
+sub.local.net.         TXT     "if you see this attacker overrode local delegation"
diff --git a/bin/tests/system/forward/ns10/fakesublocaltld.zone b/bin/tests/system/forward/ns10/fakesublocaltld.zone
new file mode 100644 (file)
index 0000000..6a431de
--- /dev/null
@@ -0,0 +1,13 @@
+; 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 https://mozilla.org/MPL/2.0/.
+;
+; See the COPYRIGHT file distributed with this work for additional
+; information regarding copyright ownership.
+
+sub.local.tld.         3600    IN      SOA     . . 0 0 0 0 0
+sub.local.tld.         3600    IN      NS      ns.sub.local.tld.
+sub.local.tld.         3600    IN      TXT     bad
+ns.sub.local.tld.      3600    IN      A       10.53.0.8
diff --git a/bin/tests/system/forward/ns10/named.conf.in b/bin/tests/system/forward/ns10/named.conf.in
new file mode 100644 (file)
index 0000000..025c108
--- /dev/null
@@ -0,0 +1,51 @@
+/*
+ * 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 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.10;
+       notify-source 10.53.0.10;
+       transfer-source 10.53.0.10;
+       port @PORT@;
+       pid-file "named.pid";
+       listen-on { 10.53.0.10; };
+       listen-on-v6 { none; };
+       minimal-responses no;
+};
+
+zone "net." {
+       type master;
+       file "fakenet.zone";
+};
+
+zone "spoofed.net." {
+       type master;
+       file "spoofednet.zone";
+};
+
+zone "sub.local.net." {
+       type master;
+       file "fakesublocalnet.zone";
+};
+
+zone "net2" {
+       type master;
+       file "fakenet2.zone";
+};
+
+zone "net.example.lll" {
+       type master;
+       file "net.example.lll";
+};
+
+zone "sub.local.tld." {
+       type master;
+       file "fakesublocaltld.zone";
+};
diff --git a/bin/tests/system/forward/ns10/net.example.lll b/bin/tests/system/forward/ns10/net.example.lll
new file mode 100644 (file)
index 0000000..d179853
--- /dev/null
@@ -0,0 +1,13 @@
+; 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 https://mozilla.org/MPL/2.0/.
+;
+; See the COPYRIGHT file distributed with this work for additional
+; information regarding copyright ownership.
+
+$TTL 86400
+net.example.lll.               SOA     . . 0 0 0 0 0
+net.example.lll.               NS      attackSecureDomain.net.
+didItWork.net.example.lll.     TXT     "if you can see this record the attack worked"
diff --git a/bin/tests/system/forward/ns10/spoofednet.zone b/bin/tests/system/forward/ns10/spoofednet.zone
new file mode 100644 (file)
index 0000000..13921a0
--- /dev/null
@@ -0,0 +1,14 @@
+; 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 https://mozilla.org/MPL/2.0/.
+;
+; See the COPYRIGHT file distributed with this work for additional
+; information regarding copyright ownership.
+
+$TTL 86400
+spoofed.net.           SOA     . . 0 0 0 0 0
+spoofed.net.           NS      ns.spoofed.net.
+ns.spoofed.net.                A       10.53.0.10
+spoofed.net.           TXT     "this record is clearly spoofed"
index d42a9eb7977b3b13c93e7b5049d2d23f16bcf65c..6db65e71bcb972c013fe2f67af1f0e95016d484e 100644 (file)
@@ -60,3 +60,8 @@ zone "malicious." {
        type master;
        file "malicious.db";
 };
+
+zone "sibling.tld" {
+       type master;
+       file "sibling.tld.db";
+};
diff --git a/bin/tests/system/forward/ns4/sibling.tld.db b/bin/tests/system/forward/ns4/sibling.tld.db
new file mode 100644 (file)
index 0000000..58037d0
--- /dev/null
@@ -0,0 +1,20 @@
+; 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 https://mozilla.org/MPL/2.0/.
+;
+; See the COPYRIGHT file distributed with this work for additional
+; information regarding copyright ownership.
+
+$TTL    86400
+@       IN      SOA     malicious. admin.malicious. (
+                              1         ; Serial
+                         604800         ; Refresh
+                          86400         ; Retry
+                        2419200         ; Expire
+                          86400 )       ; Negative Cache TTL
+
+@           IN    NS      ns
+
+ns          IN    A       10.53.0.4
diff --git a/bin/tests/system/forward/ns8/named.conf.in b/bin/tests/system/forward/ns8/named.conf.in
new file mode 100644 (file)
index 0000000..9260f69
--- /dev/null
@@ -0,0 +1,33 @@
+/*
+ * 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 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.8;
+       notify-source 10.53.0.8;
+       transfer-source 10.53.0.8;
+       port @PORT@;
+       pid-file "named.pid";
+       listen-on { 10.53.0.8; };
+       listen-on-v6 { none; };
+       forwarders { 10.53.0.2; };      // returns referrals
+       forward first;
+       dnssec-validation yes;
+};
+
+zone "." {
+       type hint;
+       file "root.db";
+};
+
+zone "sub.local.tld" {
+       type master;
+       file "sub.local.tld.db";
+};
diff --git a/bin/tests/system/forward/ns8/root.db b/bin/tests/system/forward/ns8/root.db
new file mode 100644 (file)
index 0000000..4f30322
--- /dev/null
@@ -0,0 +1,11 @@
+; 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 https://mozilla.org/MPL/2.0/.
+;
+; See the COPYRIGHT file distributed with this work for additional
+; information regarding copyright ownership.
+
+.                      NS      a.root-servers.nil.
+a.root-servers.nil.    A       10.53.0.1
diff --git a/bin/tests/system/forward/ns8/sub.local.tld.db b/bin/tests/system/forward/ns8/sub.local.tld.db
new file mode 100644 (file)
index 0000000..eb20683
--- /dev/null
@@ -0,0 +1,13 @@
+; 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 https://mozilla.org/MPL/2.0/.
+;
+; See the COPYRIGHT file distributed with this work for additional
+; information regarding copyright ownership.
+
+sub.local.tld.         3600    IN      SOA     . . 0 0 0 0 0
+sub.local.tld.         3600    IN      NS      ns.sub.local.tld.
+sub.local.tld.         3600    IN      TXT     good
+ns.sub.local.tld.      3600    IN      A       10.53.0.8
diff --git a/bin/tests/system/forward/ns9/local.net.db b/bin/tests/system/forward/ns9/local.net.db
new file mode 100644 (file)
index 0000000..2c971e1
--- /dev/null
@@ -0,0 +1,14 @@
+; 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 https://mozilla.org/MPL/2.0/.
+;
+; See the COPYRIGHT file distributed with this work for additional
+; information regarding copyright ownership.
+
+local.net.             3600    IN      SOA     . . 0 0 0 0 0
+local.net.             3600    IN      NS      localhost.
+ns.local.net.          3600    IN      A       10.53.0.9
+txt.local.net.         3600    IN      TXT     "something in the local auth zone"
+sub.local.net.         3600    IN      NS      ns.spoofed.net.  ; attacker will try to override this
diff --git a/bin/tests/system/forward/ns9/local.tld.db b/bin/tests/system/forward/ns9/local.tld.db
new file mode 100644 (file)
index 0000000..5940391
--- /dev/null
@@ -0,0 +1,13 @@
+; 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 https://mozilla.org/MPL/2.0/.
+;
+; See the COPYRIGHT file distributed with this work for additional
+; information regarding copyright ownership.
+
+local.tld.             3600    IN      SOA     . . 0 0 0 0 0
+local.tld.             3600    IN      NS      localhost.
+sub.local.tld.         3600    IN      NS      ns.sub.local.tld.
+ns.sub.local.tld.      3600    IN      A       10.53.0.8
diff --git a/bin/tests/system/forward/ns9/named1.conf.in b/bin/tests/system/forward/ns9/named1.conf.in
new file mode 100644 (file)
index 0000000..943e037
--- /dev/null
@@ -0,0 +1,65 @@
+/*
+ * 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 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.9;
+       notify-source 10.53.0.9;
+       transfer-source 10.53.0.9;
+       port @PORT@;
+       pid-file "named.pid";
+       listen-on { 10.53.0.9; };
+       listen-on-v6 { none; };
+       dnssec-validation no;
+       edns-udp-size 1232;
+};
+
+key rndc_key {
+       secret "1234abcd8765";
+       algorithm hmac-sha256;
+};
+
+controls {
+       inet 10.53.0.9 port @CONTROLPORT@ allow { any; } keys { rndc_key; };
+};
+
+server 10.53.0.10 {
+       edns no;
+};
+
+server 10.53.0.11 {
+       edns no;
+};
+
+zone "." {
+       type hint;
+       file "root.db";
+};
+
+zone "attacksecuredomain.net." {
+       type forward;
+       forwarders { 10.53.0.10; };
+};
+
+zone "attacksecuredomain.net2." {
+       type forward;
+       forwarders { 10.53.0.10; };
+};
+
+zone "attacksecuredomain.net3." {
+       type forward;
+       forwarders { 10.53.0.11; };
+};
+
+zone "local.net." {
+       type master;
+       file "local.net.db";
+       forwarders {};
+};
diff --git a/bin/tests/system/forward/ns9/named2.conf.in b/bin/tests/system/forward/ns9/named2.conf.in
new file mode 100644 (file)
index 0000000..5a17d19
--- /dev/null
@@ -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 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.9;
+       notify-source 10.53.0.9;
+       transfer-source 10.53.0.9;
+       port @PORT@;
+       pid-file "named.pid";
+       listen-on { 10.53.0.9; };
+       listen-on-v6 { none; };
+       dnssec-validation no;
+       edns-udp-size 1232;
+};
+
+key rndc_key {
+       secret "1234abcd8765";
+       algorithm hmac-sha256;
+};
+
+controls {
+       inet 10.53.0.9 port @CONTROLPORT@ allow { any; } keys { rndc_key; };
+};
+
+server 10.53.0.10 {
+       edns no;
+};
+
+server 10.53.0.11 {
+       edns no;
+};
+
+zone "." {
+       type hint;
+       file "root.db";
+};
+
+zone "attacksecuredomain.net." {
+       type forward;
+       forward only;
+       forwarders { 10.53.0.10; };
+};
+
+zone "attacksecuredomain.net2." {
+       type forward;
+       forward only;
+       forwarders { 10.53.0.10; };
+};
+
+zone "attacksecuredomain.net3." {
+       type forward;
+       forward only;
+       forwarders { 10.53.0.11; };
+};
+
+zone "local.net." {
+       type master;
+       file "local.net.db";
+       forwarders {};
+};
diff --git a/bin/tests/system/forward/ns9/named3.conf.in b/bin/tests/system/forward/ns9/named3.conf.in
new file mode 100644 (file)
index 0000000..1e70d1a
--- /dev/null
@@ -0,0 +1,48 @@
+/*
+ * 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 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.9;
+       notify-source 10.53.0.9;
+       transfer-source 10.53.0.9;
+       port @PORT@;
+       pid-file "named.pid";
+       listen-on { 10.53.0.9; };
+       listen-on-v6 { none; };
+       dnssec-validation no;
+       edns-udp-size 1232;
+       forward only;
+       forwarders { 10.53.0.10; };
+};
+
+key rndc_key {
+       secret "1234abcd8765";
+       algorithm hmac-sha256;
+};
+
+controls {
+       inet 10.53.0.9 port @CONTROLPORT@ allow { any; } keys { rndc_key; };
+};
+
+server 10.53.0.10 {
+       edns no;
+};
+
+zone "." {
+       type hint;
+       file "root.db";
+};
+
+zone "local.net." {
+       type master;
+       file "local.net.db";
+       forwarders {};
+};
diff --git a/bin/tests/system/forward/ns9/named4.conf.in b/bin/tests/system/forward/ns9/named4.conf.in
new file mode 100644 (file)
index 0000000..6f7b107
--- /dev/null
@@ -0,0 +1,45 @@
+/*
+ * 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 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.9;
+       notify-source 10.53.0.9;
+       transfer-source 10.53.0.9;
+       port @PORT@;
+       pid-file "named.pid";
+       listen-on { 10.53.0.9; };
+       listen-on-v6 { none; };
+       dnssec-validation no;
+       edns-udp-size 1232;
+};
+
+key rndc_key {
+       secret "1234abcd8765";
+       algorithm hmac-sha256;
+};
+
+controls {
+       inet 10.53.0.9 port @CONTROLPORT@ allow { any; } keys { rndc_key; };
+};
+
+server 10.53.0.10 {
+       edns no;
+};
+
+zone "." {
+       type hint;
+       file "root.db";
+};
+
+zone "local.tld." {
+       type master;
+       file "local.tld.db";
+};
diff --git a/bin/tests/system/forward/ns9/root.db b/bin/tests/system/forward/ns9/root.db
new file mode 100644 (file)
index 0000000..4f30322
--- /dev/null
@@ -0,0 +1,11 @@
+; 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 https://mozilla.org/MPL/2.0/.
+;
+; See the COPYRIGHT file distributed with this work for additional
+; information regarding copyright ownership.
+
+.                      NS      a.root-servers.nil.
+a.root-servers.nil.    A       10.53.0.1
index d2ca8fc2bf509a7ee780d5a51ad383a048f1d0f3..53fb5817dfc15aa2336dc92c3c855c7e85fe337d 100644 (file)
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh
 
+if test -n "$PYTHON"
+then
+    if $PYTHON -c "import dns" 2> /dev/null
+    then
+        :
+    else
+        echo_i "This test requires the dnspython module." >&2
+        exit 1
+    fi
+else
+    echo_i "This test requires Python and the dnspython module." >&2
+    exit 1
+fi
+
 if $PERL -e 'use Net::DNS;' 2>/dev/null
 then
     :
index 87452b9a8811cf4c354135172d89cf59f9697094..18e81d277d53937c9f12ed54b2d3711c68a7f2c1 100644 (file)
@@ -18,3 +18,6 @@ copy_setports ns3/named.conf.in ns3/named.conf
 copy_setports ns4/named.conf.in ns4/named.conf
 copy_setports ns5/named.conf.in ns5/named.conf
 copy_setports ns7/named.conf.in ns7/named.conf
+copy_setports ns8/named.conf.in ns8/named.conf
+copy_setports ns9/named1.conf.in ns9/named.conf
+copy_setports ns10/named.conf.in ns10/named.conf
index e3549c5bc79332b57fa27c211fae91f0d856d51d..ce9b309a274cf82bc7d49688c59919e189507826 100644 (file)
@@ -19,6 +19,10 @@ sendcmd() (
        "$PERL" ../send.pl 10.53.0.6 "$EXTRAPORT1"
 )
 
+rndccmd() {
+    "$RNDC" -c ../common/rndc.conf -p "$CONTROLPORT" -s "$@"
+}
+
 root=10.53.0.1
 hidden=10.53.0.2
 f1=10.53.0.3
@@ -223,5 +227,127 @@ if [ $ret != 0 ]; then echo_i "failed"; fi
 status=$((status+ret))
 
 
+#
+# Check various spoofed response scenarios. The same tests will be
+# run twice, with "forward first" and "forward only" configurations.
+#
+run_spooftests () {
+    n=$((n+1))
+    echo_i "checking spoofed response scenario 1 - out of bailiwick NS ($n)"
+    ret=0
+    # prime
+    dig_with_opts @10.53.0.9 attackSecureDomain.net > dig.out.$n.prime || ret=1
+    # check 'net' is not poisoned.
+    dig_with_opts @10.53.0.9 diditwork.net. TXT > dig.out.$n.net || ret=1
+    grep '^diditwork\.net\..*TXT.*"recursed"' dig.out.$n.net > /dev/null || ret=1
+    # check 'sub.local.net' is not poisoned.
+    dig_with_opts @10.53.0.9 sub.local.net TXT > dig.out.$n.sub || ret=1
+    grep '^sub\.local\.net\..*TXT.*"recursed"' dig.out.$n.sub > /dev/null || ret=1
+    if [ $ret != 0 ]; then echo_i "failed"; fi
+    status=$((status+ret))
+
+    n=$((n+1))
+    echo_i "checking spoofed response scenario 2 - inject DNAME/net2. ($n)"
+    ret=0
+    # prime
+    dig_with_opts @10.53.0.9 attackSecureDomain.net2 > dig.out.$n.prime || ret=1
+    # check that net2/DNAME is not cached
+    dig_with_opts @10.53.0.9 net2. DNAME > dig.out.$n.net2 || ret=1
+    grep "ANSWER: 0," dig.out.$n.net2 > /dev/null || ret=1
+    grep "status: NXDOMAIN" dig.out.$n.net2 > /dev/null || ret=1
+    if [ $ret != 0 ]; then echo_i "failed"; fi
+    status=$((status+ret))
+
+    n=$((n+1))
+    echo_i "checking spoofed response scenario 3 - extra answer ($n)"
+    ret=0
+    # prime
+    dig_with_opts @10.53.0.9 attackSecureDomain.net3 > dig.out.$n.prime || ret=1
+    # check extra net3 records are not cached
+    rndccmd 10.53.0.9 dumpdb -cache 2>&1 | sed 's/^/ns9 /' | cat_i
+    for try in 1 2 3 4 5; do
+        lines=$(grep "net3" ns9/named_dump.db | wc -l)
+        if [ ${lines} -eq 0 ]; then
+                sleep 1
+                continue
+        fi
+        [ ${lines} -eq 1 ] || ret=1
+        grep -q '^attackSecureDomain.net3' ns9/named_dump.db || ret=1
+        grep -q '^local.net3' ns9/named_dump.db && ret=1
+    done
+    if [ $ret != 0 ]; then echo_i "failed"; fi
+    status=$((status+ret))
+}
+
+echo_i "checking spoofed response scenarios with forward first zones"
+run_spooftests
+
+copy_setports ns9/named2.conf.in ns9/named.conf
+rndccmd 10.53.0.9 reconfig 2>&1 | sed 's/^/ns3 /' | cat_i
+rndccmd 10.53.0.9 flush 2>&1 | sed 's/^/ns3 /' | cat_i
+sleep 1
+
+echo_i "rechecking spoofed response scenarios with forward only zones"
+run_spooftests
+
+#
+# This scenario expects the spoofed response to succeed. The tests are
+# similar to the ones above, but not identical.
+#
+echo_i "rechecking spoofed response scenarios with 'forward only' set globally"
+copy_setports ns9/named3.conf.in ns9/named.conf
+rndccmd 10.53.0.9 reconfig 2>&1 | sed 's/^/ns3 /' | cat_i
+rndccmd 10.53.0.9 flush 2>&1 | sed 's/^/ns3 /' | cat_i
+sleep 1
+
+n=$((n+1))
+echo_i "checking spoofed response scenario 1 - out of bailiwick NS ($n)"
+ret=0
+# prime
+dig_with_opts @10.53.0.9 attackSecureDomain.net > dig.out.$n.prime || ret=1
+# check 'net' is poisoned.
+dig_with_opts @10.53.0.9 diditwork.net. TXT > dig.out.$n.net || ret=1
+grep '^didItWork\.net\..*TXT.*"if you can see this record the attack worked"' dig.out.$n.net > /dev/null || ret=1
+# check 'sub.local.net' is poisoned.
+dig_with_opts @10.53.0.9 sub.local.net TXT > dig.out.$n.sub || ret=1
+grep '^sub\.local\.net\..*TXT.*"if you see this attacker overrode local delegation"' dig.out.$n.sub > /dev/null || ret=1
+if [ $ret != 0 ]; then echo_i "failed"; fi
+status=$((status+ret))
+
+n=$((n+1))
+echo_i "checking spoofed response scenario 2 - inject DNAME/net2. ($n)"
+ret=0
+# prime
+dig_with_opts @10.53.0.9 attackSecureDomain.net2 > dig.out.$n.prime || ret=1
+# check that net2/DNAME is cached
+dig_with_opts @10.53.0.9 net2. DNAME > dig.out.$n.net2 || ret=1
+grep "ANSWER: 1," dig.out.$n.net2 > /dev/null || ret=1
+grep "net2\..*IN.DNAME.net\.example\.lll\." dig.out.$n.net2 > /dev/null || ret=1
+if [ $ret != 0 ]; then echo_i "failed"; fi
+status=$((status+ret))
+
+#
+# This test doesn't use any forwarder clauses but is here because it
+# is similar to forwarders, as the set of servers that can populate
+# the namespace is defined by the zone content.
+#
+echo_i "rechecking spoofed response scenarios glue below local zone"
+copy_setports ns9/named4.conf.in ns9/named.conf
+rndccmd 10.53.0.9 reconfig 2>&1 | sed 's/^/ns3 /' | cat_i
+rndccmd 10.53.0.9 flush 2>&1 | sed 's/^/ns3 /' | cat_i
+sleep 1
+
+n=$((n+1))
+echo_i "checking sibling glue below zone ($n)"
+ret=0
+# prime
+dig_with_opts @10.53.0.9 sibling.tld > dig.out.$n.prime || ret=1
+# check for glue A record for sub.local.tld is not used
+dig_with_opts @10.53.0.9 sub.local.tld TXT > dig.out.$n.sub || ret=1
+grep "ANSWER: 1," dig.out.$n.sub > /dev/null || ret=1
+grep 'sub\.local\.tld\..*IN.TXT."good"$' dig.out.$n.sub > /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
index d0eb9fa61d5d4b8de4cc5b85ad17ffb48f1e82f9..8b9212c3e00b93e248028a96a5c4b0813f04e2c5 100755 (executable)
 #
 # Set up interface aliases for bind9 system tests.
 #
-# IPv4: 10.53.0.{1..10}                                RFC 1918
+# IPv4: 10.53.0.{1..11}                                RFC 1918
 #       10.53.1.{1..2}
 #       10.53.2.{1..2}
-# IPv6: fd92:7065:b8e:ffff::{1..10}            ULA
+# IPv6: fd92:7065:b8e:ffff::{1..11}            ULA
 #       fd92:7065:b8e:99ff::{1..2}
 #       fd92:7065:b8e:ff::{1..2}
 #
@@ -65,7 +65,7 @@ case "$1" in
                  2) ipv6="00" ;;
                  *) ipv6="" ;;
                esac
-               for ns in 1 2 3 4 5 6 7 8 9 10
+               for ns in 1 2 3 4 5 6 7 8 9 10 11
                do
                        [ $i -gt 0 -a $ns -gt 2 ] && break
                        int=`expr $i \* 10 + $ns`
@@ -165,7 +165,7 @@ case "$1" in
                  2) ipv6="00" ;;
                  *) ipv6="" ;;
                esac
-               for ns in 10 9 8 7 6 5 4 3 2 1
+               for ns in 11 10 9 8 7 6 5 4 3 2 1
                do
                        [ $i -gt 0 -a $ns -gt 2 ] && continue
                        int=`expr $i \* 10 + $ns - 1`
index 2fa858e4a30762da8d0a42a1cecf3ca83c105f5a..7b48b21346611eedfb72b384240349303354558e 100644 (file)
 ./bin/tests/system/formerr/setup.sh            SH      2018,2019,2020,2021,2022
 ./bin/tests/system/formerr/tests.sh            SH      2013,2015,2016,2018,2019,2020,2021,2022
 ./bin/tests/system/formerr/twoquestions                X       2013,2018,2019,2020,2021,2022
+./bin/tests/system/forward/ans11/ans.py                PYTHON  2022
 ./bin/tests/system/forward/ans6/startme                X       2019,2020,2021,2022
 ./bin/tests/system/forward/clean.sh            SH      2000,2001,2004,2007,2012,2014,2015,2016,2018,2019,2020,2021,2022
+./bin/tests/system/forward/ns1/diditwork.net.db        ZONE    2022
 ./bin/tests/system/forward/ns1/example.db      X       2000,2001,2018,2019,2020,2021,2022
 ./bin/tests/system/forward/ns1/named.conf.in   CONF-C  2018,2019,2020,2021,2022
+./bin/tests/system/forward/ns1/net.example.lll ZONE    2022
 ./bin/tests/system/forward/ns1/root.db         ZONE    2000,2001,2004,2007,2016,2018,2019,2020,2021,2022
+./bin/tests/system/forward/ns1/spoofed.net.db  ZONE    2022
+./bin/tests/system/forward/ns1/sub.local.net.db        ZONE    2022
+./bin/tests/system/forward/ns10/fakenet.zone   ZONE    2022
+./bin/tests/system/forward/ns10/fakenet2.zone  ZONE    2022
+./bin/tests/system/forward/ns10/fakesublocalnet.zone   ZONE    2022
+./bin/tests/system/forward/ns10/fakesublocaltld.zone   ZONE    2022
+./bin/tests/system/forward/ns10/named.conf.in  CONF-C  2022
+./bin/tests/system/forward/ns10/net.example.lll        ZONE    2022
+./bin/tests/system/forward/ns10/spoofednet.zone        ZONE    2022
 ./bin/tests/system/forward/ns2/example.db      X       2000,2001,2018,2019,2020,2021,2022
 ./bin/tests/system/forward/ns2/named.conf.in   CONF-C  2018,2019,2020,2021,2022
 ./bin/tests/system/forward/ns2/root.db         ZONE    2000,2001,2004,2007,2016,2018,2019,2020,2021,2022
 ./bin/tests/system/forward/ns4/malicious.db    ZONE    2020,2021,2022
 ./bin/tests/system/forward/ns4/named.conf.in   CONF-C  2018,2019,2020,2021,2022
 ./bin/tests/system/forward/ns4/root.db         ZONE    2000,2001,2004,2007,2016,2018,2019,2020,2021,2022
+./bin/tests/system/forward/ns4/sibling.tld.db  ZONE    2022
 ./bin/tests/system/forward/ns5/named.conf.in   CONF-C  2018,2019,2020,2021,2022
 ./bin/tests/system/forward/ns5/rebind.db       ZONE    2020,2021,2022
 ./bin/tests/system/forward/ns5/root.db         ZONE    2011,2016,2018,2019,2020,2021,2022
 ./bin/tests/system/forward/ns7/named.conf.in   CONF-C  2019,2020,2021,2022
 ./bin/tests/system/forward/ns7/root.db         ZONE    2019,2020,2021,2022
+./bin/tests/system/forward/ns8/named.conf.in   CONF-C  2022
+./bin/tests/system/forward/ns8/root.db         ZONE    2022
+./bin/tests/system/forward/ns8/sub.local.tld.db        ZONE    2022
+./bin/tests/system/forward/ns9/local.net.db    ZONE    2022
+./bin/tests/system/forward/ns9/local.tld.db    ZONE    2022
+./bin/tests/system/forward/ns9/named1.conf.in  CONF-C  2022
+./bin/tests/system/forward/ns9/named2.conf.in  CONF-C  2022
+./bin/tests/system/forward/ns9/named3.conf.in  CONF-C  2022
+./bin/tests/system/forward/ns9/named4.conf.in  CONF-C  2022
+./bin/tests/system/forward/ns9/root.db         ZONE    2022
 ./bin/tests/system/forward/prereq.sh           SH      2019,2020,2021,2022
 ./bin/tests/system/forward/rfc1918-inherited.conf      CONF-C  2016,2018,2019,2020,2021,2022
 ./bin/tests/system/forward/rfc1918-notinherited.conf   CONF-C  2016,2018,2019,2020,2021,2022