diff options
| -rw-r--r-- | libmproxy/protocol/http2.py | 26 | ||||
| -rw-r--r-- | test/test_protocol_http2.py | 79 |
2 files changed, 83 insertions, 22 deletions
diff --git a/libmproxy/protocol/http2.py b/libmproxy/protocol/http2.py index 23004497..20321d53 100644 --- a/libmproxy/protocol/http2.py +++ b/libmproxy/protocol/http2.py @@ -105,18 +105,19 @@ class Http2Layer(Layer): self.server_conn.send(self.server_conn.h2.data_to_send()) self.active_conns.append(self.server_conn.connection) - def connect(self): - self.ctx.connect() - self.server_conn.connect() - self._initiate_server_conn() + def connect(self): # pragma: no cover + raise ValueError("CONNECT inside an HTTP2 stream is not supported.") + # self.ctx.connect() + # self.server_conn.connect() + # self._initiate_server_conn() - def set_server(self): + def set_server(self): # pragma: no cover raise NotImplementedError("Cannot change server for HTTP2 connections.") - def disconnect(self): + def disconnect(self): # pragma: no cover raise NotImplementedError("Cannot dis- or reconnect in HTTP2 connections.") - def next_layer(self): + def next_layer(self): # pragma: no cover # WebSockets over HTTP/2? # CONNECT for proxying? raise NotImplementedError() @@ -257,13 +258,8 @@ class Http2SingleStreamLayer(_HttpTransmissionLayer, threading.Thread): if path == '*' or path.startswith("/"): form_in = "relative" elif method == 'CONNECT': # pragma: no cover - # form_in = "authority" - # if ":" in authority: - # host, port = authority.split(":", 1) - # else: - # host = authority raise NotImplementedError("CONNECT over HTTP/2 is not implemented.") - else: + else: # pragma: no cover form_in = "absolute" # FIXME: verify if path or :host contains what we need scheme, host, port, _ = utils.parse_url(path) @@ -359,10 +355,10 @@ class Http2SingleStreamLayer(_HttpTransmissionLayer, threading.Thread): # RFC 7540 8.1: An HTTP request/response exchange fully consumes a single stream. return True - def connect(self): + def connect(self): # pragma: no cover raise ValueError("CONNECT inside an HTTP2 stream is not supported.") - def set_server(self, *args, **kwargs): + def set_server(self, *args, **kwargs): # pragma: no cover # do not mess with the server connection - all streams share it. pass diff --git a/test/test_protocol_http2.py b/test/test_protocol_http2.py index b1c88b27..3554fa4d 100644 --- a/test/test_protocol_http2.py +++ b/test/test_protocol_http2.py @@ -7,7 +7,7 @@ import pytest import traceback import os import tempfile - +import time from io import BytesIO from libmproxy.proxy.config import ProxyConfig @@ -126,12 +126,15 @@ class _Http2TestBase(object): return client, h2_conn - def _send_request(self, wfile, h2_conn, stream_id=1, headers=[], end_stream=True): + def _send_request(self, wfile, h2_conn, stream_id=1, headers=[], body=b''): h2_conn.send_headers( stream_id=stream_id, headers=headers, - end_stream=end_stream, + end_stream=(len(body) == 0), ) + if body: + h2_conn.send_data(stream_id, body) + h2_conn.end_stream(stream_id) wfile.write(h2_conn.data_to_send()) wfile.flush() @@ -172,7 +175,7 @@ class TestSimple(_Http2TestBase, _Http2ServerBase): (':method', 'GET'), (':scheme', 'https'), (':path', '/'), - ]) + ], body='my request body echoed back to me') done = False while not done: @@ -195,6 +198,69 @@ class TestSimple(_Http2TestBase, _Http2ServerBase): @requires_alpn +class TestWithBodies(_Http2TestBase, _Http2ServerBase): + tmp_data_buffer_foobar = b'' + + @classmethod + def setup_class(self): + _Http2TestBase.setup_class() + _Http2ServerBase.setup_class() + + @classmethod + def teardown_class(self): + _Http2TestBase.teardown_class() + _Http2ServerBase.teardown_class() + + @classmethod + def handle_server_event(self, event, h2_conn, rfile, wfile): + if isinstance(event, h2.events.ConnectionTerminated): + return False + if isinstance(event, h2.events.DataReceived): + self.tmp_data_buffer_foobar += event.data + elif isinstance(event, h2.events.StreamEnded): + h2_conn.send_headers(1, [ + (':status', '200'), + ]) + h2_conn.send_data(1, self.tmp_data_buffer_foobar) + h2_conn.end_stream(1) + wfile.write(h2_conn.data_to_send()) + wfile.flush() + + return True + + def test_with_bodies(self): + client, h2_conn = self._setup_connection() + + self._send_request( + client.wfile, + h2_conn, + headers=[ + (':authority', "127.0.0.1:%s" % self.server.server.address.port), + (':method', 'GET'), + (':scheme', 'https'), + (':path', '/'), + ], + body='foobar with request body', + ) + + done = False + while not done: + events = h2_conn.receive_data(utils.http2_read_frame(client.rfile)) + client.wfile.write(h2_conn.data_to_send()) + client.wfile.flush() + + for event in events: + if isinstance(event, h2.events.StreamEnded): + done = True + + h2_conn.close_connection() + client.wfile.write(h2_conn.data_to_send()) + client.wfile.flush() + + assert self.master.state.flows[0].response.body == b'foobar with request body' + + +@requires_alpn class TestPushPromise(_Http2TestBase, _Http2ServerBase): @classmethod def setup_class(self): @@ -308,12 +374,11 @@ class TestPushPromise(_Http2TestBase, _Http2ServerBase): if isinstance(event, h2.events.StreamEnded) and event.stream_id == 1: done = True elif isinstance(event, h2.events.PushedStreamReceived): - h2_conn.reset_stream(event.pushed_stream_id) + h2_conn.reset_stream(event.pushed_stream_id, error_code=0x8) client.wfile.write(h2_conn.data_to_send()) client.wfile.flush() bodies = [flow.response.body for flow in self.master.state.flows] assert len(bodies) == 3 assert b'regular_stream' in bodies - assert b'pushed_stream_foo' in bodies - assert b'pushed_stream_bar' in bodies + # the other two bodies might not be transmitted before the reset |