From c10c71e70d4ac3b87a7ace9d12e8df5fdb5b9b94 Mon Sep 17 00:00:00 2001 From: Erik Johnston Date: Fri, 15 Feb 2019 18:15:16 +0000 Subject: [PATCH] Emergency changes --- synapse/app/federation_reader.py | 6 +++++- synapse/crypto/context_factory.py | 3 ++- synapse/federation/federation_server.py | 3 +++ synapse/replication/http/device.py | 2 +- synapse/replication/tcp/streams.py | 4 ++-- 5 files changed, 13 insertions(+), 5 deletions(-) diff --git a/synapse/app/federation_reader.py b/synapse/app/federation_reader.py index 6ee2b76dcd..27c73f9b50 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 @@ -43,6 +43,7 @@ from synapse.replication.slave.storage.receipts import SlavedReceiptsStore 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 @@ -97,6 +98,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/synapse/crypto/context_factory.py b/synapse/crypto/context_factory.py index 85f2848fb1..83f053d73d 100644 --- a/synapse/crypto/context_factory.py +++ b/synapse/crypto/context_factory.py @@ -128,10 +128,11 @@ class ClientTLSOptionsFactory(object): def __init__(self, config): # We don't use config options yet + self._options = CertificateOptions(verify=False) pass def get_options(self, host): return ClientTLSOptions( host, - CertificateOptions(verify=False).getContext() + self._options.getContext() ) diff --git a/synapse/federation/federation_server.py b/synapse/federation/federation_server.py index 3da86d4ba6..c2541b62af 100644 --- a/synapse/federation/federation_server.py +++ b/synapse/federation/federation_server.py @@ -877,6 +877,9 @@ class ReplicationFederationHandlerRegistry(FederationHandlerRegistry): def on_edu(self, edu_type, origin, content): """Overrides FederationHandlerRegistry """ + if edu_type == "m.presence": + return + handler = self.edu_handlers.get(edu_type) if handler: return super(ReplicationFederationHandlerRegistry, self).on_edu( diff --git a/synapse/replication/http/device.py b/synapse/replication/http/device.py index 4855ba098f..605de028a0 100644 --- a/synapse/replication/http/device.py +++ b/synapse/replication/http/device.py @@ -55,7 +55,7 @@ class CheckDeviceRegisteredServlet(ReplicationEndpoint): try: device_id = yield self.device_handler.check_device_registered(user_id, device_id) except Exception as e: - defer.returnValue((400, str(e)) + defer.returnValue((400, str(e))) defer.returnValue((200, {"device_id": device_id})) diff --git a/synapse/replication/tcp/streams.py b/synapse/replication/tcp/streams.py index 728746bd12..d49973634e 100644 --- a/synapse/replication/tcp/streams.py +++ b/synapse/replication/tcp/streams.py @@ -265,8 +265,8 @@ class PresenceStream(Stream): store = hs.get_datastore() presence_handler = hs.get_presence_handler() - self.current_token = store.get_current_presence_token - self.update_function = presence_handler.get_all_presence_updates + self.current_token = lambda: 0 + self.update_function = lambda _a, _b: [] super(PresenceStream, self).__init__(hs)