BIND 10 master, updated. 8cabb13b990bd2536af98d5a73edaa31b0928f9d [master] update changelog
BIND 10 source code commits
bind10-changes at lists.isc.org
Fri Dec 16 09:27:59 UTC 2011
The branch, master has been updated
via 8cabb13b990bd2536af98d5a73edaa31b0928f9d (commit)
via 7b122af8489acf0f28f935a19eca2c5509a3677f (commit)
via 196b58b907f9069c004fbf2ac140bcfd59f960bc (commit)
via 4d6719f99efecca28f65c792ac9933c5424c963a (commit)
via 740d33cd94f12b8c88e5dcb1e1640e87a97a499f (commit)
via bdd00552a920331dc3cf1f2e6a7644112caa4b72 (commit)
via 2d0aacaedbdc31e8afa5075ed6d77ea9a1db8920 (commit)
via 23350205fb9b09ed188be0898b3f95efb34f74b1 (commit)
via ebfebb1be1968d33fb0054fe6df65aa90a085612 (commit)
via 28f5b7df990e502695635c112d61ce5bbe088efd (commit)
via 936855eb6fd5304128b737b72ca464747061a476 (commit)
from f3db2f5329ae957c463e486d7fe4ab09aa0a30f0 (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 8cabb13b990bd2536af98d5a73edaa31b0928f9d
Author: Jelte Jansen <jelte at isc.org>
Date: Fri Dec 16 10:27:45 2011 +0100
[master] update changelog
commit 7b122af8489acf0f28f935a19eca2c5509a3677f
Merge: f3db2f5329ae957c463e486d7fe4ab09aa0a30f0 196b58b907f9069c004fbf2ac140bcfd59f960bc
Author: Jelte Jansen <jelte at isc.org>
Date: Fri Dec 16 10:05:09 2011 +0100
Merge branch 'trac1414'
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 8 ++
src/bin/zonemgr/tests/Makefile.am | 1 +
src/bin/zonemgr/tests/zonemgr_test.py | 136 ++++++++++++++++++++-------------
src/bin/zonemgr/zonemgr.py.in | 51 ++++++++++--
4 files changed, 133 insertions(+), 63 deletions(-)
-----------------------------------------------------------------------
diff --git a/ChangeLog b/ChangeLog
index 936cff7..6fb15b6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+347. [bug] jelte
+ Fixed a bug where adding Zonemgr/secondary_zones without explicitely
+ setting the class value of the added zone resulted in a cryptic
+ error in bindctl ("Error: class"). It will now correctly default to
+ IN if not set. This also adds better checks on the name and class
+ values, and better errors if they are bad.
+ (Trac #1414, git 7b122af8489acf0f28f935a19eca2c5509a3677f)
+
346. [build]* jreed
Renamed libdhcp to libdhcp++.
(Trac #1446, git d394e64f4c44f16027b1e62b4ac34e054b49221d)
diff --git a/src/bin/zonemgr/tests/Makefile.am b/src/bin/zonemgr/tests/Makefile.am
index 769d332..8c6b904 100644
--- a/src/bin/zonemgr/tests/Makefile.am
+++ b/src/bin/zonemgr/tests/Makefile.am
@@ -20,6 +20,7 @@ endif
for pytest in $(PYTESTS) ; do \
echo Running test: $$pytest ; \
$(LIBRARY_PATH_PLACEHOLDER) \
+ B10_FROM_BUILD=$(abs_top_builddir) \
PYTHONPATH=$(COMMON_PYTHON_PATH):$(abs_top_builddir)/src/bin/zonemgr:$(abs_top_builddir)/src/lib/dns/python/.libs:$(abs_top_builddir)/src/lib/xfr/.libs \
$(PYCOVERAGE_RUN) $(abs_srcdir)/$$pytest || exit ; \
done
diff --git a/src/bin/zonemgr/tests/zonemgr_test.py b/src/bin/zonemgr/tests/zonemgr_test.py
index 80e41b3..600453d 100644
--- a/src/bin/zonemgr/tests/zonemgr_test.py
+++ b/src/bin/zonemgr/tests/zonemgr_test.py
@@ -48,28 +48,16 @@ class MySession():
def group_recvmsg(self, nonblock, seq):
return None, None
-class FakeConfig:
+class FakeCCSession(isc.config.ConfigData):
def __init__(self):
- self.zone_list = []
- self.set_zone_list_from_name_classes([ZONE_NAME_CLASS1_IN,
- ZONE_NAME_CLASS2_CH])
- def set_zone_list_from_name_classes(self, zones):
- self.zone_list = map(lambda nc: {"name": nc[0], "class": nc[1]}, zones)
- def get(self, name):
- if name == 'lowerbound_refresh':
- return LOWERBOUND_REFRESH
- elif name == 'lowerbound_retry':
- return LOWERBOUND_RETRY
- elif name == 'max_transfer_timeout':
- return MAX_TRANSFER_TIMEOUT
- elif name == 'refresh_jitter':
- return REFRESH_JITTER
- elif name == 'reload_jitter':
- return RELOAD_JITTER
- elif name == 'secondary_zones':
- return self.zone_list
+ module_spec = isc.config.module_spec_from_file(SPECFILE_LOCATION)
+ ConfigData.__init__(self, module_spec)
+
+ def get_remote_config_value(self, module_name, identifier):
+ if module_name == "Auth" and identifier == "database_file":
+ return "initdb.file", False
else:
- raise ValueError('Uknown config option')
+ return "unknown", False
class MyZonemgrRefresh(ZonemgrRefresh):
def __init__(self):
@@ -92,7 +80,7 @@ class MyZonemgrRefresh(ZonemgrRefresh):
sqlite3_ds.get_zone_soa = get_zone_soa
ZonemgrRefresh.__init__(self, MySession(), "initdb.file",
- self._slave_socket, FakeConfig())
+ self._slave_socket, FakeCCSession())
current_time = time.time()
self._zonemgr_refresh_info = {
('example.net.', 'IN'): {
@@ -112,6 +100,7 @@ class TestZonemgrRefresh(unittest.TestCase):
self.stderr_backup = sys.stderr
sys.stderr = open(os.devnull, 'w')
self.zone_refresh = MyZonemgrRefresh()
+ self.cc_session = FakeCCSession()
def test_random_jitter(self):
max = 100025.120
@@ -458,7 +447,23 @@ class TestZonemgrRefresh(unittest.TestCase):
"secondary_zones": [ { "name": "example.net.",
"class": "IN" } ]
}
- self.zone_refresh.update_config_data(config_data)
+ self.zone_refresh.update_config_data(config_data, self.cc_session)
+ self.assertTrue(("example.net.", "IN") in
+ self.zone_refresh._zonemgr_refresh_info)
+
+ # make sure it does fail if we don't provide a name
+ config_data = {
+ "secondary_zones": [ { "class": "IN" } ]
+ }
+ self.assertRaises(ZonemgrException,
+ self.zone_refresh.update_config_data,
+ config_data, self.cc_session)
+
+ # But not if we don't provide a class
+ config_data = {
+ "secondary_zones": [ { "name": "example.net." } ]
+ }
+ self.zone_refresh.update_config_data(config_data, self.cc_session)
self.assertTrue(("example.net.", "IN") in
self.zone_refresh._zonemgr_refresh_info)
@@ -471,7 +476,7 @@ class TestZonemgrRefresh(unittest.TestCase):
"reload_jitter" : 0.75,
"secondary_zones": []
}
- self.zone_refresh.update_config_data(config_data)
+ self.zone_refresh.update_config_data(config_data, self.cc_session)
self.assertEqual(60, self.zone_refresh._lowerbound_refresh)
self.assertEqual(30, self.zone_refresh._lowerbound_retry)
self.assertEqual(19800, self.zone_refresh._max_transfer_timeout)
@@ -482,7 +487,7 @@ class TestZonemgrRefresh(unittest.TestCase):
config_data = {
"reload_jitter" : 0.35,
}
- self.zone_refresh.update_config_data(config_data)
+ self.zone_refresh.update_config_data(config_data, self.cc_session)
self.assertEqual(60, self.zone_refresh._lowerbound_refresh)
self.assertEqual(30, self.zone_refresh._lowerbound_retry)
self.assertEqual(19800, self.zone_refresh._max_transfer_timeout)
@@ -500,7 +505,7 @@ class TestZonemgrRefresh(unittest.TestCase):
"secondary_zones": [ { "name": "doesnotexist",
"class": "IN" } ]
}
- self.zone_refresh.update_config_data(config_data)
+ self.zone_refresh.update_config_data(config_data, self.cc_session)
name_class = ("doesnotexist.", "IN")
self.assertTrue(self.zone_refresh._zonemgr_refresh_info[name_class]["zone_soa_rdata"]
is None)
@@ -520,7 +525,7 @@ class TestZonemgrRefresh(unittest.TestCase):
"reload_jitter" : 0.75,
"secondary_zones": []
}
- self.zone_refresh.update_config_data(config_data)
+ self.zone_refresh.update_config_data(config_data, self.cc_session)
self.assertEqual(60, self.zone_refresh._lowerbound_refresh)
self.assertEqual(30, self.zone_refresh._lowerbound_retry)
self.assertEqual(19800, self.zone_refresh._max_transfer_timeout)
@@ -536,45 +541,67 @@ class TestZonemgrRefresh(unittest.TestCase):
self.assertFalse(listener.is_alive())
def test_secondary_zones(self):
+ def zone_list_from_name_classes(zones):
+ return map(lambda nc: {"name": nc[0], "class": nc[1]}, zones)
+
"""Test that we can modify the list of secondary zones"""
- config = FakeConfig()
- config.zone_list = []
+ config = self.cc_session.get_full_config()
+ config['secondary_zones'] = []
# First, remove everything
- self.zone_refresh.update_config_data(config)
+ self.zone_refresh.update_config_data(config, self.cc_session)
self.assertEqual(self.zone_refresh._zonemgr_refresh_info, {})
# Put something in
- config.set_zone_list_from_name_classes([ZONE_NAME_CLASS1_IN])
- self.zone_refresh.update_config_data(config)
+ config['secondary_zones'] = \
+ zone_list_from_name_classes([ZONE_NAME_CLASS1_IN])
+ self.zone_refresh.update_config_data(config, self.cc_session)
self.assertTrue(("example.net.", "IN") in
self.zone_refresh._zonemgr_refresh_info)
- # This one does not exist
- config.set_zone_list_from_name_classes(["example.net", "CH"])
- self.zone_refresh.update_config_data(config)
- self.assertFalse(("example.net.", "CH") in
- self.zone_refresh._zonemgr_refresh_info)
- # Simply skip loading soa for the zone, the other configs should be updated successful
+ # Reset the data, set to use a different class, and make sure
+ # it does not get set to IN
+ config['secondary_zones'] = \
+ zone_list_from_name_classes([ZONE_NAME_CLASS1_CH])
+ self.zone_refresh.update_config_data(config, self.cc_session)
self.assertFalse(("example.net.", "IN") in
- self.zone_refresh._zonemgr_refresh_info)
+ self.zone_refresh._zonemgr_refresh_info)
# Make sure it works even when we "accidentally" forget the final dot
- config.set_zone_list_from_name_classes([("example.net", "IN")])
- self.zone_refresh.update_config_data(config)
+ config['secondary_zones'] = \
+ zone_list_from_name_classes([("example.net", "IN")])
+ self.zone_refresh.update_config_data(config, self.cc_session)
self.assertTrue(("example.net.", "IN") in
self.zone_refresh._zonemgr_refresh_info)
- def tearDown(self):
- sys.stderr= self.stderr_backup
-
+ # and with case-insensitive checking
+ config['secondary_zones'] = \
+ zone_list_from_name_classes([("Example.NeT.", "in")])
+ self.zone_refresh.update_config_data(config, self.cc_session)
+ self.assertTrue(("example.net.", "IN") in
+ self.zone_refresh._zonemgr_refresh_info)
-class MyCCSession():
- def __init__(self):
- pass
-
- def get_remote_config_value(self, module_name, identifier):
- if module_name == "Auth" and identifier == "database_file":
- return "initdb.file", False
- else:
- return "unknown", False
+ # Try some bad names
+ config['secondary_zones'] = \
+ zone_list_from_name_classes([("example..net", "IN")])
+ self.assertRaises(ZonemgrException,
+ self.zone_refresh.update_config_data,
+ config, self.cc_session)
+ config['secondary_zones'] = \
+ zone_list_from_name_classes([("", "IN")])
+ self.assertRaises(ZonemgrException,
+ self.zone_refresh.update_config_data,
+ config, self.cc_session)
+ # Try a bad class
+ config['secondary_zones'] = \
+ zone_list_from_name_classes([("example.net", "BADCLASS")])
+ self.assertRaises(ZonemgrException,
+ self.zone_refresh.update_config_data,
+ config, self.cc_session)
+ config['secondary_zones'] = \
+ zone_list_from_name_classes([("example.net", "")])
+ self.assertRaises(ZonemgrException,
+ self.zone_refresh.update_config_data,
+ config, self.cc_session)
+ def tearDown(self):
+ sys.stderr= self.stderr_backup
class MyZonemgr(Zonemgr):
@@ -583,7 +610,7 @@ class MyZonemgr(Zonemgr):
self._zone_refresh = None
self._shutdown_event = threading.Event()
self._cc = MySession()
- self._module_cc = MyCCSession()
+ self._module_cc = FakeCCSession()
self._config_data = {
"lowerbound_refresh" : 10,
"lowerbound_retry" : 5,
@@ -622,7 +649,7 @@ class TestZonemgr(unittest.TestCase):
self.assertEqual(0.5, self.zonemgr._config_data.get("refresh_jitter"))
# The zone doesn't exist in database, simply skip loading soa for it and log an warning
self.zonemgr._zone_refresh = ZonemgrRefresh(None, "initdb.file", None,
- config_data1)
+ FakeCCSession())
config_data1["secondary_zones"] = [{"name": "nonexistent.example",
"class": "IN"}]
self.assertEqual(self.zonemgr.config_handler(config_data1),
@@ -660,4 +687,5 @@ class TestZonemgr(unittest.TestCase):
pass
if __name__== "__main__":
+ isc.log.resetUnitTestRootLogger()
unittest.main()
diff --git a/src/bin/zonemgr/zonemgr.py.in b/src/bin/zonemgr/zonemgr.py.in
index 5bdb765..4060bb5 100755
--- a/src/bin/zonemgr/zonemgr.py.in
+++ b/src/bin/zonemgr/zonemgr.py.in
@@ -28,6 +28,7 @@ import os
import time
import signal
import isc
+import isc.dns
import random
import threading
import select
@@ -98,7 +99,7 @@ class ZonemgrRefresh:
can be stopped by calling shutdown() in another thread.
"""
- def __init__(self, cc, db_file, slave_socket, config_data):
+ def __init__(self, cc, db_file, slave_socket, module_cc_session):
self._cc = cc
self._check_sock = slave_socket
self._db_file = db_file
@@ -108,7 +109,8 @@ class ZonemgrRefresh:
self._max_transfer_timeout = None
self._refresh_jitter = None
self._reload_jitter = None
- self.update_config_data(config_data)
+ self.update_config_data(module_cc_session.get_full_config(),
+ module_cc_session)
self._running = False
def _random_jitter(self, max, jitter):
@@ -424,7 +426,7 @@ class ZonemgrRefresh:
self._read_sock = None
self._write_sock = None
- def update_config_data(self, new_config):
+ def update_config_data(self, new_config, module_cc_session):
""" update ZonemgrRefresh config """
# Get a new value, but only if it is defined (commonly used below)
# We don't use "value or default", because if value would be
@@ -456,11 +458,42 @@ class ZonemgrRefresh:
if secondary_zones is not None:
# Add new zones
for secondary_zone in new_config.get('secondary_zones'):
+ if 'name' not in secondary_zone:
+ raise ZonemgrException("Secondary zone specified "
+ "without a name")
name = secondary_zone['name']
- # Be tolerant to sclerotic users who forget the final dot
- if name[-1] != '.':
- name = name + '.'
- name_class = (name, secondary_zone['class'])
+
+ # Convert to Name and back (both to check and to normalize)
+ try:
+ name = isc.dns.Name(name, True).to_text()
+ # Name() can raise a number of different exceptions, just
+ # catch 'em all.
+ except Exception as isce:
+ raise ZonemgrException("Bad zone name '" + name +
+ "': " + str(isce))
+
+ # Currently we use an explicit get_default_value call
+ # in case the class hasn't been set. Alternatively, we
+ # could use
+ # module_cc_session.get_value('secondary_zones[INDEX]/class')
+ # To get either the value that was set, or the default if
+ # it wasn't set.
+ # But the real solution would be to make new_config a type
+ # that contains default values itself
+ # (then this entire method can be simplified a lot, and we
+ # wouldn't need direct access to the ccsession object)
+ if 'class' in secondary_zone:
+ rr_class = secondary_zone['class']
+ else:
+ rr_class = module_cc_session.get_default_value(
+ 'secondary_zones/class')
+ # Convert rr_class to and from RRClass to check its value
+ try:
+ name_class = (name, isc.dns.RRClass(rr_class).to_text())
+ except isc.dns.InvalidRRClass:
+ raise ZonemgrException("Bad RR class '" +
+ rr_class +
+ "' for zone " + name)
required[name_class] = True
# Add it only if it isn't there already
if not name_class in self._zonemgr_refresh_info:
@@ -485,7 +518,7 @@ class Zonemgr:
self._db_file = self.get_db_file()
# Create socket pair for communicating between main thread and zonemgr timer thread
self._master_socket, self._slave_socket = socket.socketpair(socket.AF_UNIX, socket.SOCK_STREAM)
- self._zone_refresh = ZonemgrRefresh(self._cc, self._db_file, self._slave_socket, self._config_data)
+ self._zone_refresh = ZonemgrRefresh(self._cc, self._db_file, self._slave_socket, self._module_cc)
self._zone_refresh.run_timer()
self._lock = threading.Lock()
@@ -540,7 +573,7 @@ class Zonemgr:
self._config_data_check(complete)
if self._zone_refresh is not None:
try:
- self._zone_refresh.update_config_data(complete)
+ self._zone_refresh.update_config_data(complete, self._module_cc)
except Exception as e:
answer = create_answer(1, str(e))
ok = False
More information about the bind10-changes
mailing list