Grasscutters/mitmproxy
3
0
Fork 0
mirror of https://github.com/Grasscutters/mitmproxy.git synced 2024-11-25 18:03:50 +00:00
Code Issues Projects Releases Wiki Activity

fix #3780

Browse Source
This commit is contained in:
Thomas Kriechbaumer 2020-02-08 16:55:49 +00:00
parent 7b638f1b6b
commit ae6fe83adb
2 changed files with 26 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -87,6 +87,18 @@ class Http2Layer(base.Layer):
# mypy type hints # mypy type hints
client_conn: connections.ClientConnection = None client_conn: connections.ClientConnection = None
class H2ConnLogger:
def __init__(self, name, log):
self.name = name
self.log = log
def debug(self, fmtstr, *args):
msg = "H2Conn {}: {}".format(self.name, fmtstr % args)
self.log(msg, "debug")
def trace(self, fmtstr, *args):
pass
def __init__(self, ctx, mode: str) -> None: def __init__(self, ctx, mode: str) -> None:
super().__init__(ctx) super().__init__(ctx)
self.mode = mode self.mode = mode
@ -98,7 +110,8 @@ class Http2Layer(base.Layer):
client_side=False, client_side=False,
header_encoding=False, header_encoding=False,
validate_outbound_headers=False, validate_outbound_headers=False,
validate_inbound_headers=False) validate_inbound_headers=False,
logger=self.H2ConnLogger("client", self.log))
self.connections[self.client_conn] = SafeH2Connection(self.client_conn, config=config) self.connections[self.client_conn] = SafeH2Connection(self.client_conn, config=config)
def _initiate_server_conn(self): def _initiate_server_conn(self):
@ -107,7 +120,8 @@ class Http2Layer(base.Layer):
client_side=True, client_side=True,
header_encoding=False, header_encoding=False,
validate_outbound_headers=False, validate_outbound_headers=False,
validate_inbound_headers=False) validate_inbound_headers=False,
logger=self.H2ConnLogger("server", self.log))
self.connections[self.server_conn] = SafeH2Connection(self.server_conn, config=config) self.connections[self.server_conn] = SafeH2Connection(self.server_conn, config=config)
self.connections[self.server_conn].initiate_connection() self.connections[self.server_conn].initiate_connection()
self.server_conn.send(self.connections[self.server_conn].data_to_send()) self.server_conn.send(self.connections[self.server_conn].data_to_send())
@ -195,10 +209,12 @@ 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)
self.connections[source_conn].safe_acknowledge_received_data(
event.flow_controlled_length, # always acknowledge receved data with a WINDOW_UPDATE frame
event.stream_id self.connections[source_conn].safe_acknowledge_received_data(
) event.flow_controlled_length,
event.stream_id
)
return True return True
def _handle_stream_ended(self, eid): def _handle_stream_ended(self, eid):
@ -461,7 +477,7 @@ class Http2SingleStreamLayer(httpbase._HttpTransmissionLayer, basethread.BaseThr
if self.zombie is not None or connection_closed: if self.zombie is not None or connection_closed:
if pre_command is not None: if pre_command is not None:
pre_command() pre_command()
raise exceptions.Http2ZombieException("Connection already dead") raise exceptions.Http2ZombieException("Connection or stream already dead: {}, {}".format(self.zombie, connection_closed))
@detect_zombie_stream @detect_zombie_stream
def read_request_headers(self, flow): def read_request_headers(self, flow):
@ -643,7 +659,8 @@ class Http2SingleStreamLayer(httpbase._HttpTransmissionLayer, basethread.BaseThr
try: try:
layer() layer()
except exceptions.Http2ZombieException: # pragma: no cover except exceptions.Http2ZombieException: # pragma: no cover
pass # zombies can be safely terminated - no need to kill them twice
return
except exceptions.ProtocolException as e: # pragma: no cover except exceptions.ProtocolException as e: # pragma: no cover
self.log(repr(e), "info") self.log(repr(e), "info")
except exceptions.SetServerNotAllowedException as e: # pragma: no cover except exceptions.SetServerNotAllowedException as e: # pragma: no cover

2
setup.py
View File

@ -68,7 +68,7 @@ setup(
"click>=7.0,<8", "click>=7.0,<8",
"cryptography>=2.1.4,<2.5", "cryptography>=2.1.4,<2.5",
"flask>=1.1.1,<1.2", "flask>=1.1.1,<1.2",
"h2>=3.0.1,<4", "h2>=3.2.0,<4",
"hyperframe>=5.1.0,<6", "hyperframe>=5.1.0,<6",
"kaitaistruct>=0.7,<0.9", "kaitaistruct>=0.7,<0.9",
"ldap3>=2.6.1,<2.7", "ldap3>=2.6.1,<2.7",