Matrix-Mirrors/synapse-product
1
0
Fork 0
mirror of https://git.anonymousland.org/anonymousland/synapse-product.git synced 2024-10-01 08:25:44 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #732 from matrix-org/erikj/login

Browse Source 
Simplify _check_password
This commit is contained in:
Erik Johnston 2016-04-18 15:07:57 +01:00
commit 3727a15764
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
synapse/handlers/auth.py
View File

@ -432,11 +432,15 @@ class AuthHandler(BaseHandler):
Returns:
True if the user_id successfully authenticated
"""
defer.returnValue((
(yield self._check_ldap_password(user_id, password))
or
(yield self._check_local_password(user_id, password))
))
valid_ldap = yield self._check_ldap_password(user_id, password)
if valid_ldap:
defer.returnValue(True)
valid_local_password = yield self._check_local_password(user_id, password)
if valid_local_password:
defer.returnValue(True)
defer.returnValue(False)
@defer.inlineCallbacks
def _check_local_password(self, user_id, password):