BIND 10 trac1454, updated. c9a7d521f00d4ed6252a67fd593af5959f027e8c [1454] Exceptions in accept

[BIND 10 source code commits]

The branch, trac1454 has been updated
       via  c9a7d521f00d4ed6252a67fd593af5959f027e8c (commit)
      from  11d920b3d0dcb91ce84835d555df912a7da29d64 (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 c9a7d521f00d4ed6252a67fd593af5959f027e8c
Author: Michal 'vorner' Vaner <michal.vaner at nic.cz>
Date:   Tue Jan 24 13:46:08 2012 +0100

    [1454] Exceptions in accept

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

Summary of changes:
 src/bin/ddns/ddns.py.in         |   18 ++++++++++++------
 src/bin/ddns/ddns_messages.mes  |    6 ++++++
 src/bin/ddns/tests/ddns_test.py |   35 +++++++++++++++++++++++++++++++++++
 3 files changed, 53 insertions(+), 6 deletions(-)

-----------------------------------------------------------------------
diff --git a/src/bin/ddns/ddns.py.in b/src/bin/ddns/ddns.py.in
index eb00a24..9485dfc 100755
--- a/src/bin/ddns/ddns.py.in
+++ b/src/bin/ddns/ddns.py.in
@@ -152,12 +152,18 @@ class DDNSServer:
         """
         Accept another connection and create the session receiver.
         """
-        # TODO: Handle some exceptions
-        socket = self._listen_socket.accept()
-        fileno = socket.fileno()
-        logger.debug(TRACE_BASIC, DDNS_NEW_CONN, fileno, socket.getpeername())
-        receiver = isc.util.io.socketsession.SocketSessionReceiver(socket)
-        self._socksession_receivers[fileno] = (socket, receiver)
+        try:
+            sock = self._listen_socket.accept()
+            fileno = sock.fileno()
+            logger.debug(TRACE_BASIC, DDNS_NEW_CONN, fileno,
+                         sock.getpeername())
+            receiver = isc.util.io.socketsession.SocketSessionReceiver(sock)
+            self._socksession_receivers[fileno] = (sock, receiver)
+        except (socket.error, isc.util.io.socketsession.SocketSessionError) \
+            as e:
+            # These exceptions mean the connection didn't work, but we can
+            # continue with the rest
+            logger.error(DDNS_ACCEPT_FAILURE, e)
 
     def handle_request(self, request):
         """
diff --git a/src/bin/ddns/ddns_messages.mes b/src/bin/ddns/ddns_messages.mes
index 79c4c49..7800729 100644
--- a/src/bin/ddns/ddns_messages.mes
+++ b/src/bin/ddns/ddns_messages.mes
@@ -19,6 +19,12 @@
 # <topsrcdir>/tools/reorder_message_file.py to make sure the
 # messages are in the correct order.
 
+% DDNS_ACCEPT_FAILURE error accepting a connection: %1
+There was a low-level error when we tried to accept an incoming connection
+(probably coming from b10-auth). We continue serving on whanever other
+connections we already have, but this connection is dropped. The reason
+is logged.
+
 % DDNS_CC_SESSION_ERROR error reading from cc channel: %1
 There was a problem reading from the command and control channel. The
 most likely cause is that the msgq process is not running.
diff --git a/src/bin/ddns/tests/ddns_test.py b/src/bin/ddns/tests/ddns_test.py
index 5c35bed..27278b4 100755
--- a/src/bin/ddns/tests/ddns_test.py
+++ b/src/bin/ddns/tests/ddns_test.py
@@ -241,6 +241,41 @@ class TestDDNSServer(unittest.TestCase):
         self.assertTrue(isinstance(receiver, FakeSessionReceiver))
         self.assertEqual(socket, receiver.socket())
 
+    def test_accept_fail(self):
+        """
+        Test we don't crash if an accept fails and that we don't modify the
+        internals.
+        """
+        # Make the accept fail
+        def accept_failure():
+            raise socket.error(errno.ECONNABORTED)
+        orig = self.ddns_server._listen_socket.accept
+        self.ddns_server._listen_socket.accept = accept_failure
+        self.assertEqual({}, self.ddns_server._socksession_receivers)
+        # Doesn't raise the exception
+        self.ddns_server.accept()
+        # And nothing is stored
+        self.assertEqual({}, self.ddns_server._socksession_receivers)
+        # Now make the socket receiver fail
+        self.ddns_server._listen_socket.accept = orig
+        def receiver_failure(sock):
+            raise isc.util.io.socketsession.SocketSessionError('Test error')
+        ddns.isc.util.io.socketsession.SocketSessionReceiver = \
+            receiver_failure
+        # Doesn't raise the exception
+        self.ddns_server.accept()
+        # And nothing is stored
+        self.assertEqual({}, self.ddns_server._socksession_receivers)
+        # Check we don't catch everything, so raise just an exception
+        def unexpected_failure(sock):
+            raise Exception('Test error')
+        ddns.isc.util.io.socketsession.SocketSessionReceiver = \
+            unexpected_failure
+        # This one gets through
+        self.assertRaises(Exception, self.ddns_server.accept)
+        # Nothing is stored as well
+        self.assertEqual({}, self.ddns_server._socksession_receivers)
+
     def test_session_called(self):
         """
         Test the run calls handle_session when there's something on the