Add test for unexpected stream id

Author: jdecuyper

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
@@ -558,7 +558,6 @@ def _consume_frame_payload(self, frame, data):
         This builds and handles a frame.
         """
         frame.parse_body(data)
-
         log.info(
             "Received frame %s on stream %d",
             frame.__class__.__name__,
@@ -593,7 +592,9 @@ def _consume_frame_payload(self, frame, data):
                 f = RstStreamFrame(frame.stream_id)
                 f.error_code = 1 # PROTOCOL_ERROR
                 self._send_cb(f)
-                log.warning("Unexpected stream identifier %d", frame.stream_id)
+                error_string = ("Unexpected stream identifier %d" %
+                                  (frame.stream_id))
+                raise ProtocolError(error_string)
         else:
             self.receive_frame(frame)
 

test/test_hyper.py

@@ -1261,6 +1261,21 @@ 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(-1)
+        data = memoryview(b"hi there sir")
+
+        with pytest.raises(ProtocolError):
+            c._consume_frame_payload(f, data)
+
 # Some utility classes for the tests.
 class NullEncoder(object):
     @staticmethod