diff options
author | David Baker <dave@matrix.org> | 2015-08-20 10:16:01 +0100 |
---|---|---|
committer | David Baker <dave@matrix.org> | 2015-08-20 10:16:01 +0100 |
commit | c50ad14bae20d2a8448bb9fe78e919958dc9d233 (patch) | |
tree | 3b6b3221cb11b16a105d1edf9e4ffe9519c3900a /synapse/federation/transport/server.py | |
parent | Allow sign in using email address (diff) | |
parent | Merge pull request #211 from matrix-org/email_in_use (diff) | |
download | synapse-c50ad14bae20d2a8448bb9fe78e919958dc9d233.tar.xz |
Merge branch 'develop' into email_login
Diffstat (limited to 'synapse/federation/transport/server.py')
-rw-r--r-- | synapse/federation/transport/server.py | 20 |
1 files changed, 20 insertions, 0 deletions
diff --git a/synapse/federation/transport/server.py b/synapse/federation/transport/server.py index bad93c6b2f..36f250e1a3 100644 --- a/synapse/federation/transport/server.py +++ b/synapse/federation/transport/server.py @@ -325,6 +325,24 @@ class FederationInviteServlet(BaseFederationServlet): defer.returnValue((200, content)) +class FederationClientKeysQueryServlet(BaseFederationServlet): + PATH = "/user/keys/query" + + @defer.inlineCallbacks + def on_POST(self, origin, content, query): + response = yield self.handler.on_query_client_keys(origin, content) + defer.returnValue((200, response)) + + +class FederationClientKeysClaimServlet(BaseFederationServlet): + PATH = "/user/keys/claim" + + @defer.inlineCallbacks + def on_POST(self, origin, content, query): + response = yield self.handler.on_claim_client_keys(origin, content) + defer.returnValue((200, response)) + + class FederationQueryAuthServlet(BaseFederationServlet): PATH = "/query_auth/([^/]*)/([^/]*)" @@ -373,4 +391,6 @@ SERVLET_CLASSES = ( FederationQueryAuthServlet, FederationGetMissingEventsServlet, FederationEventAuthServlet, + FederationClientKeysQueryServlet, + FederationClientKeysClaimServlet, ) |