mirrors/synapse
1
0
Fork 0
mirror of https://github.com/matrix-org/synapse.git synced 2025-11-04 02:01:03 +01:00
Code Issues Projects Releases Wiki Activity

Fix user-interactive password auth

Browse Source 
this got broken in the previous commit
This commit is contained in:
Richard van der Hoff 2017-11-01 17:03:20 +00:00
parent 4c8f94ac94
commit 979eed4362
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
synapse/handlers/auth.py
View File

@ -270,6 +270,7 @@ class AuthHandler(BaseHandler):
sess = self._get_session_info(session_id) sess = self._get_session_info(session_id)
return sess.setdefault('serverdict', {}).get(key, default) return sess.setdefault('serverdict', {}).get(key, default)
@defer.inlineCallbacks
def _check_password_auth(self, authdict, _): def _check_password_auth(self, authdict, _):
if "user" not in authdict or "password" not in authdict: if "user" not in authdict or "password" not in authdict:
raise LoginError(400, "", Codes.MISSING_PARAM) raise LoginError(400, "", Codes.MISSING_PARAM)
@ -277,10 +278,11 @@ class AuthHandler(BaseHandler):
user_id = authdict["user"] user_id = authdict["user"]
password = authdict["password"] password = authdict["password"]
return self.validate_login(user_id, { (canonical_id, callback) = yield self.validate_login(user_id, {
"type": LoginType.PASSWORD, "type": LoginType.PASSWORD,
"password": password, "password": password,
}) })
defer.returnValue(canonical_id)
@defer.inlineCallbacks @defer.inlineCallbacks
def _check_recaptcha(self, authdict, clientip): def _check_recaptcha(self, authdict, clientip):