MirrorHub/synapse
0
0
Fork 1
mirror of https://mau.dev/maunium/synapse.git synced 2024-11-16 23:11:34 +01:00
Code Issues Projects Releases Wiki Activity

Add changelog

Browse source
This commit is contained in:
Andrew Morgan 2019-09-10 17:43:57 +01:00
parent 60d3c57bd0
commit b5833a2abf
3 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
changelog.d/6011.feature Normal file
View file

@ -0,0 +1 @@
Use account_threepid_delegate.email and account_threepid_delegate.msisdn for validating threepid sessions.

6
synapse/handlers/identity.py
View file

@ -84,8 +84,8 @@ class IdentityHandler(BaseHandler):
id_server (str|None): The identity server to validate 3PIDs against. If None, id_server (str|None): The identity server to validate 3PIDs against. If None,
we will attempt to extract id_server creds we will attempt to extract id_server creds
creds (dict[str, str]): Dictionary containing the following key: creds (dict[str, str]): Dictionary containing the following keys:
* id_server: An optional domain name of an identity server * id_server|idServer: An optional domain name of an identity server
* client_secret|clientSecret: A unique secret str provided by the client * client_secret|clientSecret: A unique secret str provided by the client
* sid: The ID of the validation session * sid: The ID of the validation session
@ -106,7 +106,7 @@ class IdentityHandler(BaseHandler):
) )
if not id_server: if not id_server:
# Attempt to get the id_server from the creds dict # Attempt to get the id_server from the creds dict
id_server = creds.get("id_server") id_server = creds.get("id_server") or creds.get("idServer")
if not id_server: if not id_server:
raise SynapseError( raise SynapseError(
400, "Missing param id_server in creds", errcode=Codes.MISSING_PARAM 400, "Missing param id_server in creds", errcode=Codes.MISSING_PARAM

2
synapse/rest/client/v2_alpha/account.py
View file

@ -523,7 +523,7 @@ class ThreepidRestServlet(RestServlet):
requester = yield self.auth.get_user_by_req(request) requester = yield self.auth.get_user_by_req(request)
user_id = requester.user.to_string() user_id = requester.user.to_string()
# Retrieve the identity server from the request # Specify None as the identity server to retrieve it from the request body instead
threepid = yield self.identity_handler.threepid_from_creds(None, threepid_creds) threepid = yield self.identity_handler.threepid_from_creds(None, threepid_creds)
if not threepid: if not threepid: