Throw connection error when the frame size setting is out of range

Author: jdecuyper

hyper/http20/connection.py

@@ -457,14 +457,17 @@ def _update_settings(self, frame):
 
         if SettingsFrame.SETTINGS_MAX_FRAME_SIZE in frame.settings:
             new_size = frame.settings[SettingsFrame.SETTINGS_MAX_FRAME_SIZE]
-            if new_size > FRAME_MAX_LEN and new_size < FRAME_MAX_ALLOWED_LEN:
+            if FRAME_MAX_LEN <= new_size <= FRAME_MAX_ALLOWED_LEN:
                 self._settings[SettingsFrame.SETTINGS_MAX_FRAME_SIZE] = new_size
             else:
                 log.warning(
                     "Frame size %d is outside of allowed range",
                     new_size)
                 # Tear the connection down with error code PROTOCOL_ERROR
                 self.close(1)
+                error_string = ("Advertised frame size %d is outside of range" %
+                                (new_size))
+                raise ConnectionError(error_string)
 
     def _new_stream(self, stream_id=None, local_closed=False):
         """
@@ -507,6 +510,9 @@ def _send_cb(self, frame, tolerate_peer_gone=False):
 
         data = frame.serialize()
 
+        if frame.body_len > FRAME_MAX_LEN:  # pragma: no cover
+            raise ValueError("Frame size %d is too large" % frame.body_len)
+
         log.info(
             "Sending frame %s on stream %d",
             frame.__class__.__name__,