Merge pull request #5743 from matrix-org/erikj/log_origin_receipts_mismatch

Log when we receive receipt from a different origin

changelog.d/5743.bugfix

@@ -0,0 +1 @@
+Log when we receive an event receipt from an unexpected origin.

synapse/handlers/receipts.py

@@ -17,7 +17,7 @@ import logging
 from twisted.internet import defer
 
 from synapse.handlers._base import BaseHandler
-from synapse.types import ReadReceipt
+from synapse.types import ReadReceipt, get_domain_from_id
 
 logger = logging.getLogger(__name__)
 
@@ -40,7 +40,19 @@ class ReceiptsHandler(BaseHandler):
     def _received_remote_receipt(self, origin, content):
         """Called when we receive an EDU of type m.receipt from a remote HS.
         """
-        receipts = [
+        receipts = []
+        for room_id, room_values in content.items():
+            for receipt_type, users in room_values.items():
+                for user_id, user_values in users.items():
+                    if get_domain_from_id(user_id) != origin:
+                        logger.info(
+                            "Received receipt for user %r from server %s, ignoring",
+                            user_id,
+                            origin,
+                        )
+                        continue
+
+                    receipts.append(
                         ReadReceipt(
                             room_id=room_id,
                             receipt_type=receipt_type,
@@ -48,10 +60,7 @@ class ReceiptsHandler(BaseHandler):
                             event_ids=user_values["event_ids"],
                             data=user_values.get("data", {}),
                         )
-            for room_id, room_values in content.items()
+                    )
-            for receipt_type, users in room_values.items()
-            for user_id, user_values in users.items()
-        ]
 
         yield self._handle_new_receipts(receipts)