Skip to content
This repository has been archived by the owner on Dec 13, 2023. It is now read-only.

[DINSIC] Use internal-info for identity server #4681

Merged
merged 4 commits into from Feb 28, 2019
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions synapse/rest/client/v2_alpha/account.py
Expand Up @@ -55,7 +55,7 @@ def on_POST(self, request):
if not (yield check_3pid_allowed(self.hs, "email", body['email'])):
raise SynapseError(
403,
"Your email domain is not authorized on this server",
"Your email is not authorized on this server",
Codes.THREEPID_DENIED,
)

Expand Down Expand Up @@ -271,7 +271,7 @@ def on_POST(self, request):
if not (yield check_3pid_allowed(self.hs, "email", body['email'])):
raise SynapseError(
403,
"Your email domain is not authorized on this server",
"Your email is not authorized on this server",
Codes.THREEPID_DENIED,
)

Expand Down
2 changes: 1 addition & 1 deletion synapse/rest/client/v2_alpha/register.py
Expand Up @@ -78,7 +78,7 @@ def on_POST(self, request):
if not (yield check_3pid_allowed(self.hs, "email", body['email'])):
raise SynapseError(
403,
"Your email domain is not authorized to register on this server",
"Your email is not authorized to register on this server",
Codes.THREEPID_DENIED,
)

Expand Down
12 changes: 10 additions & 2 deletions synapse/util/threepids.py
Expand Up @@ -23,7 +23,7 @@

@defer.inlineCallbacks
def check_3pid_allowed(hs, medium, address):
"""Checks whether a given format of 3PID is allowed to be used on this HS
"""Checks whether a given 3PID is allowed to be used on this HS

Args:
hs (synapse.server.HomeServer): server
Expand All @@ -38,10 +38,18 @@ def check_3pid_allowed(hs, medium, address):
data = yield hs.get_simple_http_client().get_json(
"https://%s%s" % (
hs.config.check_is_for_allowed_local_3pids,
"/_matrix/identity/api/v1/info"
"/_matrix/identity/api/v1/internal-info"
),
{'medium': medium, 'address': address}
)

# Assume false if invalid response
if 'hs' not in data:
defer.returnValue(False)

if data.get('requires_invite', False) and data.get('invited', False) == False:
anoadragon453 marked this conversation as resolved.
Show resolved Hide resolved
# Requires an invite but hasn't been invited
defer.returnValue(False)
if hs.config.allow_invited_3pids and data.get('invited'):
defer.returnValue(True)
else:
Expand Down