PUSH_PROMISE: fix body parsing with padding

Author: Kriechi

HISTORY.rst

@@ -8,6 +8,10 @@ Release History
 
 - Deprecate ``total_padding`` - use `pad_length` instead.
 
+**Bugfixes**
+
+- Fixed padding parsing for ``PushPromiseFrame``.
+
 **Other Changes**
 
 - Drop support for Python 2.7, 3.4, 3.5, pypy and support 3.8.

hyperframe/frame.py

@@ -474,7 +474,9 @@ def parse_body(self, data):
         except struct.error:
             raise InvalidFrameError("Invalid PUSH_PROMISE body")
 
-        self.data = data[padding_data_length + 4:].tobytes()
+        self.data = (
+            data[padding_data_length + 4:len(data)-self.pad_length].tobytes()
+        )
         self.body_len = len(data)
 
         if self.pad_length and self.pad_length >= self.body_len:

test/test_frames.py

@@ -406,6 +406,21 @@ def test_push_promise_frame_parses_properly(self):
         assert f.data == b'hello world'
         assert f.body_len == 15
 
+    def test_push_promise_frame_with_padding(self):
+        s = (
+            b'\x00\x00\x17\x05\x0C\x00\x00\x00\x01' +
+            b'\x07\x00\x00\x00\x04' +
+            b'hello world' +
+            b'padding'
+        )
+        f = decode_frame(s)
+
+        assert isinstance(f, PushPromiseFrame)
+        assert f.flags == set(['END_HEADERS', 'PADDED'])
+        assert f.promised_stream_id == 4
+        assert f.data == b'hello world'
+        assert f.body_len == 23
+
     def test_push_promise_frame_with_invalid_padding_fails_to_parse(self):
         # This frame has a padding length of 6 bytes, but a total length of
         # only 5.