diff options
| author | Daniel Wagner-Hall <daniel@matrix.org> | 2015-08-26 13:22:23 +0100 |
|---|---|---|
| committer | Daniel Wagner-Hall <daniel@matrix.org> | 2015-08-26 13:22:23 +0100 |
| commit | 6a4b650d8ad3e6c095020cac3861e430d643d53d (patch) | |
| tree | 87fa9682940fbecd34104763b2a6ba0c35143b60 /tests/rest/client/v1/utils.py | |
| parent | Merge pull request #251 from matrix-org/removeadmin (diff) | |
| download | synapse-6a4b650d8ad3e6c095020cac3861e430d643d53d.tar.xz | |
Attempt to validate macaroons
A couple of weird caveats: * If we can't validate your macaroon, we fall back to checking that your access token is in the DB, and ignoring the failure * Even if we can validate your macaroon, we still have to hit the DB to get the access token ID, which we pretend is a device ID all over the codebase. This mostly adds the interesting code, and points out the two pieces we need to delete (and necessary conditions) in order to fix the above caveats.
Diffstat (limited to 'tests/rest/client/v1/utils.py')
| -rw-r--r-- | tests/rest/client/v1/utils.py | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/tests/rest/client/v1/utils.py b/tests/rest/client/v1/utils.py index c472d53043..85096a0326 100644 --- a/tests/rest/client/v1/utils.py +++ b/tests/rest/client/v1/utils.py @@ -37,9 +37,6 @@ class RestTestCase(unittest.TestCase): self.mock_resource = None self.auth_user_id = None - def mock_get_user_by_access_token(self, token=None): - return self.auth_user_id - @defer.inlineCallbacks def create_room_as(self, room_creator, is_public=True, tok=None): temp_id = self.auth_user_id |