diff options
| author | Richard van der Hoff <richard@matrix.org> | 2019-07-26 10:09:36 +0100 |
|---|---|---|
| committer | Richard van der Hoff <richard@matrix.org> | 2019-07-26 10:09:36 +0100 |
| commit | a0ee2ec458873fc7aa253da88bcd79249199e7e3 (patch) | |
| tree | ab14b2863bf83a4650dc588dd1cb160ee2af3420 /synapse/federation | |
| parent | Log when we receive receipt from a different origin (diff) | |
| parent | Log when we receive a /make_* request from a different origin (diff) | |
| download | synapse-a0ee2ec458873fc7aa253da88bcd79249199e7e3.tar.xz | |
Merge branch 'erikj/log_leave_origin_mismatch' into release-v1.2.1
Diffstat (limited to 'synapse/federation')
| -rw-r--r-- | synapse/federation/federation_server.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/synapse/federation/federation_server.py b/synapse/federation/federation_server.py index 8c0a18b120..ed2b6d5eef 100644 --- a/synapse/federation/federation_server.py +++ b/synapse/federation/federation_server.py @@ -369,7 +369,7 @@ class FederationServer(FederationBase): logger.warn("Room version %s not in %s", room_version, supported_versions) raise IncompatibleRoomVersionError(room_version=room_version) - pdu = yield self.handler.on_make_join_request(room_id, user_id) + pdu = yield self.handler.on_make_join_request(origin, room_id, user_id) time_now = self._clock.time_msec() defer.returnValue( {"event": pdu.get_pdu_json(time_now), "room_version": room_version} @@ -423,7 +423,7 @@ class FederationServer(FederationBase): def on_make_leave_request(self, origin, room_id, user_id): origin_host, _ = parse_server_name(origin) yield self.check_server_matches_acl(origin_host, room_id) - pdu = yield self.handler.on_make_leave_request(room_id, user_id) + pdu = yield self.handler.on_make_leave_request(origin, room_id, user_id) room_version = yield self.store.get_room_version(room_id) |