diff options
| author | Richard van der Hoff <1389908+richvdh@users.noreply.github.com> | 2018-05-03 10:10:57 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-05-03 10:10:57 +0100 |
| commit | 902673e356f0b731350e7d31dc8369fe25838718 (patch) | |
| tree | 5a1aed0a205c26b62c716c229235406a968c674d /synapse/rest | |
| parent | Merge pull request #3175 from matrix-org/erikj/escape_metric_values (diff) | |
| parent | Burminate v1auth (diff) | |
| download | synapse-902673e356f0b731350e7d31dc8369fe25838718.tar.xz | |
Merge pull request #3161 from NotAFile/remove-v1auth
Make Client-Server API return 403 for invalid token
Diffstat (limited to 'synapse/rest')
| -rw-r--r-- | synapse/rest/client/v1/base.py | 6 | ||||
| -rw-r--r-- | synapse/rest/client/v1/pusher.py | 2 |
2 files changed, 6 insertions, 2 deletions
diff --git a/synapse/rest/client/v1/base.py b/synapse/rest/client/v1/base.py index c7aa0bbf59..197335d7aa 100644 --- a/synapse/rest/client/v1/base.py +++ b/synapse/rest/client/v1/base.py @@ -52,6 +52,10 @@ class ClientV1RestServlet(RestServlet): """A base Synapse REST Servlet for the client version 1 API. """ + # This subclass was presumably created to allow the auth for the v1 + # protocol version to be different, however this behaviour was removed. + # it may no longer be necessary + def __init__(self, hs): """ Args: @@ -59,5 +63,5 @@ class ClientV1RestServlet(RestServlet): """ self.hs = hs self.builder_factory = hs.get_event_builder_factory() - self.auth = hs.get_v1auth() + self.auth = hs.get_auth() self.txns = HttpTransactionCache(hs.get_clock()) diff --git a/synapse/rest/client/v1/pusher.py b/synapse/rest/client/v1/pusher.py index 1819a560cb..0206e664c1 100644 --- a/synapse/rest/client/v1/pusher.py +++ b/synapse/rest/client/v1/pusher.py @@ -150,7 +150,7 @@ class PushersRemoveRestServlet(RestServlet): super(RestServlet, self).__init__() self.hs = hs self.notifier = hs.get_notifier() - self.auth = hs.get_v1auth() + self.auth = hs.get_auth() self.pusher_pool = self.hs.get_pusherpool() @defer.inlineCallbacks |