diff options
| author | Mark Haines <mark.haines@matrix.org> | 2015-04-29 13:15:14 +0100 |
|---|---|---|
| committer | Mark Haines <mark.haines@matrix.org> | 2015-04-29 13:15:14 +0100 |
| commit | 4ad8b451559682645c818f6c1180e5f9d42a7eeb (patch) | |
| tree | 94fe0beaaaa4ed8c1bb9451f1274df819d9ce8d7 /synapse/server.py | |
| parent | Update the query format used by keyring to match current key v2 spec (diff) | |
| parent | Mention that postgres databases must have the correct charset encoding (diff) | |
| download | synapse-4ad8b451559682645c818f6c1180e5f9d42a7eeb.tar.xz | |
Merge branch 'develop' into key_distribution
Conflicts: synapse/config/homeserver.py
Diffstat (limited to 'synapse/server.py')
| -rw-r--r-- | synapse/server.py | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/synapse/server.py b/synapse/server.py index a602b425e3..d61a228c36 100644 --- a/synapse/server.py +++ b/synapse/server.py @@ -65,6 +65,7 @@ class BaseHomeServer(object): 'replication_layer', 'datastore', 'handlers', + 'v1auth', 'auth', 'rest_servlet_factory', 'state_handler', @@ -182,6 +183,15 @@ class HomeServer(BaseHomeServer): def build_auth(self): return Auth(self) + def build_v1auth(self): + orf = Auth(self) + # Matrix spec makes no reference to what HTTP status code is returned, + # but the V1 API uses 403 where it means 401, and the webclient + # relies on this behaviour, so V1 gets its own copy of the auth + # with backwards compat behaviour. + orf.TOKEN_NOT_FOUND_HTTP_STATUS = 403 + return orf + def build_state_handler(self): return StateHandler(self) |