diff options
| author | Neil Johnson <neil@matrix.org> | 2018-08-15 16:19:41 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-08-15 16:19:41 +0000 |
| commit | 81d727efa9f838e895c10ad2acc9c50ff5abb631 (patch) | |
| tree | 6d56bf609ddcf80cd37e475c32aa98a4b1fc81f5 /synapse/handlers | |
| parent | Remove incorrectly re-added changelog files (diff) | |
| parent | Fix mau blocking calulation bug on login (diff) | |
| download | synapse-81d727efa9f838e895c10ad2acc9c50ff5abb631.tar.xz | |
Merge pull request #3689 from matrix-org/neilj/fix_off_by_1+maus
Fix Mau off by one errors
Diffstat (limited to 'synapse/handlers')
| -rw-r--r-- | synapse/handlers/auth.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/synapse/handlers/auth.py b/synapse/handlers/auth.py index 6059c3d3a8..4a81bd2ba9 100644 --- a/synapse/handlers/auth.py +++ b/synapse/handlers/auth.py @@ -520,7 +520,7 @@ class AuthHandler(BaseHandler): """ logger.info("Logging in user %s on device %s", user_id, device_id) access_token = yield self.issue_access_token(user_id, device_id) - yield self.auth.check_auth_blocking() + yield self.auth.check_auth_blocking(user_id) # the device *should* have been registered before we got here; however, # it's possible we raced against a DELETE operation. The thing we @@ -734,7 +734,6 @@ class AuthHandler(BaseHandler): @defer.inlineCallbacks def validate_short_term_login_token_and_get_user_id(self, login_token): - yield self.auth.check_auth_blocking() auth_api = self.hs.get_auth() user_id = None try: @@ -743,6 +742,7 @@ class AuthHandler(BaseHandler): auth_api.validate_macaroon(macaroon, "login", True, user_id) except Exception: raise AuthError(403, "Invalid token", errcode=Codes.FORBIDDEN) + yield self.auth.check_auth_blocking(user_id) defer.returnValue(user_id) @defer.inlineCallbacks |