diff options
| author | Negi Fazeli <negar.fazeli@ericsson.com> | 2016-04-20 16:21:40 +0200 |
|---|---|---|
| committer | Negar Fazeli <negar.fazeli@ericsson.com> | 2016-05-13 15:34:15 +0200 |
| commit | 40aa6e8349b348802d6f87084c31c3895f728708 (patch) | |
| tree | 2150d48917b62e0317a73e7892061d73e2fe62ec /synapse/api | |
| parent | Pass through _get_state_group_for_events (diff) | |
| download | synapse-40aa6e8349b348802d6f87084c31c3895f728708.tar.xz | |
Create user with expiry
- Add unittests for client, api and handler Signed-off-by: Negar Fazeli <negar.fazeli@ericsson.com>
Diffstat (limited to 'synapse/api')
| -rw-r--r-- | synapse/api/auth.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/synapse/api/auth.py b/synapse/api/auth.py index d3e9837c81..44e38b777a 100644 --- a/synapse/api/auth.py +++ b/synapse/api/auth.py @@ -612,7 +612,8 @@ class Auth(object): def get_user_from_macaroon(self, macaroon_str): try: macaroon = pymacaroons.Macaroon.deserialize(macaroon_str) - self.validate_macaroon(macaroon, "access", False) + + self.validate_macaroon(macaroon, "access", self.hs.config.expire_access_token) user_prefix = "user_id = " user = None |