Matrix-Mirrors/forked-synapse
1
0
Fork 0
mirror of https://mau.dev/maunium/synapse.git synced 2024-10-01 01:36:05 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix exception when using MSC3030 to look for remote federated events before room creation (#13197)

Browse Source 
Complement tests: https://github.com/matrix-org/complement/pull/405

This happens when you have some messages imported before the room is created.
Then use MSC3030 to look backwards before the room creation from a remote
federated server. The server won't find anything locally, but will ask over
federation which will have the remote event. The previous logic would
choke on not having the local event assigned.

```
Failed to fetch /timestamp_to_event from hs2 because of exception(UnboundLocalError) local variable 'local_event' referenced before assignment args=("local variable 'local_event' referenced before assignment",)
```
This commit is contained in:
Eric Eastwood 2022-07-07 11:52:45 -05:00 committed by GitHub
parent 0c95313a44
commit a962c5a56d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
changelog.d/13197.bugfix Normal file
View File

@ -0,0 +1 @@
Fix exception when using experimental [MSC3030](https://github.com/matrix-org/matrix-spec-proposals/pull/3030) `/timestamp_to_event` endpoint to look for remote federated imported events before room creation.

6
synapse/handlers/room.py
View File

@ -1375,6 +1375,7 @@ class TimestampLookupHandler:
# the timestamp given and the event we were able to find locally # the timestamp given and the event we were able to find locally
is_event_next_to_backward_gap = False is_event_next_to_backward_gap = False
is_event_next_to_forward_gap = False is_event_next_to_forward_gap = False
local_event = None
if local_event_id: if local_event_id:
local_event = await self.store.get_event( local_event = await self.store.get_event(
local_event_id, allow_none=False, allow_rejected=False local_event_id, allow_none=False, allow_rejected=False
@ -1461,7 +1462,10 @@ class TimestampLookupHandler:
ex.args, ex.args,
) )
if not local_event_id: # To appease mypy, we have to add both of these conditions to check for
# `None`. We only expect `local_event` to be `None` when
# `local_event_id` is `None` but mypy isn't as smart and assuming as us.
if not local_event_id or not local_event:
raise SynapseError( raise SynapseError(
404, 404,
"Unable to find event from %s in direction %s" % (timestamp, direction), "Unable to find event from %s in direction %s" % (timestamp, direction),