diff options
| author | Erik Johnston <erikj@jki.re> | 2019-02-27 15:30:40 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-02-27 15:30:40 +0000 |
| commit | 46b0151524cbc19bfe8091bb88bc29267c965c29 (patch) | |
| tree | 0669a97dc7b6a5099a7cc9034c762365c7bf30ff | |
| parent | Merge pull request #4749 from matrix-org/erikj/replication_connection_backoff (diff) | |
| parent | Fix unit tests (diff) | |
| download | synapse-46b0151524cbc19bfe8091bb88bc29267c965c29.tar.xz | |
Merge pull request #4757 from matrix-org/erikj/key_api_fed_readae
Move server key queries to federation reader
| -rw-r--r-- | changelog.d/4757.feature | 1 | ||||
| -rw-r--r-- | docs/workers.rst | 1 | ||||
| -rw-r--r-- | synapse/app/federation_reader.py | 6 | ||||
| -rw-r--r-- | tests/utils.py | 6 |
4 files changed, 13 insertions, 1 deletions
diff --git a/changelog.d/4757.feature b/changelog.d/4757.feature new file mode 100644 index 0000000000..b89029f2b4 --- /dev/null +++ b/changelog.d/4757.feature @@ -0,0 +1 @@ +Move server key queries to federation reader. diff --git a/docs/workers.rst b/docs/workers.rst index 3ba5879f76..7552455a4e 100644 --- a/docs/workers.rst +++ b/docs/workers.rst @@ -182,6 +182,7 @@ endpoints matching the following regular expressions:: ^/_matrix/federation/v1/event_auth/ ^/_matrix/federation/v1/exchange_third_party_invite/ ^/_matrix/federation/v1/send/ + ^/_matrix/key/v2/query The above endpoints should all be routed to the federation_reader worker by the reverse-proxy configuration. diff --git a/synapse/app/federation_reader.py b/synapse/app/federation_reader.py index b116c17669..7da79dc827 100644 --- a/synapse/app/federation_reader.py +++ b/synapse/app/federation_reader.py @@ -21,7 +21,7 @@ from twisted.web.resource import NoResource import synapse from synapse import events -from synapse.api.urls import FEDERATION_PREFIX +from synapse.api.urls import FEDERATION_PREFIX, SERVER_KEY_V2_PREFIX from synapse.app import _base from synapse.config._base import ConfigError from synapse.config.homeserver import HomeServerConfig @@ -44,6 +44,7 @@ from synapse.replication.slave.storage.registration import SlavedRegistrationSto from synapse.replication.slave.storage.room import RoomStore from synapse.replication.slave.storage.transactions import SlavedTransactionStore from synapse.replication.tcp.client import ReplicationClientHandler +from synapse.rest.key.v2 import KeyApiV2Resource from synapse.server import HomeServer from synapse.storage.engines import create_engine from synapse.util.httpresourcetree import create_resource_tree @@ -99,6 +100,9 @@ class FederationReaderServer(HomeServer): ), }) + if name in ["keys", "federation"]: + resources[SERVER_KEY_V2_PREFIX] = KeyApiV2Resource(self) + root_resource = create_resource_tree(resources, NoResource()) _base.listen_tcp( diff --git a/tests/utils.py b/tests/utils.py index 2dfcb70a93..e8ab312528 100644 --- a/tests/utils.py +++ b/tests/utils.py @@ -142,6 +142,9 @@ def default_config(name): config.saml2_enabled = False config.public_baseurl = None config.default_identity_server = None + config.key_refresh_interval = 24 * 60 * 60 * 1000 + config.old_signing_keys = {} + config.tls_fingerprints = [] config.use_frozen_dicts = False @@ -457,6 +460,9 @@ class MockKey(object): def verify(self, message, sig): assert sig == b"\x9a\x87$" + def encode(self): + return b"<fake_encoded_key>" + class MockClock(object): now = 1000 |