Matrix-Mirrors/anonymousland-synapse
1
0
Fork 0
mirror of https://git.anonymousland.org/anonymousland/synapse.git synced 2025-12-15 13:06:20 -05:00
Code Issues Projects Releases Packages Wiki Activity

fix bug where preserved threepid user comes to sign up and server is mau blocked

Browse source
This commit is contained in:
Neil Johnson 2018-08-31 10:49:14 +01:00
parent 14e4d4f4bf
commit ea068d6f3c
5 changed files with 38 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
synapse/rest/client/v1_only/register.py
View file

@ -281,11 +281,15 @@ class RegisterRestServlet(ClientV1RestServlet):
register_json["user"].encode("utf-8")
if "user" in register_json else None
)
threepid = None
if session[LoginType.EMAIL_IDENTITY]:
threepid = session["threepidCreds"]
handler = self.handlers.registration_handler
(user_id, token) = yield handler.register(
localpart=desired_user_id,
password=password
password=password,
threepid=threepid,
)
if session[LoginType.EMAIL_IDENTITY]:

5
synapse/rest/client/v2_alpha/register.py
View file

@ -395,11 +395,16 @@ class RegisterRestServlet(RestServlet):
if desired_username is not None:
desired_username = desired_username.lower()
threepid = None
if auth_result:
threepid = auth_result.get(LoginType.EMAIL_IDENTITY)
(registered_user_id, _) = yield self.registration_handler.register(
localpart=desired_username,
password=new_password,
guest_access_token=guest_access_token,
generate_token=False,
threepid=threepid,
)
# remember that we've now registered that user account, and with