Skip to content
This repository has been archived by the owner on Apr 26, 2024. It is now read-only.

Stop synapse from saving messages in device_inbox for hidden devices. #10097

Merged
merged 9 commits into from
Nov 1, 2021
1 change: 1 addition & 0 deletions changelog.d/10097.bugfix
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Fix a long-standing bug which allowed hidden devices to receive to-device messages, resulting in unnecessary database bloat.
8 changes: 6 additions & 2 deletions synapse/storage/databases/main/deviceinbox.py
Original file line number Diff line number Diff line change
Expand Up @@ -485,10 +485,12 @@ def _add_messages_to_local_device_inbox_txn(
devices = list(messages_by_device.keys())
if len(devices) == 1 and devices[0] == "*":
# Handle wildcard device_ids.
# We exclude hidden devices (such as cross-signing keys) here as they are
# not expected to receive to-device messages.
devices = self.db_pool.simple_select_onecol_txn(
txn,
table="devices",
keyvalues={"user_id": user_id},
keyvalues={"user_id": user_id, "hidden": False},
anoadragon453 marked this conversation as resolved.
Show resolved Hide resolved
retcol="device_id",
)

Expand All @@ -501,10 +503,12 @@ def _add_messages_to_local_device_inbox_txn(
if not devices:
continue

# We exclude hidden devices (such as cross-signing keys) here as they are
# not expected to receive to-device messages.
rows = self.db_pool.simple_select_many_txn(
txn,
table="devices",
keyvalues={"user_id": user_id},
keyvalues={"user_id": user_id, "hidden": False},
anoadragon453 marked this conversation as resolved.
Show resolved Hide resolved
column="device_id",
iterable=devices,
retcols=("device_id",),
Expand Down