From 5e8e88bd7914dfd84baaf94b886be89ed2ac9eb3 Mon Sep 17 00:00:00 2001 From: Carl Bordum Hansen Date: Sat, 21 May 2022 17:18:23 +0200 Subject: [PATCH] Raise error if `prev_ids` is not a list Signed-off-by: Carl Bordum Hansen --- changelog.d/12829.bugfix | 2 ++ synapse/handlers/device.py | 2 ++ 2 files changed, 4 insertions(+) create mode 100644 changelog.d/12829.bugfix diff --git a/changelog.d/12829.bugfix b/changelog.d/12829.bugfix new file mode 100644 index 000000000000..fc96de075295 --- /dev/null +++ b/changelog.d/12829.bugfix @@ -0,0 +1,2 @@ +Fixed a bug where device list updates over federation would fail if they +were not a list. Contributed by Carl Bordum Hansen. diff --git a/synapse/handlers/device.py b/synapse/handlers/device.py index 1d6d1f8a9248..fa7b8182a220 100644 --- a/synapse/handlers/device.py +++ b/synapse/handlers/device.py @@ -763,6 +763,8 @@ 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: