diff options
| author | Richard van der Hoff <github@rvanderhoff.org.uk> | 2016-12-01 11:42:53 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-12-01 11:42:53 +0000 |
| commit | 471200074b529d1cd3d0de545c0336766439dc50 (patch) | |
| tree | 8cceb5c35257c5edadafb80215db07e5d213336d /synapse/api/auth.py | |
| parent | Merge pull request #1660 from matrix-org/rav/better_content_type_validation (diff) | |
| parent | Fix doc-string (diff) | |
| download | synapse-471200074b529d1cd3d0de545c0336766439dc50.tar.xz | |
Merge pull request #1654 from matrix-org/rav/no_more_refresh_tokens
Stop generating refresh_tokens
Diffstat (limited to 'synapse/api/auth.py')
| -rw-r--r-- | synapse/api/auth.py | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/synapse/api/auth.py b/synapse/api/auth.py index b17025c7ce..ddab210718 100644 --- a/synapse/api/auth.py +++ b/synapse/api/auth.py @@ -791,7 +791,7 @@ class Auth(object): Args: macaroon(pymacaroons.Macaroon): The macaroon to validate - type_string(str): The kind of token required (e.g. "access", "refresh", + type_string(str): The kind of token required (e.g. "access", "delete_pusher") verify_expiry(bool): Whether to verify whether the macaroon has expired. user_id (str): The user_id required @@ -820,8 +820,7 @@ class Auth(object): else: v.satisfy_general(lambda c: c.startswith("time < ")) - # access_tokens and refresh_tokens include a nonce for uniqueness: any - # value is acceptable + # access_tokens include a nonce for uniqueness: any value is acceptable v.satisfy_general(lambda c: c.startswith("nonce = ")) v.verify(macaroon, self.hs.config.macaroon_secret_key) |