diff options
| author | Mark Haines <mark.haines@matrix.org> | 2016-05-13 16:59:56 +0100 |
|---|---|---|
| committer | Mark Haines <mark.haines@matrix.org> | 2016-05-13 16:59:56 +0100 |
| commit | 1f71f386f68423c00e0d4180ae48b271864b42a5 (patch) | |
| tree | 9dd45307ffd592023a8334e90d2c2180f4463225 /synapse/api/auth.py | |
| parent | Shift some of the state_group methods into the SlavedEventStore (diff) | |
| parent | Merge pull request #783 from matrix-org/markjh/slave_account_data (diff) | |
| download | synapse-1f71f386f68423c00e0d4180ae48b271864b42a5.tar.xz | |
Merge branch 'develop' into dbkr/email_notifs_on_pusher
Diffstat (limited to 'synapse/api/auth.py')
| -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 |