maxmustermann/synapse
1
0
Fork 0
Code Issues Pull requests 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
parent aaabbd3e9e 6fd2f685fe
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: Returns:
True if the user_id successfully authenticated True if the user_id successfully authenticated
""" """
defer.returnValue(( valid_ldap = yield self._check_ldap_password(user_id, password)
(yield self._check_ldap_password(user_id, password)) if valid_ldap:
or defer.returnValue(True)
(yield self._check_local_password(user_id, password))
)) valid_local_password = yield self._check_local_password(user_id, password)
if valid_local_password:
defer.returnValue(True)
defer.returnValue(False)
@defer.inlineCallbacks @defer.inlineCallbacks
def _check_local_password(self, user_id, password): def _check_local_password(self, user_id, password):