diff options
| author | Richard van der Hoff <github@rvanderhoff.org.uk> | 2016-11-30 16:53:20 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-11-30 16:53:20 +0000 |
| commit | 321fe5c44c3cdd9c7ac3651657de42aa71f11b29 (patch) | |
| tree | b2b6679c398ceec7651ae59027c3f85faeb1e7b7 /tests/handlers/test_auth.py | |
| parent | Merge pull request #1653 from matrix-org/rav/guest_e2e (diff) | |
| parent | Comments (diff) | |
| download | synapse-321fe5c44c3cdd9c7ac3651657de42aa71f11b29.tar.xz | |
Merge pull request #1656 from matrix-org/rav/remove_time_caveat
Stop putting a time caveat on access tokens
Diffstat (limited to 'tests/handlers/test_auth.py')
| -rw-r--r-- | tests/handlers/test_auth.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tests/handlers/test_auth.py b/tests/handlers/test_auth.py index 4a8cd19acf..9d013e5ca7 100644 --- a/tests/handlers/test_auth.py +++ b/tests/handlers/test_auth.py @@ -61,14 +61,14 @@ class AuthTestCase(unittest.TestCase): def verify_type(caveat): return caveat == "type = access" - def verify_expiry(caveat): - return caveat == "time < 8600000" + def verify_nonce(caveat): + return caveat.startswith("nonce =") v = pymacaroons.Verifier() v.satisfy_general(verify_gen) v.satisfy_general(verify_user) v.satisfy_general(verify_type) - v.satisfy_general(verify_expiry) + v.satisfy_general(verify_nonce) v.verify(macaroon, self.hs.config.macaroon_secret_key) def test_short_term_login_token_gives_user_id(self): |