diff options
| author | Erik Johnston <erikj@jki.re> | 2019-01-21 11:44:05 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-01-21 11:44:05 +0000 |
| commit | 5f5476558771ba8ce969d8d694a34986e4291051 (patch) | |
| tree | 8bb3a4bfb521572f69071a4e925e819fd3cd4eb5 /synapse/federation/transport/server.py | |
| parent | Migrate encryption state on room upgrade (#4411) (diff) | |
| parent | Newsfile (diff) | |
| download | synapse-5f5476558771ba8ce969d8d694a34986e4291051.tar.xz | |
Merge pull request #4390 from matrix-org/erikj/versioned_fed_apis
Add groundwork for new versions of federation APIs
Diffstat (limited to 'synapse/federation/transport/server.py')
| -rw-r--r-- | synapse/federation/transport/server.py | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/synapse/federation/transport/server.py b/synapse/federation/transport/server.py index 3553f418f1..e592269cf4 100644 --- a/synapse/federation/transport/server.py +++ b/synapse/federation/transport/server.py @@ -22,7 +22,7 @@ from twisted.internet import defer import synapse from synapse.api.errors import Codes, FederationDeniedError, SynapseError -from synapse.api.urls import FEDERATION_PREFIX as PREFIX +from synapse.api.urls import FEDERATION_V1_PREFIX from synapse.http.endpoint import parse_and_validate_server_name from synapse.http.server import JsonResource from synapse.http.servlet import ( @@ -227,6 +227,8 @@ class BaseFederationServlet(object): """ REQUIRE_AUTH = True + PREFIX = FEDERATION_V1_PREFIX # Allows specifying the API version + def __init__(self, handler, authenticator, ratelimiter, server_name): self.handler = handler self.authenticator = authenticator @@ -286,7 +288,7 @@ class BaseFederationServlet(object): return new_func def register(self, server): - pattern = re.compile("^" + PREFIX + self.PATH + "$") + pattern = re.compile("^" + self.PREFIX + self.PATH + "$") for method in ("GET", "PUT", "POST"): code = getattr(self, "on_%s" % (method), None) |