diff options
| author | Erik Johnston <erik@matrix.org> | 2019-09-25 17:16:28 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2019-09-25 17:16:28 +0100 |
| commit | d2bd0bc6b188cca8c85ec34c79a70596ec0e46b1 (patch) | |
| tree | 15032c3b14c0c9e3e52db8cd5fa4a04d985f034e /synapse/handlers/room_member.py | |
| parent | Use if `is not None` (diff) | |
| parent | Threepid validity checks on msisdns should not be dependent on 'threepid_beha... (diff) | |
| download | synapse-d2bd0bc6b188cca8c85ec34c79a70596ec0e46b1.tar.xz | |
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/cleanup_user_ips
Diffstat (limited to 'synapse/handlers/room_member.py')
| -rw-r--r-- | synapse/handlers/room_member.py | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/synapse/handlers/room_member.py b/synapse/handlers/room_member.py index 39df0f128d..94cd0cf3ef 100644 --- a/synapse/handlers/room_member.py +++ b/synapse/handlers/room_member.py @@ -31,6 +31,7 @@ from synapse import types from synapse.api.constants import EventTypes, Membership from synapse.api.errors import AuthError, Codes, HttpResponseException, SynapseError from synapse.handlers.identity import LookupAlgorithm, create_id_access_token_header +from synapse.http.client import SimpleHttpClient from synapse.types import RoomID, UserID from synapse.util.async_helpers import Linearizer from synapse.util.distributor import user_joined_room, user_left_room @@ -62,7 +63,11 @@ class RoomMemberHandler(object): self.auth = hs.get_auth() self.state_handler = hs.get_state_handler() self.config = hs.config - self.simple_http_client = hs.get_simple_http_client() + # We create a blacklisting instance of SimpleHttpClient for contacting identity + # servers specified by clients + self.simple_http_client = SimpleHttpClient( + hs, ip_blacklist=hs.config.federation_ip_range_blacklist + ) self.federation_handler = hs.get_handlers().federation_handler self.directory_handler = hs.get_handlers().directory_handler |