Matrix/matrix-synapse-rest-password-provider
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "async/await check_password"

Browse Source 
This reverts commit 8e4718ae
This commit is contained in:
Anatoliy Sablin 2020-08-02 16:09:25 +03:00
parent 092d8f664a
commit c782c84aea
1 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
rest_auth_provider.py
View File

@ -43,7 +43,8 @@ class RestAuthProvider(object):
logger.info('Endpoint: %s', self.endpoint)
logger.info('Enforce lowercase username during registration: %s', self.regLower)
async def check_password(self, user_id, password):
@defer.inlineCallbacks
def check_password(self, user_id, password):
logger.info("Got password check for " + user_id)
data = {'user': {'id': user_id, 'password': password}}
r = requests.post(self.endpoint + '/_matrix-internal/identity/v1/check_credentials', json=data)
@ -63,14 +64,14 @@ class RestAuthProvider(object):
logger.info("User %s authenticated", user_id)
registration = False
if not (await self.account_handler.check_user_exists(user_id)):
if not (yield self.account_handler.check_user_exists(user_id)):
logger.info("User %s does not exist yet, creating...", user_id)
if localpart != localpart.lower() and self.regLower:
logger.info('User %s was cannot be created due to username lowercase policy', localpart)
defer.returnValue(False)
user_id, access_token = (await self.account_handler.register(localpart=localpart))
user_id, access_token = (yield self.account_handler.register(localpart=localpart))
registration = True
logger.info("Registration based on REST data was successful for %s", user_id)
else:
@ -82,14 +83,14 @@ class RestAuthProvider(object):
# fixme: temporary fix
try:
store = await self.account_handler._hs.get_profile_handler().store # for synapse >= 1.9.0
store = yield self.account_handler._hs.get_profile_handler().store # for synapse >= 1.9.0
except AttributeError:
store = await self.account_handler.hs.get_profile_handler().store # for synapse < 1.9.0
store = yield self.account_handler.hs.get_profile_handler().store # for synapse < 1.9.0
if "display_name" in profile and ((registration and self.config.setNameOnRegister) or (self.config.setNameOnLogin)):
display_name = profile["display_name"]
logger.info("Setting display name to '%s' based on profile data", display_name)
await store.set_profile_displayname(localpart, display_name)
yield store.set_profile_displayname(localpart, display_name)
else:
logger.info("Display name was not set because it was not given or policy restricted it")
@ -105,9 +106,9 @@ class RestAuthProvider(object):
logger.info("Looking for 3PID %s:%s in user profile", medium, address)
validated_at = time_msec()
if not (await store.get_user_id_by_threepid(medium, address)):
if not (yield store.get_user_id_by_threepid(medium, address)):
logger.info("3PID is not present, adding")
await store.user_add_threepid(
yield store.user_add_threepid(
user_id,
medium,
address,
@ -118,12 +119,12 @@ class RestAuthProvider(object):
logger.info("3PID is present, skipping")
if (self.config.replaceThreepid):
for threepid in (await store.user_get_threepids(user_id)):
for threepid in (yield store.user_get_threepids(user_id)):
medium = threepid["medium"].lower()
address = threepid["address"].lower()
if {"medium": medium, "address": address} not in external_3pids:
logger.info("3PID is not present in external datastore, deleting")
await store.user_delete_threepid(
yield store.user_delete_threepid(
user_id,
medium,
address