Skip to content
Snippets Groups Projects
Unverified Commit d7198dfb authored by Erik Johnston's avatar Erik Johnston Committed by GitHub
Browse files

Ignore attempts to send to-device messages to bad users (#17240)

Currently sending a to-device message to a user ID with a dodgy
destination is accepted, but then ends up spamming the logs when we try
and send to the destination.

An alternative would be to reject the request, but I'm slightly nervous
that could break things.
parent 94ef2f4f
No related branches found
No related tags found
No related merge requests found
Ignore attempts to send to-device messages to bad users, to avoid log spam when we try to connect to the bad server.
...@@ -236,6 +236,13 @@ class DeviceMessageHandler: ...@@ -236,6 +236,13 @@ class DeviceMessageHandler:
local_messages = {} local_messages = {}
remote_messages: Dict[str, Dict[str, Dict[str, JsonDict]]] = {} remote_messages: Dict[str, Dict[str, Dict[str, JsonDict]]] = {}
for user_id, by_device in messages.items(): for user_id, by_device in messages.items():
if not UserID.is_valid(user_id):
logger.warning(
"Ignoring attempt to send device message to invalid user: %r",
user_id,
)
continue
# add an opentracing log entry for each message # add an opentracing log entry for each message
for device_id, message_content in by_device.items(): for device_id, message_content in by_device.items():
log_kv( log_kv(
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment