From ea2e6f3849e3dc53464067bdd9bdf69c28d1ec82 Mon Sep 17 00:00:00 2001 From: "H. Shay" Date: Mon, 28 Nov 2022 11:20:29 -0800 Subject: [PATCH 1/2] fix a possible variable shadow --- synapse/handlers/message.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/synapse/handlers/message.py b/synapse/handlers/message.py index 4cf593cfdcbc..50b87a7bf5c6 100644 --- a/synapse/handlers/message.py +++ b/synapse/handlers/message.py @@ -1135,11 +1135,11 @@ async def create_new_client_event( ) state_events = await self.store.get_events_as_list(state_event_ids) # Create a StateMap[str] - state_map = {(e.type, e.state_key): e.event_id for e in state_events} + current_state_ids = {(e.type, e.state_key): e.event_id for e in state_events} # Actually strip down and only use the necessary auth events auth_event_ids = self._event_auth_handler.compute_auth_events( event=temp_event, - current_state_ids=state_map, + current_state_ids=current_state_ids, for_verification=False, ) From c8e3903dab61318ce2b630c3ca2e7282ecfc98e5 Mon Sep 17 00:00:00 2001 From: "H. Shay" Date: Mon, 28 Nov 2022 11:36:58 -0800 Subject: [PATCH 2/2] newsfragment + lints --- changelog.d/14575.misc | 1 + synapse/handlers/message.py | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) create mode 100644 changelog.d/14575.misc diff --git a/changelog.d/14575.misc b/changelog.d/14575.misc new file mode 100644 index 000000000000..f6fa54eaa2c5 --- /dev/null +++ b/changelog.d/14575.misc @@ -0,0 +1 @@ +Fix a possible variable shadow in `create_new_client_event`. \ No newline at end of file diff --git a/synapse/handlers/message.py b/synapse/handlers/message.py index 50b87a7bf5c6..5cbe89f4fddf 100644 --- a/synapse/handlers/message.py +++ b/synapse/handlers/message.py @@ -1135,7 +1135,9 @@ async def create_new_client_event( ) state_events = await self.store.get_events_as_list(state_event_ids) # Create a StateMap[str] - current_state_ids = {(e.type, e.state_key): e.event_id for e in state_events} + current_state_ids = { + (e.type, e.state_key): e.event_id for e in state_events + } # Actually strip down and only use the necessary auth events auth_event_ids = self._event_auth_handler.compute_auth_events( event=temp_event,