Merge branch 'jdecuyper-goaway-frames' into development

Author: Lukasa

hyper/http20/connection.py

@@ -18,7 +18,7 @@
 from .stream import Stream
 from .response import HTTP20Response, HTTP20Push
 from .window import FlowControlManager
-from .exceptions import ConnectionError
+from .exceptions import ConnectionError, ProtocolError
 from . import errors
 
 import errno
@@ -240,9 +240,17 @@ def close(self):
 
         :returns: Nothing.
         """
-        # Todo: we should actually clean ourselves up if possible by sending
-        # GoAway frames and closing all outstanding streams. For now this will
-        # do.
+        # Close all streams
+        for stream in list(self.streams.values()):
+            log.debug("Close stream %d" % stream.stream_id)
+            stream.close()
+
+        # Send GoAway frame to the server
+        try:
+            self._send_cb(GoAwayFrame(0), True)
+        except Exception as e:
+            log.warn("GoAway frame could not be sent: %s" % e)
+
         if self._sock is not None:
             self._sock.close()
             self.__init_state()
@@ -580,7 +588,17 @@ def _consume_frame_payload(self, frame, data):
 
         # Work out to whom this frame should go.
         if frame.stream_id != 0:
-            self.streams[frame.stream_id].receive_frame(frame)
+            try:
+                self.streams[frame.stream_id].receive_frame(frame)
+            except KeyError:
+                # If we receive an unexpected stream identifier then we
+                # cancel the stream with an error of type PROTOCOL_ERROR
+                f = RstStreamFrame(frame.stream_id)
+                f.error_code = 1 # PROTOCOL_ERROR
+                self._send_cb(f)
+                log.warning(
+                    "Unexpected stream identifier %d" % (frame.stream_id)
+                )
         else:
             self.receive_frame(frame)
 

hyper/http20/errors.py

@@ -8,7 +8,7 @@
 the array.
 
 The current registry is available at:
-https://tools.ietf.org/html/draft-ietf-httpbis-http2-17#section-11.4
+https://tools.ietf.org/html/rfc7540#section-11.4
 """
 
 NO_ERROR =            {'Name': 'NO_ERROR',

test/test_hyper.py

@@ -1261,6 +1261,28 @@ def test_goaway_frame_invalid_error_code(self):
         assert 'data about non existing error code' in err_msg
         assert str(f.error_code) in err_msg
 
+    def test_receive_unexpected_stream_id(self):
+        frames = []
+
+        def data_callback(frame):
+            frames.append(frame)
+
+        c = HTTP20Connection('www.google.com')
+        c._send_cb = data_callback
+
+        f = DataFrame(2)
+        data = memoryview(b"hi there sir")
+        c._consume_frame_payload(f, data)
+
+        # If we receive an unexpected stream id then we cancel the stream
+        # by sending a reset stream that contains the protocol error code (1)
+        f = frames[0]
+        assert len(frames) == 1
+        assert f.stream_id == 2
+        assert isinstance(f, RstStreamFrame)
+        assert f.error_code == 1 # PROTOCOL_ERROR
+
+
 # Some utility classes for the tests.
 class NullEncoder(object):
     @staticmethod

test/test_integration.py

@@ -233,12 +233,14 @@ def socket_handler(listener):
             sock.send(f.serialize())
 
             send_event.wait()
+            sock.recv(65535)
             sock.close()
 
         self._start_server(socket_handler)
         with self.get_connection() as conn:
             conn.connect()
-            send_event.set()
+
+        send_event.set()
 
         # Check that we closed the connection.
         assert conn._sock == None