BIND 10 trac1553, updated. 0457ee07936085e0b0843fa645b9873a01e60b8b [1553] Merge branch 'trac1553' of ssh://git.bind10.isc.org/var/bind10/git/bind10 into trac1553

BIND 10 source code commits bind10-changes at lists.isc.org
Fri Jan 20 09:58:59 UTC 2012


The branch, trac1553 has been updated
       via  0457ee07936085e0b0843fa645b9873a01e60b8b (commit)
       via  6579042087fdc53e1c6b7fa929449bed3e22637c (commit)
      from  42b606583daa7b0c5702cebf9e45ee8138793cf0 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 0457ee07936085e0b0843fa645b9873a01e60b8b
Merge: 6579042087fdc53e1c6b7fa929449bed3e22637c 42b606583daa7b0c5702cebf9e45ee8138793cf0
Author: Jelte Jansen <jelte at isc.org>
Date:   Fri Jan 20 10:56:48 2012 +0100

    [1553] Merge branch 'trac1553' of ssh://git.bind10.isc.org/var/bind10/git/bind10 into trac1553

commit 6579042087fdc53e1c6b7fa929449bed3e22637c
Author: Jelte Jansen <jelte at isc.org>
Date:   Fri Jan 20 10:56:18 2012 +0100

    [1553] test basic ACL for resolver as well

-----------------------------------------------------------------------

Summary of changes:
 .../configurations/resolver/resolver_basic.config  |    1 -
 .../resolver/resolver_basic.config.orig            |    1 +
 tests/lettuce/features/resolver_basic.feature      |   12 +++++++++++-
 tests/lettuce/features/terrain/terrain.py          |    5 ++++-
 4 files changed, 16 insertions(+), 3 deletions(-)
 delete mode 100644 tests/lettuce/configurations/resolver/resolver_basic.config
 create mode 100644 tests/lettuce/configurations/resolver/resolver_basic.config.orig

-----------------------------------------------------------------------
diff --git a/tests/lettuce/configurations/resolver/resolver_basic.config b/tests/lettuce/configurations/resolver/resolver_basic.config
deleted file mode 100644
index a1f8afc..0000000
--- a/tests/lettuce/configurations/resolver/resolver_basic.config
+++ /dev/null
@@ -1 +0,0 @@
-{"version": 2, "Resolver": {"listen_on": [{"port": 47806, "address": "127.0.0.1"}]}, "Boss": {"components": {"b10-resolver": {"kind": "needed"}, "b10-cmdctl": {"kind": "needed", "special": "cmdctl"}}}}
diff --git a/tests/lettuce/configurations/resolver/resolver_basic.config.orig b/tests/lettuce/configurations/resolver/resolver_basic.config.orig
new file mode 100644
index 0000000..5664c20
--- /dev/null
+++ b/tests/lettuce/configurations/resolver/resolver_basic.config.orig
@@ -0,0 +1 @@
+{"version": 2, "Resolver": {"query_acl": [{"action": "REJECT", "from": "127.0.0.1"}], "listen_on": [{"port": 47806, "address": "127.0.0.1"}]}, "Boss": {"components": {"b10-resolver": {"kind": "needed"}, "b10-cmdctl": {"kind": "needed", "special": "cmdctl"}}}}
diff --git a/tests/lettuce/features/resolver_basic.feature b/tests/lettuce/features/resolver_basic.feature
index b4d84f0..c759971 100644
--- a/tests/lettuce/features/resolver_basic.feature
+++ b/tests/lettuce/features/resolver_basic.feature
@@ -12,5 +12,15 @@ Feature: Basic Resolver
         # for any resolver system test)
         When I start bind10 with configuration resolver/resolver_basic.config
         And wait for new bind10 stderr message RESOLVER_STARTED
-        # This answer is currently hardcoded (as part of the fake priming)
+
+        # The ACL is set to reject any queries
+        A query for l.root-servers.net. should have rcode REFUSED
+
+        # Test whether acl ACCEPT works
+        When I set bind10 configuration Resolver/query_acl[0]/action to ACCEPT
+        # This address is currently hardcoded, so shouldn't cause outside traffic
         A query for l.root-servers.net. should have rcode NOERROR
+
+        # Check whether setting the ACL to reject again works
+        When I set bind10 configuration Resolver/query_acl[0]/action to REJECT
+        A query for l.root-servers.net. should have rcode REFUSED
diff --git a/tests/lettuce/features/terrain/terrain.py b/tests/lettuce/features/terrain/terrain.py
index d2ac03f..90531a1 100644
--- a/tests/lettuce/features/terrain/terrain.py
+++ b/tests/lettuce/features/terrain/terrain.py
@@ -42,7 +42,10 @@ import time
 # The first element is the original, the second is the target that will be
 # used by the tests that need them
 copylist = [
-["configurations/example.org.config.orig", "configurations/example.org.config"]
+    ["configurations/example.org.config.orig",
+     "configurations/example.org.config"],
+    ["configurations/resolver/resolver_basic.config.orig",
+     "configurations/resolver/resolver_basic.config"]
 ]
 
 # This is a list of files that, if present, will be removed before a scenario




More information about the bind10-changes mailing list