paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-11-07 15:33:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

tornado: Fix race condition on handler._request.

Browse Source 
Commit 6fd1a558b7 (#21469) introduced an
await point where get_events_backend calls fetch_events in order to
switch threads.  This opened the possibility that, in the window
between the connect_handler call in fetch_events and the old location
of this assignment in get_events_backend, an event could arrive,
causing ClientDescriptor.add_event to crash on missing
handler._request.  Fix this by assigning handler._request earlier.

Signed-off-by: Anders Kaseorg <anders@zulip.com>
(cherry picked from commit e112b619cc)
This commit is contained in:
Anders Kaseorg
2022-06-08 16:00:56 -07:00
committed by Tim Abbott
parent c9e00e6391
commit 82155e15a5
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
zerver/tornado/views.py
View File

@@ -125,6 +125,7 @@ def get_events_backend(
assert tornado_handler is not None assert tornado_handler is not None
handler = tornado_handler() handler = tornado_handler()
assert handler is not None assert handler is not None
handler._request = request
if user_client is None: if user_client is None:
valid_user_client = RequestNotes.get_notes(request).client valid_user_client = RequestNotes.get_notes(request).client
@@ -173,7 +174,6 @@ def get_events_backend(
# Mark this response with .asynchronous; this will result in # Mark this response with .asynchronous; this will result in
# Tornado discarding the response and instead long-polling the # Tornado discarding the response and instead long-polling the
# request. See zulip_finish for more design details. # request. See zulip_finish for more design details.
handler._request = request
response = json_success(request) response = json_success(request)
response.asynchronous = True response.asynchronous = True
return response return response