Emergency changes

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(

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()
         )

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(

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}))
 

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)