kylefang/mitmproxy
1
0
Fork 0
mirror of https://github.com/zhigang1992/mitmproxy.git synced 2026-04-29 12:45:00 +08:00
Code Issues Packages Projects Releases Wiki Activity

upgrade h2 to >=2.5.0

Browse Source
This commit is contained in:
Thomas Kriechbaumer
2016-10-27 12:22:09 -07:00
parent 33bc526b70
commit 44ac370f08
3 changed files with 26 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
mitmproxy/proxy/protocol/http2.py
View File

@@ -25,17 +25,13 @@ class SafeH2Connection(connection.H2Connection):
self.conn = conn self.conn = conn
self.lock = threading.RLock() self.lock = threading.RLock()
def safe_increment_flow_control(self, stream_id, length): def safe_acknowledge_received_data(self, acknowledged_size, stream_id):
if length == 0: if acknowledged_size == 0:
return return
with self.lock: with self.lock:
self.increment_flow_control_window(length) self.acknowledge_received_data(acknowledged_size, stream_id)
self.conn.send(self.data_to_send()) self.conn.send(self.data_to_send())
with self.lock:
if stream_id in self.streams and not self.streams[stream_id].closed:
self.increment_flow_control_window(length, stream_id=stream_id)
self.conn.send(self.data_to_send())
def safe_reset_stream(self, stream_id, error_code): def safe_reset_stream(self, stream_id, error_code):
with self.lock: with self.lock:
@@ -90,13 +86,25 @@ class Http2Layer(base.Layer):
self.mode = mode self.mode = mode
self.streams = dict() self.streams = dict()
self.server_to_client_stream_ids = dict([(0, 0)]) self.server_to_client_stream_ids = dict([(0, 0)])
self.client_conn.h2 = SafeH2Connection(self.client_conn, client_side=False, header_encoding=False) config = h2.config.H2Configuration(
client_side=False,
header_encoding=False,
validate_outbound_headers=False,
normalize_outbound_headers=False,
validate_inbound_headers=False)
self.client_conn.h2 = SafeH2Connection(self.client_conn, config=config)
def _initiate_server_conn(self): def _initiate_server_conn(self):
if self.server_conn: if self.server_conn:
self.server_conn.h2 = SafeH2Connection(self.server_conn, client_side=True, header_encoding=False) config = h2.config.H2Configuration(
self.server_conn.h2.initiate_connection() client_side=True,
self.server_conn.send(self.server_conn.h2.data_to_send()) header_encoding=False,
validate_outbound_headers=False,
normalize_outbound_headers=False,
validate_inbound_headers=False)
self.server_conn.h2 = SafeH2Connection(self.server_conn, config=config)
self.server_conn.h2.initiate_connection()
self.server_conn.send(self.server_conn.h2.data_to_send())
def _complete_handshake(self): def _complete_handshake(self):
preamble = self.client_conn.rfile.read(24) preamble = self.client_conn.rfile.read(24)
@@ -181,9 +189,9 @@ class Http2Layer(base.Layer):
else: else:
self.streams[eid].data_queue.put(event.data) self.streams[eid].data_queue.put(event.data)
self.streams[eid].queued_data_length += len(event.data) self.streams[eid].queued_data_length += len(event.data)
source_conn.h2.safe_increment_flow_control( source_conn.h2.safe_acknowledge_received_data(
event.stream_id, event.flow_controlled_length,
event.flow_controlled_length event.stream_id
) )
return True return True

2
setup.py
View File

@@ -67,7 +67,7 @@ setup(
"cryptography>=1.3, <1.6", "cryptography>=1.3, <1.6",
"cssutils>=1.0.1, <1.1", "cssutils>=1.0.1, <1.1",
"Flask>=0.10.1, <0.12", "Flask>=0.10.1, <0.12",
"h2>=2.4.1, <3", "h2>=2.5.0, <3",
"html2text>=2016.1.8, <=2016.9.19", "html2text>=2016.1.8, <=2016.9.19",
"hyperframe>=4.0.1, <5", "hyperframe>=4.0.1, <5",
"jsbeautifier>=1.6.3, <1.7", "jsbeautifier>=1.6.3, <1.7",

6
test/mitmproxy/protocol/test_http2.py
View File

@@ -298,9 +298,9 @@ class TestRequestWithPriority(_Http2Test):
headers = [(':status', '200')] headers = [(':status', '200')]
if event.priority_updated: if event.priority_updated:
headers.append(('priority_exclusive', event.priority_updated.exclusive)) headers.append(('priority_exclusive', str(event.priority_updated.exclusive).encode()))
headers.append(('priority_depends_on', event.priority_updated.depends_on)) headers.append(('priority_depends_on', str(event.priority_updated.depends_on).encode()))
headers.append(('priority_weight', event.priority_updated.weight)) headers.append(('priority_weight', str(event.priority_updated.weight).encode()))
h2_conn.send_headers(event.stream_id, headers) h2_conn.send_headers(event.stream_id, headers)
h2_conn.end_stream(event.stream_id) h2_conn.end_stream(event.stream_id)
wfile.write(h2_conn.data_to_send()) wfile.write(h2_conn.data_to_send())