From: JINMEI Tatuya <jinmei@isc.org>
Date: Thu, 17 May 2012 01:35:37 +0000 (-0700)
Subject: [1512] supported 'notauth' case.
X-Git-Tag: trac2351_base~226^2~82^2~19
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=9246111fe4cb6240ed82483e4ae57b2eaf2da523;p=thirdparty%2Fkea.git

[1512] supported 'notauth' case.
---

diff --git a/src/lib/python/isc/ddns/session.py b/src/lib/python/isc/ddns/session.py
index b04ad44425..b29905d934 100644
--- a/src/lib/python/isc/ddns/session.py
+++ b/src/lib/python/isc/ddns/session.py
@@ -121,6 +121,9 @@ class UpdateSession:
             # unconditionally refused forwarding (we don't support it yet)
             raise UpdateError('Update forwarding not supported',
                               zname, zclass, Rcode.REFUSED())
+        # zone wasn't found
+        raise UpdateError('not authoritative for update zone',
+                          zname, zclass, Rcode.NOTAUTH())
 
     def __make_response(self, rcode):
         '''Transform the internal message to the update response.
diff --git a/src/lib/python/isc/ddns/tests/session_tests.py b/src/lib/python/isc/ddns/tests/session_tests.py
index 493017f6a1..22cec187cf 100644
--- a/src/lib/python/isc/ddns/tests/session_tests.py
+++ b/src/lib/python/isc/ddns/tests/session_tests.py
@@ -76,6 +76,17 @@ class SessionTest(unittest.TestCase):
         self.assertEqual(0, msg.get_rr_count(SECTION_UPDATE))
         self.assertEqual(0, msg.get_rr_count(Message.SECTION_ADDITIONAL))
 
+    def test_handle(self):
+        '''Basic update case'''
+        result, zname, zclass = self.__session.handle()
+        self.assertEqual(UPDATE_SUCCESS, result)
+        self.assertEqual(TEST_ZONE_NAME, zname)
+        self.assertEqual(TEST_RRCLASS, zclass)
+
+        # Just checking these are different from the success code.
+        self.assertNotEqual(UPDATE_ERROR, result)
+        self.assertNotEqual(UPDATE_DROP, result)
+
     def test_broken_request(self):
         # Zone section is empty
         msg_data, msg = create_update_msg(zones=[])
@@ -115,15 +126,26 @@ class SessionTest(unittest.TestCase):
         self.assertEqual(UPDATE_ERROR, session.handle()[0])
         self.check_response(session.get_message(), Rcode.REFUSED())
 
-    def test_handle(self):
-        result, zname, zclass = self.__session.handle()
-        self.assertEqual(UPDATE_SUCCESS, result)
-        self.assertEqual(TEST_ZONE_NAME, zname)
-        self.assertEqual(TEST_RRCLASS, zclass)
-
-        # Just checking these are different from the success code.
-        self.assertNotEqual(UPDATE_ERROR, result)
-        self.assertNotEqual(UPDATE_DROP, result)
+    def check_notauth(self, zname, zclass=TEST_RRCLASS):
+        '''Common test sequence for the 'notauth' test'''
+        msg_data, msg = create_update_msg(zones=[Question(zname, zclass,
+                                                          RRType.SOA())])
+        session = UpdateSession(msg, msg_data, TEST_CLIENT4,
+                                ZoneConfig([(TEST_ZONE_NAME, TEST_RRCLASS)],
+                                           TEST_RRCLASS,
+                                           self.__datasrc_client))
+        self.assertEqual(UPDATE_ERROR, session.handle()[0])
+        self.check_response(session.get_message(), Rcode.NOTAUTH())
+
+    def test_update_notauth(self):
+        '''Update attempt for non authoritative zones'''
+        # zone name doesn't match
+        self.check_notauth(Name('example.com'))
+        # zone name is a subdomain of the actual authoritative zone
+        # (match must be exact)
+        self.check_notauth(Name('sub.example.org'))
+        # zone class doesn't match
+        self.check_notauth(Name('example.org'), RRClass.CH())
 
 if __name__ == "__main__":
     isc.log.init("bind10")
diff --git a/src/lib/python/isc/ddns/zone_config.py b/src/lib/python/isc/ddns/zone_config.py
index 18b3e1596f..fee039667a 100644
--- a/src/lib/python/isc/ddns/zone_config.py
+++ b/src/lib/python/isc/ddns/zone_config.py
@@ -56,8 +56,9 @@ class ZoneConfig:
     def find_zone(self, zone_name, zone_class):
         '''Return the type and accessor client object for given zone.'''
         if self.__datasrc_class == zone_class and \
-            self.__datasrc_client.find_zone(zone_name)[0] == \
-            DataSourceClient.SUCCESS:
+                self.__datasrc_client.find_zone(zone_name)[0] == \
+                DataSourceClient.SUCCESS:
             if (zone_name, zone_class) in self.__secondaries:
-                return ZONE_SECONDARY, self.__datasrc_client
+                return ZONE_SECONDARY, None
             return ZONE_PRIMARY, self.__datasrc_client
+        return ZONE_NOTFOUND, None