Fix logging errors when receiving invalid User ID for key querys (ele…

…ment-hq#17250)
Mic92 · Jun 14, 2024 · 8020f13 · 8020f13
1 parent 23f4e16
commit 8020f13
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 0 deletions.
diff --git a/changelog.d/17250.misc b/changelog.d/17250.misc
@@ -0,0 +1 @@
+Stop logging errors when receiving invalid User IDs in key querys requests.
diff --git a/synapse/handlers/e2e_keys.py b/synapse/handlers/e2e_keys.py
@@ -149,6 +149,11 @@ async def query_devices(
             remote_queries = {}
 
             for user_id, device_ids in device_keys_query.items():
+                if not UserID.is_valid(user_id):
+                    # Ignore invalid user IDs, which is the same behaviour as if
+                    # the user existed but had no keys.
+                    continue
+
                 # we use UserID.from_string to catch invalid user ids
                 if self.is_mine(UserID.from_string(user_id)):
                     local_query[user_id] = device_ids