Grasscutters/mitmproxy
3
0
Fork 0
mirror of https://github.com/Grasscutters/mitmproxy.git synced 2024-11-22 15:37:45 +00:00
Code Issues Projects Releases Wiki Activity

await server_connected hook before doing something with the connection, fixes #5108 (#5110)

Browse Source 
* await server_connected hook before doing something with the connection

* refine changelog wording

Co-authored-by: Maximilian Hils <github@maximilianhils.com>
This commit is contained in:
Alexander Prinzhorn 2022-02-04 14:49:57 +01:00 committed by GitHub
parent 59033371e8
commit 437e55c2c2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 3 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGELOG.md
View File

@ -24,6 +24,8 @@
* Fix random connection stalls (#5040, @EndUser509) * Fix random connection stalls (#5040, @EndUser509)
* Add `n` new flow keybind to mitmweb (#5061, @ianklatzco) * Add `n` new flow keybind to mitmweb (#5061, @ianklatzco)
* Fix compatibility with BoringSSL (@pmoulton) * Fix compatibility with BoringSSL (@pmoulton)
* Change connection event hooks to be blocking.
Processing will only resume once the event hook has finished. (@Prinzhorn)
## 28 September 2021: mitmproxy 7.0.4 ## 28 September 2021: mitmproxy 7.0.4

10
mitmproxy/proxy/server.py
View File

@ -176,14 +176,7 @@ class ConnectionHandler(metaclass=abc.ABCMeta):
else: else:
addr = human.format_address(command.connection.address) addr = human.format_address(command.connection.address)
self.log(f"server connect {addr}") self.log(f"server connect {addr}")
connected_hook = asyncio_utils.create_task( await self.handle_hook(server_hooks.ServerConnectedHook(hook_data))
self.handle_hook(server_hooks.ServerConnectedHook(hook_data)),
name=f"handle_hook(server_connected) {addr}",
client=self.client.peername,
)
if not connected_hook:
return # this should not be needed, see asyncio_utils.create_task
self.server_event(events.OpenConnectionCompleted(command, None)) self.server_event(events.OpenConnectionCompleted(command, None))
# during connection opening, this function is the designated handler that can be cancelled. # during connection opening, this function is the designated handler that can be cancelled.
@ -201,7 +194,6 @@ class ConnectionHandler(metaclass=abc.ABCMeta):
self.log(f"server disconnect {addr}") self.log(f"server disconnect {addr}")
command.connection.timestamp_end = time.time() command.connection.timestamp_end = time.time()
await connected_hook # wait here for this so that closed always comes after connected.
await self.handle_hook(server_hooks.ServerDisconnectedHook(hook_data)) await self.handle_hook(server_hooks.ServerDisconnectedHook(hook_data))
async def handle_connection(self, connection: Connection) -> None: async def handle_connection(self, connection: Connection) -> None:

3
mitmproxy/proxy/server_hooks.py
View File

@ -20,7 +20,6 @@ class ClientDisconnectedHook(commands.StartHook):
""" """
A client connection has been closed (either by us or the client). A client connection has been closed (either by us or the client).
""" """
blocking = False
client: connection.Client client: connection.Client
@ -50,7 +49,6 @@ class ServerConnectedHook(commands.StartHook):
""" """
Mitmproxy has connected to a server. Mitmproxy has connected to a server.
""" """
blocking = False
data: ServerConnectionHookData data: ServerConnectionHookData
@ -59,5 +57,4 @@ class ServerDisconnectedHook(commands.StartHook):
""" """
A server connection has been closed (either by us or the server). A server connection has been closed (either by us or the server).
""" """
blocking = False
data: ServerConnectionHookData data: ServerConnectionHookData