Skip to content
Snippets Groups Projects
Commit ac6a8481 authored by Andrew Morgan's avatar Andrew Morgan Committed by Andrew Morgan
Browse files

Only register devices edu handler on the master process (#7255)

parent 553c8a9b
No related branches found
No related tags found
No related merge requests found
Fix a bug that prevented cross-signing with users on worker-mode synapses.
\ No newline at end of file
...@@ -54,19 +54,23 @@ class E2eKeysHandler(object): ...@@ -54,19 +54,23 @@ class E2eKeysHandler(object):
self._edu_updater = SigningKeyEduUpdater(hs, self) self._edu_updater = SigningKeyEduUpdater(hs, self)
federation_registry = hs.get_federation_registry()
self._is_master = hs.config.worker_app is None self._is_master = hs.config.worker_app is None
if not self._is_master: if not self._is_master:
self._user_device_resync_client = ReplicationUserDevicesResyncRestServlet.make_client( self._user_device_resync_client = ReplicationUserDevicesResyncRestServlet.make_client(
hs hs
) )
else:
# Only register this edu handler on master as it requires writing
# device updates to the db
#
# FIXME: switch to m.signing_key_update when MSC1756 is merged into the spec
federation_registry.register_edu_handler(
"org.matrix.signing_key_update",
self._edu_updater.incoming_signing_key_update,
)
federation_registry = hs.get_federation_registry()
# FIXME: switch to m.signing_key_update when MSC1756 is merged into the spec
federation_registry.register_edu_handler(
"org.matrix.signing_key_update",
self._edu_updater.incoming_signing_key_update,
)
# doesn't really work as part of the generic query API, because the # doesn't really work as part of the generic query API, because the
# query request requires an object POST, but we abuse the # query request requires an object POST, but we abuse the
# "query handler" interface. # "query handler" interface.
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment