Mirrors
/
synapse-old
mirror of https://github.com/matrix-org/synapse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix exception handling

This commit is contained in:
Christoph Witzany 2016-04-06 17:44:03 +02:00
parent afff321e9a
commit 67f3a50e9a
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
synapse/handlers/auth.py
View File

@ -437,7 +437,7 @@ class AuthHandler(BaseHandler):
try: try:
user_id, password_hash = yield self._find_user_id_and_pwd_hash(user_id) user_id, password_hash = yield self._find_user_id_and_pwd_hash(user_id)
defer.returnValue(not self.validate_hash(password, password_hash)) defer.returnValue(not self.validate_hash(password, password_hash))
except: except LoginError:
defer.returnValue(False) defer.returnValue(False)
@defer.inlineCallbacks @defer.inlineCallbacks
@ -473,7 +473,7 @@ class AuthHandler(BaseHandler):
defer.returnValue(True) defer.returnValue(True)
except ldap.LDAPError, e: except ldap.LDAPError, e:
logger.info("LDAP error: %s" % e) logger.warn("LDAP error: %s", e)
defer.returnValue(False) defer.returnValue(False)
@defer.inlineCallbacks @defer.inlineCallbacks