kaslo/synapse
1
0
Fork 0
Code Wiki Activity

Merge pull request #5574 from matrix-org/babolivier/fix-3pid-bind

Browse Source 
Fix new 3PID bindings being associated with rewritten IS's server names instead of the original one
This commit is contained in:
Brendan Abolivier
2019-06-27 15:17:15 +01:00
committed by GitHub
parent fbc5b58d21 1ef3627b05
commit f370fd01ec
1 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
synapse/handlers/identity.py
View File

@@ -129,14 +129,19 @@ class IdentityHandler(BaseHandler):
client_secret = creds['clientSecret']
else:
raise SynapseError(400, "No client_secret in creds")
# if we have a rewrite rule set for the identity server,
# apply it now.
# apply it now, but only for sending the request (not
# storing in the database).
if id_server in self.rewrite_identity_server_urls:
id_server = self.rewrite_identity_server_urls[id_server]
id_server_host = self.rewrite_identity_server_urls[id_server]
else:
id_server_host = id_server
try:
data = yield self.http_client.post_urlencoded_get_json(
"https://%s%s" % (
id_server, "/_matrix/identity/api/v1/3pid/bind"
id_server_host, "/_matrix/identity/api/v1/3pid/bind"
),
{
'sid': creds['sid'],