Make sure prev_ids defaults to empty list (#12829)

Signed-off-by: Carl Bordum Hansen <carl@bordum.dk>
matrix-org · May 25, 2022 · 774ac49 · 774ac49
1 parent 2989115
commit 774ac49
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 0 deletions.
diff --git a/changelog.d/12829.bugfix b/changelog.d/12829.bugfix
@@ -0,0 +1 @@
+Fix a bug where we did not correctly handle invalid device list updates over federation. Contributed by Carl Bordum Hansen.
diff --git a/synapse/handlers/device.py b/synapse/handlers/device.py
@@ -763,6 +763,10 @@ async def incoming_device_list_update(
         device_id = edu_content.pop("device_id")
         stream_id = str(edu_content.pop("stream_id"))  # They may come as ints
         prev_ids = edu_content.pop("prev_id", [])
+        if not isinstance(prev_ids, list):
+            raise SynapseError(
+                400, "Device list update had an invalid 'prev_ids' field"
+            )
         prev_ids = [str(p) for p in prev_ids]  # They may come as ints
 
         if get_domain_from_id(user_id) != origin:
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		Fix a bug where we did not correctly handle invalid device list updates over federation. Contributed by Carl Bordum Hansen.