tileradotorg/synapse
1
0
Fork 0
forked from MirrorHub/synapse
Code Pull requests Activity

vendor-prefix the EDU name until MSC1756 is merged into the spec

Browse source
This commit is contained in:
Hubert Chathi 2019-10-22 22:33:23 -04:00
parent 3e3f9b684e
commit 404e8c8532
2 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
synapse/handlers/e2e_keys.py
View file

@ -55,8 +55,9 @@ class E2eKeysHandler(object):
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(
"m.signing_key_update", self._edu_updater.incoming_signing_key_update
"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
# query request requires an object POST, but we abuse the

3
synapse/storage/devices.py
View file

@ -231,7 +231,8 @@ class DeviceWorkerStore(SQLBaseStore):
# add the updated cross-signing keys to the results list
for user_id, result in iteritems(cross_signing_keys_by_user):
result["user_id"] = user_id
cross_signing_results.append(("m.signing_key_update", result))
# FIXME: switch to m.signing_key_update when MSC1756 is merged into the spec
cross_signing_results.append(("org.matrix.signing_key_update", result))
# That should only happen if a client is spamming the server with new
# devices, in which case E2E isn't going to work well anyway. We'll just