diff options
| author | Mark Haines <mjark@negativecurvature.net> | 2014-10-14 10:06:04 +0100 |
|---|---|---|
| committer | Mark Haines <mjark@negativecurvature.net> | 2014-10-14 10:06:04 +0100 |
| commit | 636a0dbde7082a485c0d4ac58137ecb75f7f23fe (patch) | |
| tree | 780ad4589dbde7e0fab416496faee5f3c351d169 /synapse/api | |
| parent | Replace on_send_callback with something a bit clearer so that we can sign mes... (diff) | |
| parent | typoe (diff) | |
| download | synapse-636a0dbde7082a485c0d4ac58137ecb75f7f23fe.tar.xz | |
Merge pull request #8 from matrix-org/server2server_signing
Server2server signing
Diffstat (limited to 'synapse/api')
| -rw-r--r-- | synapse/api/errors.py | 1 | ||||
| -rw-r--r-- | synapse/api/urls.py | 3 |
2 files changed, 3 insertions, 1 deletions
diff --git a/synapse/api/errors.py b/synapse/api/errors.py index 88175602c4..6d7d499fea 100644 --- a/synapse/api/errors.py +++ b/synapse/api/errors.py @@ -19,6 +19,7 @@ import logging class Codes(object): + UNAUTHORIZED = "M_UNAUTHORIZED" FORBIDDEN = "M_FORBIDDEN" BAD_JSON = "M_BAD_JSON" NOT_JSON = "M_NOT_JSON" diff --git a/synapse/api/urls.py b/synapse/api/urls.py index 6314f31f7a..6dc19305b7 100644 --- a/synapse/api/urls.py +++ b/synapse/api/urls.py @@ -18,4 +18,5 @@ CLIENT_PREFIX = "/_matrix/client/api/v1" FEDERATION_PREFIX = "/_matrix/federation/v1" WEB_CLIENT_PREFIX = "/_matrix/client" -CONTENT_REPO_PREFIX = "/_matrix/content" \ No newline at end of file +CONTENT_REPO_PREFIX = "/_matrix/content" +SERVER_KEY_PREFIX = "/_matrix/key/v1" |