diff options
| author | Erik Johnston <erik@matrix.org> | 2019-04-26 18:14:23 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2019-04-26 18:14:23 +0100 |
| commit | d6118c5be61aed49f1aa3fac53a25a670bbbd245 (patch) | |
| tree | 269071e6c6a87cc70a177f48f9546e97a5b0f1e2 /synapse/handlers/room_member.py | |
| parent | Newsfile (diff) | |
| parent | Merge pull request #5103 from matrix-org/rav/fix_notif_loop (diff) | |
| download | synapse-d6118c5be61aed49f1aa3fac53a25a670bbbd245.tar.xz | |
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/ratelimit_3pid_invite
Diffstat (limited to 'synapse/handlers/room_member.py')
| -rw-r--r-- | synapse/handlers/room_member.py | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/synapse/handlers/room_member.py b/synapse/handlers/room_member.py index 53e0103b5b..ad3df7cc7d 100644 --- a/synapse/handlers/room_member.py +++ b/synapse/handlers/room_member.py @@ -72,6 +72,7 @@ class RoomMemberHandler(object): self.clock = hs.get_clock() self.spam_checker = hs.get_spam_checker() self._server_notices_mxid = self.config.server_notices_mxid + self._enable_lookup = hs.config.enable_3pid_lookup # This is only used to get at ratelimit function, and # maybe_kick_guest_users. It's fine there are multiple of these as @@ -748,6 +749,10 @@ class RoomMemberHandler(object): Returns: str: the matrix ID of the 3pid, or None if it is not recognized. """ + if not self._enable_lookup: + raise SynapseError( + 403, "Looking up third-party identifiers is denied from this server", + ) try: data = yield self.simple_http_client.get_json( "%s%s/_matrix/identity/api/v1/lookup" % (id_server_scheme, id_server,), |